social_stream 0.20.2 → 0.21.0

data/social_stream.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.15.2')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.10.2')
-  s.add_runtime_dependency('social_stream-events', '~> 0.7.1')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.5.0')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.6.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.11.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.8.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.6.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.7.0')
  
   # Development Gem dependencies
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,66 +10,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-02-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &72438540 !ruby/object:Gem::Requirement
+  requirement: &89152680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *72438540
+  version_requirements: *89152680
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &72438180 !ruby/object:Gem::Requirement
+  requirement: &89152430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *72438180
+  version_requirements: *89152430
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &72437820 !ruby/object:Gem::Requirement
+  requirement: &89152170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *72437820
+  version_requirements: *89152170
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &72437490 !ruby/object:Gem::Requirement
+  requirement: &89151920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *72437490
+  version_requirements: *89151920
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &72437150 !ruby/object:Gem::Requirement
+  requirement: &89151570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *72437150
+  version_requirements: *89151570
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &72436790 !ruby/object:Gem::Requirement
+  requirement: &89151210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *72436790
+  version_requirements: *89151210
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &72436500 !ruby/object:Gem::Requirement
+  requirement: &89150740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72436500
+  version_requirements: *89150740
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &72436120 !ruby/object:Gem::Requirement
+  requirement: &89150280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72436120
+  version_requirements: *89150280
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &72435750 !ruby/object:Gem::Requirement
+  requirement: &89150020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *72435750
+  version_requirements: *89150020
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &72435360 !ruby/object:Gem::Requirement
+  requirement: &89149490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *72435360
+  version_requirements: *89149490
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &72435030 !ruby/object:Gem::Requirement
+  requirement: &89148930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *72435030
+  version_requirements: *89148930
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &72434680 !ruby/object:Gem::Requirement
+  requirement: &89148520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *72434680
+  version_requirements: *89148520
 description: Social Stream is a Ruby on Rails engine for building social network websites.
   It supports contacts, posts, file uploads, private messages and many more.
 email: 
@@ -254,6 +254,8 @@ files:
 - base/app/assets/images/btn/next_space.png
 - base/app/assets/images/btn/nolike.png
 - base/app/assets/images/btn/notifications.png
+- base/app/assets/images/btn/permission_negative.png
+- base/app/assets/images/btn/permission_positive.png
 - base/app/assets/images/btn/pixel.png
 - base/app/assets/images/btn/point_blue.png
 - base/app/assets/images/btn/point_gray.png
@@ -337,6 +339,8 @@ files:
 - base/app/assets/javascripts/search.js.erb
 - base/app/assets/javascripts/settings.js
 - base/app/assets/javascripts/social_stream-base.js
+- base/app/assets/javascripts/social_stream.timeline.js
+- base/app/assets/javascripts/social_stream.wall.js.erb
 - base/app/assets/javascripts/ties.js
 - base/app/assets/javascripts/toolbar.js
 - base/app/assets/javascripts/users.js
@@ -446,7 +450,6 @@ files:
 - base/app/views/activities/_activity.html.erb
 - base/app/views/activities/_child.html.erb
 - base/app/views/activities/_comments.html.erb
-- base/app/views/activities/_filter.html.erb
 - base/app/views/activities/_index.html.erb
 - base/app/views/activities/_new.html.erb
 - base/app/views/activities/_options.html.erb
@@ -650,6 +653,7 @@ files:
 - base/db/migrate/20120111120920_remove_language_default.rb
 - base/db/migrate/20120111141717_activity_channels.rb
 - base/db/migrate/20120201185454_singleton_single_relations.rb
+- base/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb
 - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - base/lib/acts_as_taggable_on/social_stream.rb
 - base/lib/generators/social_stream/base/install_generator.rb
@@ -917,6 +921,7 @@ files:
 - documents/db/migrate/20110922173707_add_file_processing_to_document.rb
 - documents/db/migrate/20111005112707_add_title_and_description_to_document.rb
 - documents/db/migrate/20120109155431_document_object_type.rb
+- documents/db/migrate/20120208143721_documents_group_title_and_description_in_activity_object.rb
 - documents/lib/delayed_paperclip/social_stream-documents.rb
 - documents/lib/generators/social_stream/documents/install_generator.rb
 - documents/lib/paperclip/social_stream-documents.rb
@@ -1021,6 +1026,7 @@ files:
 - events/db/migrate/20111120104349_create_rooms.rb
 - events/db/migrate/20111204155637_add_scheduler.rb
 - events/db/migrate/20111218203314_change_scheduler.rb
+- events/db/migrate/20120208143756_events_group_title_and_description_in_activity_object.rb
 - events/db/migrate/20120208144948_add_events_foreign_key.rb
 - events/lib/generators/social_stream/events/install_generator.rb
 - events/lib/social_stream-events.rb
@@ -1080,6 +1086,7 @@ files:
 - linkser/db/migrate/20111129100618_create_social_stream_linkser.rb
 - linkser/db/migrate/20111219122952_add_width_height_to_link.rb
 - linkser/db/migrate/20120202104549_add_links_foreign_key.rb
+- linkser/db/migrate/20120208143739_linkser_group_title_and_description_in_activity_object.rb
 - linkser/lib/generators/social_stream/linkser/install_generator.rb
 - linkser/lib/social_stream-linkser.rb
 - linkser/lib/social_stream/linkser/engine.rb
@@ -1181,6 +1188,9 @@ files:
 - presence/app/assets/audio/chat/onMessageAudio.mp3
 - presence/app/assets/audio/chat/onMessageAudio.wav
 - presence/app/assets/images/black_arrow3.png
+- presence/app/assets/images/black_arrow7.png
+- presence/app/assets/images/black_arrow8.png
+- presence/app/assets/images/black_arrow9.png
 - presence/app/assets/images/emoticons/beer.png
 - presence/app/assets/images/emoticons/clock.png
 - presence/app/assets/images/emoticons/face-raspberry.png
@@ -1304,9 +1314,12 @@ files:
 - presence/spec/demo/vendor/plugins/.gitkeep
 - presence/spec/discover.rb
 - presence/spec/spec_helper.rb
+- presence/vendor/assets/javascripts/jquery.flexselect.js
 - presence/vendor/assets/javascripts/jquery.tools.tooltip.js
 - presence/vendor/assets/javascripts/jquery.ui.chatbox.js
+- presence/vendor/assets/javascripts/liquidmetal.js
 - presence/vendor/assets/javascripts/strophe.js
+- presence/vendor/assets/stylesheets/flexselect.css
 - presence/vendor/assets/stylesheets/jquery.ui.chatbox.css
 - social_stream.gemspec
 - social_stream.thor

data/base/app/views/activities/_filter.html.erb

@@ -1,83 +0,0 @@
-<% content_for :javascript do %>
-    $(function() {
-				/**
-				* the element
-				*/
-				var $ui 		= $('#form_filter');
-				var $ui_really = $('#ul_filter');
-				/**
-				* on focus and on click display the dropdown, 
-				* and change the arrow image
-				*/
-				/*$ui.find('.sb_down').bind('focus click',function()*/
-        $ui.find('.sb_down').bind('mouseover',function()
-        {
-					$ui.find('.sb_down')
-					   .addClass('sb_up')
-					   .removeClass('sb_down')
-					   .andSelf()
-					   .find('.sb_dropdown')
-					   .show();
-              /*$ui.find('.sb_up')
-					   .hide();*/
-				});
-				
-				/**
-				* on mouse leave hide the dropdown, 
-				* and change the arrow image
-				*/
-      
-				$ui_really.bind('mouseleave',function(){
-
-					$ui.find('.sb_up')
-					   .addClass('sb_down')
-					   .removeClass('sb_up')
-					   .andSelf()
-					   .find('.sb_dropdown')
-					   .hide();
-              /*$ui.find('.sb_down')
-					   .show();*/
-				});
-				
-				/**
-				* selecting all checkboxes
-				*/
-				$ui.find('.sb_dropdown').find('label[for="all"]').prev().bind('click',function(){
-					$(this).parent().siblings().find(':checkbox').attr('checked',this.checked).attr('disabled',this.checked);
-				});
-            });    
-<% end %>
-
-  <div id="filter_div">
-        <%= form_tag "/activities/documents", :method => :post ,:id=> 'form_filter', :class => "tie_form",:remote=> true do %>
-						<span class="sb_down">Filter</span>
-					<ul class="sb_dropdown" style="display:none;" id="ul_filter">
-
-						<li>
-                <%= check_box_tag 'types', 'Documents', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
-                <label for="<%=t('activity.view.documents')%>"><%=t('activity.view.documents')%></label>
-            </li>
-  					<li>
-                <%= check_box_tag 'types', 'Audio', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
-                <label for="t('activity.view.audio')"><%=t('activity.view.audio')%></label>
-            </li>
-						<li>
-                <%= check_box_tag 'types', 'Event', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
-                <label for="<%=t('activity.view.event')%>"><%=t('activity.view.event')%></label>
-            </li>
-						<li>
-                <%= check_box_tag 'types', 'Picture', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
-                <label for="<%=t('activity.view.photos')%>"><%=t('activity.view.photos')%></label>
-            </li>
-						<li>
-                <%= check_box_tag 'types', 'Post', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
-                <label for="<%=t('activity.view.post')%>"><%=t('activity.view.post')%></label>
-            </li>
-						<li>
-                <%= check_box_tag 'types', 'Video', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
-                <label for="<%=t('activity.view.video')%>"><%=t('activity.view.video')%></label>
-            </li>
-					</ul>
-        <% end %>
-  </div>
-