social_stream-base 2.2.1 → 2.2.2

data/social_stream-base.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.authors = [ "GING - DIT - UPM" ]
   s.homepage = "http://social-stream.dit.upm.es/"
   s.files = `git ls-files`.split("\n")
+  s.license = 'MIT'
 
   # Runtime gem dependencies
   #
@@ -31,7 +32,7 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.5.1')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 1.1.1')
+  s.add_runtime_dependency('avatars_for_rails', '~> 1.1.4')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '>= 3.0.0')
   # jQuery UI

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -775,6 +775,7 @@ files:
 - app/controllers/tags_controller.rb
 - app/controllers/ties_controller.rb
 - app/controllers/users_controller.rb
+- app/decorators/avatars_controller_decorator.rb
 - app/helpers/activities_helper.rb
 - app/helpers/activity_actions_helper.rb
 - app/helpers/contacts_helper.rb
@@ -821,6 +822,8 @@ files:
 - app/models/site/current.rb
 - app/models/tie.rb
 - app/models/user.rb
+- app/overrides/avatars/_crop/add_actor_id.rb
+- app/overrides/avatars/_form/add_actor_id.rb
 - app/views/activities/_actions.html.erb
 - app/views/activities/_activity.html.erb
 - app/views/activities/_audience.html.erb
@@ -926,7 +929,6 @@ files:
 - app/views/groups/show.html.erb
 - app/views/groups/show.js.erb
 - app/views/home/index.html.erb
-- app/views/home/index.js.erb
 - app/views/invitation_mailer/send_invitation.html.erb
 - app/views/invitation_mailer/send_invitation.text.erb
 - app/views/invitations/_new.html.erb
@@ -1058,7 +1060,11 @@ files:
 - app/views/users/show.js.erb
 - app/views/users/show.xml.builder
 - config/locales/de.yml
+- config/locales/devise.de.yml
 - config/locales/devise.es.yml
+- config/locales/devise.fr.yml
+- config/locales/devise.hu.yml
+- config/locales/devise.nl.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/fr.yml
@@ -1131,6 +1137,7 @@ files:
 - lib/social_stream/base/thinking-sphinx.rb
 - lib/social_stream/base/version.rb
 - lib/social_stream/controllers/authorship.rb
+- lib/social_stream/controllers/avatars.rb
 - lib/social_stream/controllers/cancan_devise_integration.rb
 - lib/social_stream/controllers/helpers.rb
 - lib/social_stream/controllers/i18n_integration.rb
@@ -1159,6 +1166,7 @@ files:
 - lib/social_stream/views/location.rb
 - lib/tasks/attachments.rake
 - lib/tasks/db/populate.rake
+- lib/tasks/i18n.rake
 - lib/tasks/workers.rake
 - lib/thinking-sphinx/social_stream.rb
 - social_stream-base.gemspec
@@ -1264,7 +1272,8 @@ files:
 - vendor/assets/stylesheets/smoothness/jquery-ui-1.8.4.custom.css
 - vendor/assets/stylesheets/tipsy.css
 homepage: http://social-stream.dit.upm.es/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/app/views/home/index.js.erb

@@ -1,5 +0,0 @@
-$('#timeline').replaceWith("<%= escape_javascript render(:partial => 'activities/timeline', :locals => { :activities => current_subject.wall(:home).page(params[:page]) }) %>");
-
-setActivityPrivacyTooltips();
-
-$.scrollTo('#timeline', 1500,{axis:'y'});