social_stream 0.23.2 → 0.23.3

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.17.1')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.11.4')
-  s.add_runtime_dependency('social_stream-events', '~> 0.9.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.2')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.11.5')
+  s.add_runtime_dependency('social_stream-events', '~> 0.9.2')
   s.add_runtime_dependency('social_stream-linkser', '~> 0.7.1')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.10.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.10.2')
  
   # Development Gem dependencies
   #

data/spec/dummy/config/relations.yml

@@ -1,11 +1,11 @@
 # Default relations for Social Stream
 #
-# Define the default relations and permissions supported by your application
-# Though subjects can customize their own relations, these are the defaults
-# to start up 
+# Define the default relations and permissions offered by your application
+# Though subjects (user, groups, etc.) can customize their own relations,
+# these are the defaults to start up with
 #
 # Detailed information on permissions is available at:
-# http://rdoc.info/gems/social_stream/Permission
+# http://rdoc.info/gems/social_stream-base/Permission
 #
 user:
   friend:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.23.2
+  version: 0.23.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,44 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &82119550 !ruby/object:Gem::Requirement
+  requirement: &80252100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.17.2
   type: :runtime
   prerelease: false
-  version_requirements: *82119550
+  version_requirements: *80252100
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &82118350 !ruby/object:Gem::Requirement
+  requirement: &80251580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
   type: :runtime
   prerelease: false
-  version_requirements: *82118350
+  version_requirements: *80251580
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &82117630 !ruby/object:Gem::Requirement
+  requirement: &80250960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *82117630
+  version_requirements: *80250960
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &82117320 !ruby/object:Gem::Requirement
+  requirement: &80250430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,21 +55,21 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *82117320
+  version_requirements: *80250430
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &82115680 !ruby/object:Gem::Requirement
+  requirement: &80249560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.2
   type: :runtime
   prerelease: false
-  version_requirements: *82115680
+  version_requirements: *80249560
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &82112980 !ruby/object:Gem::Requirement
+  requirement: &80248710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *82112980
+  version_requirements: *80248710
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &82111380 !ruby/object:Gem::Requirement
+  requirement: &80247910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82111380
+  version_requirements: *80247910
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &82108850 !ruby/object:Gem::Requirement
+  requirement: &80247380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82108850
+  version_requirements: *80247380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &82105950 !ruby/object:Gem::Requirement
+  requirement: &80243750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *82105950
+  version_requirements: *80243750
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &82104260 !ruby/object:Gem::Requirement
+  requirement: &80243270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *82104260
+  version_requirements: *80243270
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &82094400 !ruby/object:Gem::Requirement
+  requirement: &80242790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *82094400
+  version_requirements: *80242790
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &82092900 !ruby/object:Gem::Requirement
+  requirement: &80242410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *82092900
+  version_requirements: *80242410
 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: 
@@ -349,7 +349,7 @@ files:
 - base/app/assets/javascripts/toolbar.js
 - base/app/assets/javascripts/users.js
 - base/app/assets/stylesheets/_colors.scss
-- base/app/assets/stylesheets/activities.css.scss
+- base/app/assets/stylesheets/activities.css.scss.erb
 - base/app/assets/stylesheets/base.css.scss
 - base/app/assets/stylesheets/cheesecake.css.scss
 - base/app/assets/stylesheets/contacts.css.scss
@@ -796,7 +796,7 @@ files:
 - base/vendor/assets/javascripts/jquery.tipsy.js
 - base/vendor/assets/javascripts/jquery.validate.js
 - base/vendor/assets/javascripts/jquery.validate.old.js
-- base/vendor/assets/javascripts/jquery.watermarkinput.js
+- base/vendor/assets/javascripts/jquery.watermark.js
 - base/vendor/assets/javascripts/superfish.js
 - base/vendor/assets/stylesheets/carousel.css
 - base/vendor/assets/stylesheets/chosen-sprite.png
@@ -863,8 +863,10 @@ files:
 - documents/app/assets/images/btn/btn_video.png
 - documents/app/assets/images/btn/btn_word.png
 - documents/app/assets/images/btn/document.png
-- documents/app/assets/javascripts/documents.js.erb
 - documents/app/assets/javascripts/social_stream-documents.js
+- documents/app/assets/javascripts/social_stream.audio.js.erb
+- documents/app/assets/javascripts/social_stream.repository.js.erb
+- documents/app/assets/javascripts/social_stream.video.js.erb
 - documents/app/assets/stylesheets/documents.css.scss
 - documents/app/assets/stylesheets/show.css.scss
 - documents/app/assets/stylesheets/social_stream-documents.css
@@ -1005,14 +1007,17 @@ files:
 - documents/vendor/assets/stylesheets/jplayer.blue.monday.video.play.png
 - documents/vendor/assets/stylesheets/jquery.lightbox.css
 - documents/vendor/assets/stylesheets/pbar-ani.gif
+- documents/vendor/assets/swf/Jplayer.swf
 - events/.gitignore
 - events/Gemfile
 - events/README.rdoc
 - events/Rakefile
 - events/app/assets/images/poster.png
-- events/app/assets/javascripts/events.js.coffee
 - events/app/assets/javascripts/social_stream-events.js
+- events/app/assets/javascripts/social_stream.calendar.js.erb
+- events/app/assets/javascripts/social_stream.event.js
 - events/app/assets/javascripts/social_stream.events.poster.js
+- events/app/assets/javascripts/social_stream.events.tools.js.coffee
 - events/app/assets/stylesheets/events.css.scss
 - events/app/assets/stylesheets/social_stream-events.css
 - events/app/controllers/events_controller.rb
@@ -1030,6 +1035,7 @@ files:
 - events/app/views/events/destroy.js.erb
 - events/app/views/events/edit.js.erb
 - events/app/views/events/index.html.erb
+- events/app/views/events/index.js.erb
 - events/app/views/rooms/_form.html.erb
 - events/app/views/rooms/_index.html.erb
 - events/app/views/rooms/_settings.html.erb
@@ -1235,6 +1241,8 @@ files:
 - presence/app/assets/javascripts/presence_XmppClient.js.erb
 - presence/app/assets/javascripts/presence_audio.js.erb
 - presence/app/assets/javascripts/presence_game.js.erb
+- presence/app/assets/javascripts/presence_game_comunication.js.erb
+- presence/app/assets/javascripts/presence_game_interface.js.erb
 - presence/app/assets/javascripts/presence_game_ter.js.erb
 - presence/app/assets/javascripts/presence_notifications.js
 - presence/app/assets/javascripts/presence_parser.js
@@ -1245,6 +1253,7 @@ files:
 - presence/app/assets/javascripts/presence_videochat.js.erb
 - presence/app/assets/javascripts/presence_windowManager.js
 - presence/app/assets/javascripts/social_stream-presence.js
+- presence/app/assets/stylesheets/TresEnRaya.css
 - presence/app/assets/stylesheets/chat.css.scss
 - presence/app/assets/stylesheets/social_stream-presence.css
 - presence/app/controllers/xmpp_controller.rb
@@ -1354,6 +1363,7 @@ files:
 - presence/spec/discover.rb
 - presence/spec/spec_helper.rb
 - presence/vendor/assets/javascripts/TB.min.js
+- presence/vendor/assets/javascripts/jquery.gamequery-0.5.1.js
 - presence/vendor/assets/javascripts/jquery.tools.tooltip.js
 - presence/vendor/assets/javascripts/liquidmetal.js
 - presence/vendor/assets/javascripts/strophe.js

data/base/vendor/assets/javascripts/jquery.watermarkinput.js

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2007 Josh Bush (digitalbush.com)
- * 
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
-
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE. 
- */
- 
-/*
- * Version: Beta 1
- * Release: 2007-06-01
- */ 
-(function($) {
-	var map=new Array();
-	$.Watermark = {
-		ShowAll:function(){
-			for (var i=0;i<map.length;i++){
-				if(map[i].obj.val()==""){
-					map[i].obj.val(map[i].text);					
-					map[i].obj.css("color",map[i].WatermarkColor);
-				}else{
-				    map[i].obj.css("color",map[i].DefaultColor);
-				}
-			}
-		},
-		HideAll:function(){
-			for (var i=0;i<map.length;i++){
-				if(map[i].obj.val()==map[i].text)
-					map[i].obj.val("");					
-			}
-		}
-	}
-	
-	$.fn.Watermark = function(text,color) {
-		if(!color)
-			color="#aaa";
-		return this.each(
-			function(){		
-				var input=$(this);
-				var defaultColor=input.css("color");
-				map[map.length]={text:text,obj:input,DefaultColor:defaultColor,WatermarkColor:color};
-				function clearMessage(){
-					if(input.val()==text)
-						input.val("");
-					input.css("color",defaultColor);
-				}
-
-				function insertMessage(){
-					if(input.val().length==0 || input.val()==text){
-						input.val(text);
-						input.css("color",color);	
-					}else
-						input.css("color",defaultColor);				
-				}
-
-				input.focus(clearMessage);
-				input.blur(insertMessage);								
-				input.change(insertMessage);
-				
-				insertMessage();
-			}
-		);
-	};
-})(jQuery);

data/documents/app/assets/javascripts/documents.js.erb

@@ -1,71 +0,0 @@
-function removePlayers(){
-	$('.attachment_tile').removeClass("selected");
-	$('.player').remove();
-	$('#downloadButton').remove();
-}
-
-$('#closeButton').live("click",function(){
-	removePlayers();
-});
-
-function hideJplayer(jplayerid){
-  $("#full_video_"+jplayerid).removeClass("jp-video-270p");
-  $("#jp_interface_"+jplayerid).hide();
-  $("#jp_playlist_"+jplayerid).hide();
-}
-
-function showJplayer(jplayerid){
-  $("#full_video_"+jplayerid).addClass("jp-video-270p");
-  $("#jp_interface_"+jplayerid).show();
-  $("#jp_playlist_"+jplayerid).show();
-  
-}
-
-$(".video_thumbnail_play_over").livequery("click",function(){
-  the_id = $(this).attr('id');
-  showJplayer(the_id);
-  $(this).parent().hide();
-  $("#jpId"+the_id).jPlayer("play", 0);
-});
-
-$(document).ready(function(){  
-  //if there are 6 or more commments we only show the last 5 and a link to show the rest
-  $("#document_comments .activity_comments").each(function(){
-    var comments = $(this).children(".subactivity");    
-    if (comments.size() > 5){
-      $(this).prepend("<div class='hide_show_comments'><a href='#' onclick='showAllDocumentComments(\""+ 
-                       $(this).attr('id') +"\"); return false;'>" + I18n.t('comment.view_all') + "(" + 
-                      comments.size() + ")</a></div><div class='space_comments'></div>");
-      comments.slice(0,comments.size()-5).hide();
-      //hide alto space_comments
-      $(this).children(".space_comments").slice(0,comments.size()-5).hide();
-    }
-  });    
-});
-
-showAllDocumentComments = function(id){
-  $("#"+id).children().show("slow");
-  //and hide the hide_show_comments
-  $("#"+id).children(".hide_show_comments").hide();
-};
-
-
-toggleDocumentMenu = function(name){
-  $(".document_menu").each(function(){
-    console.log($(this));
-    if($(this).css("display")!="none"){
-      $(this).slideToggle("slow");
-      $("#" + $(this).attr('id') + "_action").removeClass("selected");
-    }
-  });
-  if($("#document_" + name).css("display")=="none"){
-    $("#document_" + name).slideToggle("slow");
-    $("#document_" + name + "_action").addClass("selected");    
-  }
-}
-
-$(document).ready(function(){
-  $("body").screw({
-    loadingHTML: '<%= image_tag('loading.gif') %>'
-  });
-});