social_stream-base 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 314e030fff300d9ef920c806a180decdab59f3f7
-  data.tar.gz: 201d735c965510992b547f6e642178df76a343e2
+  metadata.gz: cd89df7e42fd7901d1d336d47e00ea72d41ef925
+  data.tar.gz: 6592c04a04bbe762b083916784660eb2c42ff851
 SHA512:
-  metadata.gz: fd4b736a8340ce5047f415fc5c7eb819ae9852885994bde36ed9bfe92adb689565a84a257f1434fba7d075d4a849f3e74e6ffb760ad36aaaeb67f0d205916f7b
-  data.tar.gz: 8bd0bfc71b573a907a6879e68b468cd1acc12499ae4d8576761197ed720d0bffdae9484383ca173f874c055652fb42198761f38227ecc420b80e7575e7a0fc69
+  metadata.gz: 3033534f08f9cd002c68034f78e3429a33a3fa9a58db059ba7a3b644d249cc4c627f741b483e85a0e12af657bf17de878500e012e1428d21eeef81207c62b750
+  data.tar.gz: 748c0a830f3fd30088dc402812b7fe38214e3836faec2177e253964554a25a25c593f998cf51feb2d4b05fce9eeda774d0def1dfcf2c6f93378a05e331ec9d86

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

@@ -1,6 +1,6 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
+//= require jquery.ui.all
 //= require modernizr
 //= require bootstrap
 //= require bootstrap-multiselect

data/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass

@@ -33,6 +33,11 @@
         input
           &[type="submit"]
             @include btn-secundary
+    .personal
+      form.edit_profile
+        h6 
+          label
+            display: inline
     .avatar
       form.edit_actor
         background-color: $white
@@ -46,5 +51,4 @@
     h5
       color: $grayLighter
       font-size: 17px
-      font-weight: bold
-    
+      font-weight: bold

data/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass

@@ -65,12 +65,6 @@
 
 
 
-  #site_clients
-    #toolbar
-      background-color: $black
-
-
-
 
     #sidebar
       @include grid-core-span(3, $fluidGridColumnWidth, $fluidGridGutterWidth)

data/app/assets/stylesheets/social_stream/base/sidebar/responsive/_responsive-1200px-min.css.sass

@@ -8,6 +8,8 @@
   #sidebar
     #suggestions,
     #pendings
+      @include makeColumn(3,0)
+      margin-left: 0
       .data
         .info
           font-size: 14px

data/app/assets/stylesheets/social_stream/fonts/fonts.css

@@ -21,12 +21,12 @@
   font-family: "Josefin OSP";
   font-weight: normal;
   font-style: normal;
-  src: url(social_stream/fonts/josefinslab/JosefinSlabRegular.ttf);
+  src: url(social_stream/fonts/josefinSlab/JosefinSlabRegular.ttf);
 }
 
 @font-face{
   font-family: 'Josefin Overlay';
   font-weight: normal;
   font-style: normal;
-  src: url(social_stream/fonts/josefinslab/JosefinSlabOverlay.ttf);
-}
+  src: url(social_stream/fonts/josefinSlab/JosefinSlabOverlay.ttf);
+}

data/config/locales/en.yml

@@ -224,8 +224,7 @@ en:
     passwords:
       confirm: Confirm password
       forgot: Forgot your password?
-      instructions: 'Type the email address bound to your account and we will sent
-        you instructions to change it:'
+      instructions: 'Enter your email address and we will send you instructions to change it:'
       update: Change your password
   dropdown:
     notifications: Notifications

data/lib/social_stream/base/ability.rb

@@ -90,7 +90,7 @@ module SocialStream
         end
 
         # Privacy
-        can [:create, :read, :update, :destroy], Relation::Custom, :actor_id => subject.try(:actor_id)
+        can [:create, :read, :update, :destroy], ::Relation::Custom, :actor_id => subject.try(:actor_id)
       end
     end
   end

data/lib/social_stream/base/dependencies.rb

@@ -8,6 +8,8 @@ require 'rails_engine_decorators'
 require 'foreigner'
 # jQuery
 require 'jquery-rails'
+# jQuery UI
+require 'jquery-ui-rails'
 # Select2 javascript library
 require 'select2-rails'
 # Permalinks:

data/lib/social_stream/base/engine.rb

@@ -58,6 +58,10 @@ module SocialStream
 
       config.to_prepare do
         ApplicationController.rescue_handlers += [["CanCan::AccessDenied", :rescue_from_access_denied]]
+
+        # Load Relation::Public, so it is registered as descendant of Relation::Single
+        # and used in ActivityObject#allowed_relations
+        Relation::Public
       end
     end
   end

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.3".freeze
   end
 end

data/social_stream-base.gemspec

@@ -31,9 +31,11 @@ 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.0.7')
+  s.add_runtime_dependency('avatars_for_rails', '~> 1.1.0')
   # jQuery
-  s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
+  s.add_runtime_dependency('jquery-rails', '>= 3.0.0')
+  # jQuery UI
+  s.add_runtime_dependency('jquery-ui-rails', '>= 4.0.3')
   # Select2 javascript library
   s.add_runtime_dependency('select2-rails', '~> 3.3.0')
   # Authorization
@@ -65,7 +67,7 @@ Gem::Specification.new do |s|
   # I18n-js
   s.add_runtime_dependency('i18n-js','~>2.1.2')
   # Strong Parameters
-  s.add_runtime_dependency('strong_parameters','~> 0.1.5')
+  s.add_runtime_dependency('strong_parameters','~> 0.2.1')
   # Flash messages
   s.add_runtime_dependency('flashy','~> 0.0.1')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -128,28 +128,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -380,14 +394,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: flashy
   requirement: !ruby/object:Gem::Requirement