social_stream 0.23.4 → 0.24.0

data/presence/app/assets/javascripts/presence_game_ter.js.erb

@@ -9,17 +9,25 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
 		
   //Games variables
 	var game;             //Game and player are objects defined in the gamecore.
+	var name = "Tic Tac Toe"
   var player = null;
   var currentPlayer = null;
 	var playing=true;
 	
+	
 	//We must define our ACTION object.
 	//The information exchanged between players is performed through the exchange of action type objects.
 	//We can define our own types of actions, with different fields
-  function action(player,square) {
+  //function action(player,square) {
+    //this.player = player;
+    //this.square = square;
+		//this.type = "general";
+  //}
+	
+	function action(player,square) {
     this.player = player;
-		this.type = "general";
     this.square = square;
+    this.type = "general";
   }
 	
   //Html Divs
@@ -99,8 +107,8 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
 	//We can include our own validation conditions here!
 	//The core will invoke this method automatically in the validation process
   var validateParams = function(myPlayer,myGame,myDivID){
-    if(myGame.players.lenght < 2){
-      return new CORE.createValidationResult(false,"This game needs two players at least");
+    if(myGame.players.length != 2){
+      return new CORE.createValidationResult(false,"This game needs two players");
     }
     return new CORE.createValidationResult(true,"Ok");  
   }
@@ -119,7 +127,7 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
   /////////////////////////////////     * When some player send us a action, the core will invoke the << onActionReceived >> method.
 
   var sendAction = function(action){
-    CORE.sendAction(game.id,game.players,action)
+    CORE.sendAction(game,action)
     return;
   }
 
@@ -322,15 +330,13 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
       var figure = "aspa";
     }
 
-    var path = "/assets/games/ter/modern_circle.png"
     $(img).attr("src","/assets/games/ter/" + game.options['theme'].toLowerCase() + "_" + figure + ".png");
     $("#" + containerDivId).append(img);
     $(img).addClass('tresEnRayaImgTheme' + game.options['theme'])
 		
-		//Calculate displacement
 		var figureSizePercent = 0.8;
-		var xdisplacement = -squareDimension*figureSizePercent/2*0.9;
-		var ydisplacement = 10;
+		var xdisplacement = -squareDimension*figureSizePercent/2*0.7;
+    var ydisplacement = 13;
 		
     $(img).width(squareDimension*figureSizePercent)
     $(img).height(squareDimension*figureSizePercent)
@@ -406,6 +412,10 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
   }
 
   //Getters
+  var getName = function(){
+    return name
+  }
+	
   var getGame = function(){
     return game;
   }
@@ -425,6 +435,7 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
 
   return {
     init: init,
+		getName: getName,
 		validateParams: validateParams,
 		minimumRequirements: minimumRequirements,
 		onActionReceived: onActionReceived

data/presence/app/assets/javascripts/presence_uiManager.js.erb

@@ -1,5 +1,3 @@
-//= require jquery.watermark
-//
 ////////////////////
 //Reconnect button interface functions
 ////////////////////

data/presence/app/assets/javascripts/presence_utilities.js

@@ -1,7 +1,7 @@
 ////////////////////
 //Debug functions
 ////////////////////
-var sspresence_debugging=true;
+var sspresence_debugging=false;
 
 function log(msg) {
 	  if(sspresence_debugging){

data/presence/app/assets/javascripts/presence_videochat.js.erb

@@ -21,6 +21,8 @@ function clickVideoChatButton(slug){
 }
 
 function closeVideoChatWindow(slug){
+	  //Show games button
+    $(getChatBoxButtonForSlug(slug,"games")).show()
     closeVideoSession(slug);
     return;
 }
@@ -29,6 +31,9 @@ function closeVideoChatWindow(slug){
 var reconnectAttemptsVideo = 1;
 
 function openVideoChatWindow(slug){
+	
+	//Hide games button
+	$(getChatBoxButtonForSlug(slug,"games")).hide()
     
   if (slug in contactsInfo) {
     var connectionStatus = contactsInfo[slug].videoChatStatus;

data/presence/app/assets/javascripts/social_stream-presence.js

@@ -3,5 +3,6 @@
 //= require strophe.muc
 //= require jquery.tools.tooltip
 //= require liquidmetal
+//= require jquery.watermark
 //= require TB.min
 //= require_tree .

data/presence/app/assets/stylesheets/chat.css.scss

@@ -81,10 +81,8 @@ div.ui-videobox{
 	height: 0px;
 	border-bottom: 1px solid $separation-color;
 	max-width: 230px;
-}
-
-div.ui-videobox-icon{
-  
+	text-align: center;
+	margin: auto;
 }
 
 div.ui-videobox-icon-change{
@@ -131,7 +129,7 @@ p.video-request{
 }
 
 p.game-info{
-  padding-top: 25%;
+  padding-top: 20%;
   text-align: center;
 }
 
@@ -143,6 +141,57 @@ p.game-request{
   color: $main-color;
 }
 
+.game-choices{
+  display: inline;
+  width: 100%;
+	height: 100%;
+	text-align: center;
+}
+
+div.game-choice {
+  float: left;
+  position: relative;
+	width: 90px;
+  height: 90px;
+	margin-left: 20px;
+	margin-right: 20px;
+	margin-top: 20px;
+}
+
+div.game-choice-buttonLeft {
+  float: left;
+  position: relative;
+	margin-left: 40px;
+	margin-top: 50px;
+}
+
+div.game-choice-buttonRight {
+  float: left;
+  position: relative;
+	margin-right: 40px;
+	margin-top: 50px;
+}
+
+img.game-choice-img{
+	width: 90px;
+	height: 90px;
+}
+
+img.game-choice-button{
+	margin-top: 5px;
+  width: 30px;
+  height: 30px;
+}
+
+p.game-name{
+	margin-top: 5px;
+  text-align: center;
+}
+
+a.game-choice-link{
+	
+}
+
 /* notifications style sheet */
 
 div.ui-chatbox-notify{
@@ -192,8 +241,12 @@ p.ui-chatbox-notify-text{
 }
 
 .chat-videothick{
-	/* display: none; */
 	padding: 1px;
+	/*background-image: url("webcam.png");
+  background-repeat: no-repeat;
+  display: block;
+  height: 16px;
+  width: 16px; */
 }
 
 .chat-videoPublisherthick{

data/presence/config/locales/en.yml

@@ -52,7 +52,7 @@ en:
       joinError: "You can't join in the room \n {{errorMsg}}"
       offline: "You are offline"
     game:
-      call: "{{name}} wants to play"
+      call: "{{name}} wants to play a {{game}} game"
       accept: Accept
       deny: Deny
       offline: "Unable to connect. You are offline"

data/presence/config/locales/es.yml

@@ -52,7 +52,7 @@ es:
        joinError: "No se pudo acceder a la sala.  \n {{errorMsg}}"
        offline: "Estás desconectado"
     game:
-      call: "{{name}} quiere iniciar una partida"
+      call: "{{name}} quiere iniciar una partida de {{game}}"
       accept: Aceptar
       deny: Rechazar
       offline: "Imposible conectar. Estás desconectado"

data/presence/lib/social_stream-presence.rb

@@ -5,6 +5,10 @@ module SocialStream
     module Settings
       autoload :Presence, 'social_stream/views/settings/presence'
     end
+
+    module Toolbar
+      autoload :Presence, 'social_stream/views/toolbar/presence'
+    end
   end
 
   module Presence   

data/presence/lib/social_stream/presence/engine.rb

@@ -18,6 +18,12 @@ module SocialStream
           include SocialStream::Views::Settings::Presence
         end
       end
+
+      initializer "social_stream-presence.views.toolbar" do
+        SocialStream::Views::Toolbar.module_eval do
+          include SocialStream::Views::Toolbar::Presence
+        end
+      end
     end
   end
 end

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.10.2"
+    VERSION = "0.11.0"
   end
 end

data/presence/lib/social_stream/views/toolbar/presence.rb

@@ -0,0 +1,28 @@
+module SocialStream
+  module Views
+    module Toolbar
+      module Presence
+        def toolbar_items type, options = {}
+          super.tap do |items|
+            case type
+            when :home, :messages
+              items << {
+                :key => 'chat',
+                :html => render(:partial => 'chat/index' , :locals => {:flow => false }) 
+              }
+            when :profile
+              items << {
+                :key => 'chat',
+                :html => render(:partial => 'chat/index',
+                                :locals => {
+                                   :flow => true ,
+                                   :group => @group
+                                 })
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.17.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.18.0')
   
   s.add_runtime_dependency "xmpp4r"
 

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.3')
-  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.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.18.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.12.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.10.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.8.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.11.0')
  
   # Development Gem dependencies
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.23.4
+  version: 0.24.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,66 +10,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000Z
+date: 2012-03-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &82400780 !ruby/object:Gem::Requirement
+  requirement: &69917940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.3
+        version: 0.18.0
   type: :runtime
   prerelease: false
-  version_requirements: *82400780
+  version_requirements: *69917940
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &82400510 !ruby/object:Gem::Requirement
+  requirement: &69917160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.5
+        version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *82400510
+  version_requirements: *69917160
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &82400150 !ruby/object:Gem::Requirement
+  requirement: &69912000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *82400150
+  version_requirements: *69912000
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &82399770 !ruby/object:Gem::Requirement
+  requirement: &69911150 !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: *82399770
+  version_requirements: *69911150
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &82399360 !ruby/object:Gem::Requirement
+  requirement: &69910580 !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: *82399360
+  version_requirements: *69910580
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &82399020 !ruby/object:Gem::Requirement
+  requirement: &69909850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *82399020
+  version_requirements: *69909850
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &82398740 !ruby/object:Gem::Requirement
+  requirement: &69908570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82398740
+  version_requirements: *69908570
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &82398200 !ruby/object:Gem::Requirement
+  requirement: &69907600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82398200
+  version_requirements: *69907600
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &82397890 !ruby/object:Gem::Requirement
+  requirement: &69905150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *82397890
+  version_requirements: *69905150
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &82397260 !ruby/object:Gem::Requirement
+  requirement: &69900360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *82397260
+  version_requirements: *69900360
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &82396780 !ruby/object:Gem::Requirement
+  requirement: &69899080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *82396780
+  version_requirements: *69899080
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &82396030 !ruby/object:Gem::Requirement
+  requirement: &69898360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *82396030
+  version_requirements: *69898360
 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: 
@@ -277,6 +277,7 @@ files:
 - base/app/assets/images/cleditor/toolbar.gif
 - base/app/assets/images/flags/en.png
 - base/app/assets/images/flags/es.png
+- base/app/assets/images/flags/pt.png
 - base/app/assets/images/frontpage/collaborate.png
 - base/app/assets/images/frontpage/comments.png
 - base/app/assets/images/frontpage/green_sq.png
@@ -344,9 +345,9 @@ files:
 - base/app/assets/javascripts/social_stream.objects.js
 - base/app/assets/javascripts/social_stream.search.js.erb
 - base/app/assets/javascripts/social_stream.timeline.js
+- base/app/assets/javascripts/social_stream.toolbar.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
 - base/app/assets/stylesheets/_colors.scss
 - base/app/assets/stylesheets/activities.css.scss.erb
@@ -389,12 +390,14 @@ files:
 - base/app/assets/stylesheets/toolbar.css
 - base/app/assets/stylesheets/users.css
 - base/app/controllers/activities_controller.rb
+- base/app/controllers/activity_actions_controller.rb
 - base/app/controllers/api_controller.rb
 - base/app/controllers/authentications_controller.rb
 - base/app/controllers/cheesecake_controller.rb
 - base/app/controllers/comments_controller.rb
 - base/app/controllers/contacts_controller.rb
 - base/app/controllers/conversations_controller.rb
+- base/app/controllers/followers_controller.rb
 - base/app/controllers/frontpage_controller.rb
 - base/app/controllers/groups_controller.rb
 - base/app/controllers/home_controller.rb
@@ -414,7 +417,9 @@ files:
 - base/app/controllers/ties_controller.rb
 - base/app/controllers/users_controller.rb
 - base/app/helpers/activities_helper.rb
+- base/app/helpers/activity_actions_helper.rb
 - base/app/helpers/contacts_helper.rb
+- base/app/helpers/followers_helper.rb
 - base/app/helpers/groups_helper.rb
 - base/app/helpers/location_helper.rb
 - base/app/helpers/notifications_helper.rb
@@ -429,6 +434,7 @@ files:
 - base/app/mailers/invitation_mailer.rb
 - base/app/models/ability.rb
 - base/app/models/activity.rb
+- base/app/models/activity_action.rb
 - base/app/models/activity_object.rb
 - base/app/models/activity_object_activity.rb
 - base/app/models/activity_object_property.rb
@@ -446,6 +452,7 @@ files:
 - base/app/models/profile.rb
 - base/app/models/relation.rb
 - base/app/models/relation/custom.rb
+- base/app/models/relation/follow.rb
 - base/app/models/relation/public.rb
 - base/app/models/relation/reject.rb
 - base/app/models/relation/single.rb
@@ -463,6 +470,11 @@ files:
 - base/app/views/activities/_wall.html.erb
 - base/app/views/activities/index.html.erb
 - base/app/views/activities/index.js.erb
+- base/app/views/activity_actions/_follow_form.html.erb
+- base/app/views/activity_actions/_follow_sentence.html.erb
+- base/app/views/activity_actions/_update_form.js.erb
+- base/app/views/activity_actions/create.js.erb
+- base/app/views/activity_actions/update.js.erb
 - base/app/views/activity_objects/_activity_object.html.erb
 - base/app/views/actors/_actor.html.erb
 - base/app/views/actors/_actor_cheesecake.html.erb
@@ -484,7 +496,8 @@ files:
 - base/app/views/contacts/_contact.html.erb
 - base/app/views/contacts/_form.html.erb
 - base/app/views/contacts/_index.html.erb
-- base/app/views/contacts/_link.html.erb
+- base/app/views/contacts/_link_custom.html.erb
+- base/app/views/contacts/_link_follow.html.erb
 - base/app/views/contacts/_pendings.html.erb
 - base/app/views/contacts/_suggestions.html.erb
 - base/app/views/contacts/_suggestions_and_pendings.html.erb
@@ -513,6 +526,9 @@ files:
 - base/app/views/devise/registrations/new.html.erb
 - base/app/views/devise/sessions/new.html.erb
 - base/app/views/devise/shared/_links.erb
+- base/app/views/followers/destroy.js.erb
+- base/app/views/followers/index.html.erb
+- base/app/views/followers/update.js.erb
 - base/app/views/frontpage/_caracteristics.html.erb
 - base/app/views/frontpage/_social_networks.html.erb
 - base/app/views/frontpage/_sponsor.html.erb
@@ -550,7 +566,6 @@ files:
 - base/app/views/layouts/_header_signed_out.erb
 - base/app/views/layouts/_representation.html.erb
 - base/app/views/layouts/_search.html.erb
-- base/app/views/layouts/_settings.html.erb
 - base/app/views/layouts/application.html.erb
 - base/app/views/layouts/frontpage.html.erb
 - base/app/views/likes/create.js.erb
@@ -628,10 +643,7 @@ files:
 - base/app/views/subjects/_subject.html.erb
 - base/app/views/subjects/_subject_with_details.html.erb
 - base/app/views/ties/index.html.erb
-- base/app/views/toolbar/_home.html.erb
 - base/app/views/toolbar/_logo.html.erb
-- base/app/views/toolbar/_messages.html.erb
-- base/app/views/toolbar/_profile.html.erb
 - base/app/views/toolbar/_subject.html.erb
 - base/app/views/users/_groups.html.erb
 - base/app/views/users/_index.html.erb
@@ -648,7 +660,9 @@ files:
 - base/app/views/users/show.xml.builder
 - base/config/locales/en.yml
 - base/config/locales/es.yml
+- base/config/locales/pt.yml
 - base/config/locales/rails.es.yml
+- base/config/locales/rails.pt.yml
 - base/config/routes.rb
 - base/db/migrate/20110610112023_create_social_stream.rb
 - base/db/migrate/20110705103202_empty_ties_count.rb
@@ -664,15 +678,18 @@ files:
 - base/db/migrate/20120201185454_singleton_single_relations.rb
 - base/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb
 - base/db/migrate/20120302215722_activity_object_properties.rb
+- base/db/migrate/20120316093946_create_activity_actions.rb
+- base/db/migrate/20120316113728_activity_action_follow.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
 - base/lib/generators/social_stream/base/templates/initializer.rb
-- base/lib/generators/social_stream/base/templates/navigation.rb
 - base/lib/generators/social_stream/base/templates/relations.yml
 - base/lib/generators/social_stream/base/templates/sphinx.yml
 - base/lib/i18n-js/social_stream-base.rb
+- base/lib/inherited_resources/social_stream.rb
 - base/lib/paperclip/social_stream.rb
+- base/lib/rails/social_stream.rb
 - base/lib/social_stream-base.rb
 - base/lib/social_stream/ability.rb
 - base/lib/social_stream/ability/base.rb
@@ -696,10 +713,10 @@ files:
 - base/lib/social_stream/populate.rb
 - base/lib/social_stream/test_helpers.rb
 - base/lib/social_stream/test_helpers/controllers.rb
-- base/lib/social_stream/toolbar_config/base.rb
 - base/lib/social_stream/views/list.rb
 - base/lib/social_stream/views/settings/base.rb
 - base/lib/social_stream/views/sidebar/base.rb
+- base/lib/social_stream/views/toolbar/base.rb
 - base/lib/tasks/db/populate.rake
 - base/lib/tasks/workers.rake
 - base/social_stream-base.gemspec
@@ -762,6 +779,7 @@ files:
 - base/spec/factories/tie.rb
 - base/spec/factories/user.rb
 - base/spec/integration/navigation_spec.rb
+- base/spec/models/activity_action_spec.rb
 - base/spec/models/activity_authorization_spec.rb
 - base/spec/models/activity_spec.rb
 - base/spec/models/actor_spec.rb
@@ -943,7 +961,7 @@ files:
 - documents/lib/social_stream/documents/engine.rb
 - documents/lib/social_stream/documents/version.rb
 - documents/lib/social_stream/migrations/documents.rb
-- documents/lib/social_stream/toolbar_config/documents.rb
+- documents/lib/social_stream/views/toolbar/documents.rb
 - documents/social_stream-documents.gemspec
 - documents/spec/controllers/documents_controller_spec.rb
 - documents/spec/controllers/pictures_controller_spec.rb
@@ -1028,6 +1046,11 @@ files:
 - events/app/models/room.rb
 - events/app/views/events/_calendar_month.erb
 - events/app/views/events/_event.html.erb
+- events/app/views/events/_event_date.html.erb
+- events/app/views/events/_event_date_sidebar.html.erb
+- events/app/views/events/_event_details.html.erb
+- events/app/views/events/_event_poster.html.erb
+- events/app/views/events/_event_sidebar.html.erb
 - events/app/views/events/_form_poster.html.erb
 - events/app/views/events/_new.html.erb
 - events/app/views/events/_sidebar_calendar.html.erb
@@ -1058,7 +1081,6 @@ files:
 - events/lib/social_stream/events/models/document.rb
 - events/lib/social_stream/events/version.rb
 - events/lib/social_stream/migrations/events.rb
-- events/lib/social_stream/toolbar_config/events.rb
 - events/lib/social_stream/views/settings/events.rb
 - events/lib/social_stream/views/sidebar/events.rb
 - events/social_stream-events.gemspec
@@ -1224,17 +1246,43 @@ files:
 - presence/app/assets/images/emoticons/present.png
 - presence/app/assets/images/emoticons/rain.png
 - presence/app/assets/images/emoticons/sun.png
+- presence/app/assets/images/games/sfighter/abobo/abobo.png
+- presence/app/assets/images/games/sfighter/abobo/abobo_block_81x130x1.png
+- presence/app/assets/images/games/sfighter/abobo/abobo_die_156x119x1.png
+- presence/app/assets/images/games/sfighter/abobo/abobo_hit_108x120x3.png
+- presence/app/assets/images/games/sfighter/abobo/abobo_idle_100x121x3.png
+- presence/app/assets/images/games/sfighter/abobo/abobo_kick_137x130x2.png
+- presence/app/assets/images/games/sfighter/abobo/abobo_punch_131x170x4.png
+- presence/app/assets/images/games/sfighter/abobo/abobo_walk_backward_94x126x6.png
+- presence/app/assets/images/games/sfighter/abobo/abobo_walk_forward_94x126x6.png
+- presence/app/assets/images/games/sfighter/cvs/cvs_block_69x99x2.png
+- presence/app/assets/images/games/sfighter/cvs/cvs_die_150x110x1.png
+- presence/app/assets/images/games/sfighter/cvs/cvs_hit_59x103x1.png
+- presence/app/assets/images/games/sfighter/cvs/cvs_idle_59x106x6.png
+- presence/app/assets/images/games/sfighter/cvs/cvs_kick_156x106x9.png
+- presence/app/assets/images/games/sfighter/cvs/cvs_punch_120x104x6.png
+- presence/app/assets/images/games/sfighter/cvs/cvs_walk_backward_58x106x5.png
+- presence/app/assets/images/games/sfighter/cvs/cvs_walk_forward_58x106x5.png
+- presence/app/assets/images/games/sfighter/stage/background1.png
+- presence/app/assets/images/games/sfighter/stage/background2.png
+- presence/app/assets/images/games/sfighter/stage/background3.png
+- presence/app/assets/images/games/sfighter/stage/foreground.png
+- presence/app/assets/images/games/sfighter/stage/ground.png
+- presence/app/assets/images/games/sfighter/thumbnail.png
 - presence/app/assets/images/games/ter/classic_aspa.png
 - presence/app/assets/images/games/ter/classic_board.png
 - presence/app/assets/images/games/ter/classic_circle.png
+- presence/app/assets/images/games/ter/classic_thumbnail.png
 - presence/app/assets/images/games/ter/modern_aspa.png
 - presence/app/assets/images/games/ter/modern_board.png
 - presence/app/assets/images/games/ter/modern_circle.png
+- presence/app/assets/images/games/ter/modern_thumbnail.png
 - presence/app/assets/images/status/available.png
 - presence/app/assets/images/status/away.png
 - presence/app/assets/images/status/chat.png
 - presence/app/assets/images/status/dnd.png
 - presence/app/assets/images/status/offline.png
+- presence/app/assets/images/webcam.png
 - presence/app/assets/javascripts/jquery.flexselect.sstreampresence.js
 - presence/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js
 - presence/app/assets/javascripts/presence.js.erb
@@ -1242,7 +1290,9 @@ files:
 - 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_factory.js.erb
 - presence/app/assets/javascripts/presence_game_interface.js.erb
+- presence/app/assets/javascripts/presence_game_sfighter.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
@@ -1307,6 +1357,7 @@ files:
 - presence/lib/social_stream/presence/xmpp_server_order.rb
 - presence/lib/social_stream/presence/xmpp_ssclient.rb
 - presence/lib/social_stream/views/settings/presence.rb
+- presence/lib/social_stream/views/toolbar/presence.rb
 - presence/lib/tasks/presence/installer.rake
 - presence/lib/tasks/presence/multidomain.rake
 - presence/lib/tasks/presence/synchronize.rake