social_stream 0.17.1 → 0.18.0

data/events/app/views/events/index.html.erb

@@ -33,6 +33,7 @@
         center: 'title',
         right: 'month,agendaWeek,agendaDay'
       },
+      ignoreTimezone: false,
       firstDay: 1,
       eventColor: SocialStream.Events.current.eventColor,
       <% if can? :create, new_post(profile_subject) %>

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.4.0".freeze
+    VERSION = "0.5.0".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.5')
   s.add_runtime_dependency('coffee-rails', '> 3.1.0')
 

data/lib/social_stream/release.rb

@@ -1,7 +1,7 @@
 module SocialStream
   module Release
     class << self
-      def create(*args)
+      def update(*args)
         # First of all, update gems
         system "bundle"
 
@@ -13,10 +13,18 @@ module SocialStream
 
         system("git commit #{ all.map(&:commit_files).join(" ") } -m #{ @global.version }") ||
           raise(RuntimeError.new)
+      end
 
+      def release
         all.each(&:rake_release)
       end
 
+      def create(*args)
+        update *args
+
+        release
+      end
+
       def dependencies
         @dependencies ||=
           Global::Release.new.dependencies
@@ -39,7 +47,11 @@ module SocialStream
       end
 
       def all
-        @components + [ @global ]
+        components + [ @global ]
+      end
+
+      def components
+        @components ||= dependencies.map{ |d| Component::Release.new(d) }
       end
     end
   end

data/lib/social_stream/release/component/release.rb

@@ -4,7 +4,7 @@ module SocialStream
       class Release < ::SocialStream::Release::Global::Release
         attr_reader :name
 
-        def initialize(name, version)
+        def initialize(name, version = nil)
           @name, @target = name, version
         end
 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.17.1".freeze
+  VERSION = "0.18.0".freeze
 end

data/linkser/app/assets/stylesheets/linkser.css.scss

@@ -30,8 +30,8 @@
 .link .thumbnail, .link .thumbnail img{
   position: relative;
   float: left;
-  max-height: 100px;
-  max-width: 120px;
+  max-height: 97px;
+  max-width: 130px;
   margin-right:10px;
 }
 .link .thumbnail img.play_button{
@@ -51,7 +51,7 @@
   text-align: left;
 }
 .activity_objects .link .info{
-  width: 320px;
+  width: 310px;
 }
 .link .info .title{
   font-weight: bold;

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.2.0".freeze
+    VERSION = "0.3.0".freeze
   end
 end

data/linkser/social_stream-linkser.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.0')
   s.add_runtime_dependency('linkser', '~> 0.0.10')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

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

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   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.12.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.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.12.1')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.7.0')
-  s.add_runtime_dependency('social_stream-events', '~> 0.4.0')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.2.0')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.3.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.8.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.5.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.3.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.4.0')
  
   # Development Gem dependencies
   #

data/social_stream.thor

@@ -5,6 +5,12 @@ class SocialStream < Thor
 
   desc "release", "release SocialStream's gems"
   def release(*args)
-    ::SocialStream::Release.create *args
+    ::SocialStream::Release.release
   end
+
+  desc "update", "set SocialStream's dependencies"
+  def update(*args)
+    ::SocialStream::Release.update *args
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,66 +10,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &80375130 !ruby/object:Gem::Requirement
+  requirement: &86262010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *80375130
+  version_requirements: *86262010
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &81047060 !ruby/object:Gem::Requirement
+  requirement: &86261700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *81047060
+  version_requirements: *86261700
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &81455940 !ruby/object:Gem::Requirement
+  requirement: &86261400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *81455940
+  version_requirements: *86261400
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &81467210 !ruby/object:Gem::Requirement
+  requirement: &86260980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *81467210
+  version_requirements: *86260980
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &81470040 !ruby/object:Gem::Requirement
+  requirement: &86260180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *81470040
+  version_requirements: *86260180
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &81471880 !ruby/object:Gem::Requirement
+  requirement: &86259520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *81471880
+  version_requirements: *86259520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &81473830 !ruby/object:Gem::Requirement
+  requirement: &86258730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81473830
+  version_requirements: *86258730
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &82029890 !ruby/object:Gem::Requirement
+  requirement: &86258330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *82029890
+  version_requirements: *86258330
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &83136780 !ruby/object:Gem::Requirement
+  requirement: &86257640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *83136780
+  version_requirements: *86257640
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &83519560 !ruby/object:Gem::Requirement
+  requirement: &86257150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *83519560
+  version_requirements: *86257150
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &83620270 !ruby/object:Gem::Requirement
+  requirement: &86256680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *83620270
+  version_requirements: *86256680
 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: 
@@ -260,6 +260,8 @@ files:
 - base/app/assets/images/cancel.png
 - base/app/assets/images/cleditor/buttons.gif
 - 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/frontpage/collaborate.png
 - base/app/assets/images/frontpage/comments.png
 - base/app/assets/images/frontpage/green_sq.png
@@ -325,7 +327,6 @@ files:
 - base/app/assets/javascripts/ties.js
 - base/app/assets/javascripts/toolbar.js
 - base/app/assets/javascripts/users.js
-- base/app/assets/stylesheets/0_devise_sign.css
 - base/app/assets/stylesheets/_colors.scss
 - base/app/assets/stylesheets/activities.css.scss
 - base/app/assets/stylesheets/base.css.scss
@@ -395,6 +396,7 @@ files:
 - base/app/helpers/contacts_helper.rb
 - base/app/helpers/groups_helper.rb
 - base/app/helpers/location_helper.rb
+- base/app/helpers/notifications_helper.rb
 - base/app/helpers/permissions_helper.rb
 - base/app/helpers/profiles_helper.rb
 - base/app/helpers/search_helper.rb
@@ -445,8 +447,10 @@ files:
 - base/app/views/api/activity_atom_feed.atom.builder
 - base/app/views/avatars/index.html.erb
 - base/app/views/avatars/update.js.erb
+- base/app/views/cheesecake/_cheesecake.html.erb
 - base/app/views/cheesecake/_index.html.erb
 - base/app/views/cheesecake/index.html.erb
+- base/app/views/cheesecake/update.js.erb
 - base/app/views/comments/_comment.html.erb
 - base/app/views/comments/_new.html.erb
 - base/app/views/comments/create.js.erb
@@ -510,6 +514,7 @@ files:
 - base/app/views/invitations/new.html.erb
 - base/app/views/invitations/new.js.erb
 - base/app/views/layouts/_account.html.erb
+- base/app/views/layouts/_devise_style.html.erb
 - base/app/views/layouts/_flash.html.erb
 - base/app/views/layouts/_footer.html.erb
 - base/app/views/layouts/_header.erb
@@ -628,6 +633,7 @@ files:
 - base/db/migrate/20120103103125_add_channels.rb
 - base/db/migrate/20120109081509_update_notify_permissions.rb
 - base/db/migrate/20120111120920_remove_language_default.rb
+- base/db/migrate/20120111141717_activity_channels.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
@@ -650,6 +656,7 @@ files:
 - base/lib/social_stream/d3.rb
 - base/lib/social_stream/migrations/base.rb
 - base/lib/social_stream/migrations/components.rb
+- base/lib/social_stream/models/channeled.rb
 - base/lib/social_stream/models/object.rb
 - base/lib/social_stream/models/subject.rb
 - base/lib/social_stream/models/subtype.rb
@@ -758,7 +765,6 @@ files:
 - 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/menu.js
 - base/vendor/assets/javascripts/superfish.js
 - base/vendor/assets/stylesheets/carousel.css
 - base/vendor/assets/stylesheets/chosen-sprite.png
@@ -974,7 +980,6 @@ files:
 - events/app/assets/stylesheets/social_stream-events.css
 - events/app/controllers/events_controller.rb
 - events/app/controllers/rooms_controller.rb
-- events/app/helpers/events_helper.rb
 - events/app/models/event.rb
 - events/app/models/room.rb
 - events/app/views/events/_calendar_month.erb

data/base/vendor/assets/javascripts/menu.js

@@ -1,25 +0,0 @@
-function initMenu() {
-	$('.toolbar_menu ul li ul').hide();
-	$('.toolbar_menu li a').click( function() {
-		$(this).next().slideToggle('normal');
-	}
-	);
-	//Logo menu for current subject
-  //Full Caption Sliding (Hidden to Visible)
-  $('.logo_grid.logo_full').hover( function() {
-    $(".logo_menu", this).stop().animate({top:'101px'},{queue:false,duration:160});
-  }, function() {
-    $(".logo_menu", this).stop().animate({top:'1119px'},{queue:false,duration:160});
-  });
-}
-
-function expandSubMenu(id) {
-	$('#' + id + '_menu').next().show();
-}
-
-$(document).ready(function() {
-	initMenu();
-});
-
-
-

data/events/app/helpers/events_helper.rb

@@ -1,26 +0,0 @@
-module EventsHelper
-  def event_class(day)
-    begin_date = Time.now.beginning_of_week.to_date
-    end_date   = begin_date + 28
-
-    busy_dates =
-      profile_or_current_subject.
-        events.
-        ocurrences(begin_date, end_date)
-
-    [].tap { |css|
-      css <<
-        if day < Date.today
-          "past"
-        elsif day == Date.today
-          "today"
-        elsif day.month != Date.today.month
-          "next_month"
-        end
-
-
-      css << "busy" if busy_dates.include?(day)
-
-    }.join(" ")
-  end
-end