social_stream 0.12.4 → 0.12.5

data/social_stream.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.27')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.4.3')
-  s.add_runtime_dependency('social_stream-events', '~> 0.0.17')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.28')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.4.4')
+  s.add_runtime_dependency('social_stream-events', '~> 0.0.18')
  
   # Development Gem dependencies
   #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 0
   - 12
-  - 4
-  version: 0.12.4
+  - 5
+  version: 0.12.5
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 +01:00
+date: 2011-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 0
         - 9
-        - 27
-        version: 0.9.27
+        - 28
+        version: 0.9.28
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 0
         - 4
-        - 3
-        version: 0.4.3
+        - 4
+        version: 0.4.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 59
         segments: 
         - 0
         - 0
-        - 17
-        version: 0.0.17
+        - 18
+        version: 0.0.18
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -209,10 +209,6 @@ files:
 - base/app/assets/images/arrow-start.png
 - base/app/assets/images/arrow.png
 - base/app/assets/images/big-logo.png
-- base/app/assets/images/boxy/boxy-ne.png
-- base/app/assets/images/boxy/boxy-nw.png
-- base/app/assets/images/boxy/boxy-se.png
-- base/app/assets/images/boxy/boxy-sw.png
 - base/app/assets/images/btn/1-facebook.png
 - base/app/assets/images/btn/_notes/btn_certificates.png.mno
 - base/app/assets/images/btn/activity.png
@@ -449,7 +445,6 @@ files:
 - base/app/helpers/toolbar_helper.rb
 - base/app/helpers/users_helper.rb
 - base/app/mailers/invitation_mailer.rb
-- base/app/mailers/notification_mailer.rb
 - base/app/models/ability.rb
 - base/app/models/activity.rb
 - base/app/models/activity_object.rb
@@ -582,16 +577,16 @@ files:
 - base/app/views/notification_mailer/new_notification_email.text.erb
 - base/app/views/notifications/_index.html.erb
 - base/app/views/notifications/_notification.html.erb
-- base/app/views/notifications/activities/_follow_body.html.erb
-- base/app/views/notifications/activities/_follow_subject.html.erb
-- base/app/views/notifications/activities/_like_body.html.erb
-- base/app/views/notifications/activities/_like_subject.html.erb
-- base/app/views/notifications/activities/_make-friend_body.html.erb
-- base/app/views/notifications/activities/_make-friend_subject.html.erb
-- base/app/views/notifications/activities/_post_body.html.erb
-- base/app/views/notifications/activities/_post_subject.html.erb
-- base/app/views/notifications/activities/_update_body.html.erb
-- base/app/views/notifications/activities/_update_subject.html.erb
+- base/app/views/notifications/activities/_follow.html.erb
+- base/app/views/notifications/activities/_follow.text.erb
+- base/app/views/notifications/activities/_like.html.erb
+- base/app/views/notifications/activities/_like.text.erb
+- base/app/views/notifications/activities/_make-friend.html.erb
+- base/app/views/notifications/activities/_make-friend.text.erb
+- base/app/views/notifications/activities/_post.html.erb
+- base/app/views/notifications/activities/_post.text.erb
+- base/app/views/notifications/activities/_update.html.erb
+- base/app/views/notifications/activities/_update.text.erb
 - base/app/views/notifications/index.html.erb
 - base/app/views/notifications/index.js.erb
 - base/app/views/objects/_destroy.js.erb
@@ -1066,6 +1061,7 @@ files:
 - events/app/views/events/index.html.erb
 - events/app/views/events/manage.html.erb
 - events/app/views/events/manage.js.erb
+- events/app/views/events/new.html.erb
 - events/app/views/events/show.html.erb
 - events/app/views/frontpage/_caracteristics.html.erb
 - events/app/views/frontpage/index.html.erb
@@ -1089,6 +1085,8 @@ files:
 - events/config/routes.rb
 - events/db/migrate/20110910161707_create_social_stream_events.rb
 - events/db/migrate/20111102145626_add_more_fields_to_events.rb
+- events/db/migrate/20111104165944_add_more_fields_to_sessions.rb
+- events/db/migrate/20111104182420_add_details_to_events.rb
 - events/lib/generators/social_stream/events/install_generator.rb
 - events/lib/social_stream-events.rb
 - events/lib/social_stream/events/engine.rb
@@ -1125,6 +1123,16 @@ files:
 - presence/app/assets/audio/chat/onMessageAudio.mp3
 - presence/app/assets/audio/chat/onMessageAudio.wav
 - presence/app/assets/images/black_arrow3.png
+- presence/app/assets/images/emoticons/beer.png
+- presence/app/assets/images/emoticons/clock.png
+- presence/app/assets/images/emoticons/face-raspberry.png
+- presence/app/assets/images/emoticons/face-sad.png
+- presence/app/assets/images/emoticons/face-smile.png
+- presence/app/assets/images/emoticons/face-tired.png
+- presence/app/assets/images/emoticons/face-wink.png
+- 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/status/available.png
 - presence/app/assets/images/status/away.png
 - presence/app/assets/images/status/dnd.png

data/base/app/mailers/notification_mailer.rb

@@ -1,34 +0,0 @@
-#OVERRING WARNING
-#We must override the NotificationMailer from Mailboxer to change the new_notification_email method
-#refer to it for more info
-#NOTE: There is just few lines different from original Mailboxer NotificationMailer. Please maintain it
-#updated for correct behaviour
-class NotificationMailer < ActionMailer::Base
-  default :from => Mailboxer.default_from
-  #Sends and email for indicating a new notification to a receiver.
-  #It calls new_notification_email.
-  def send_email(notification,receiver)
-    new_notification_email(notification,receiver)
-  end
-
-  include ActionView::Helpers::SanitizeHelper
-  #DIFFERENT FROM ORIGINAL----------------------
-  include Mailboxer::NotificationDecoder
-  #END OF DIFFERENCE----------------------------
-
-  #Sends an email for indicating a new message for the receiver
-  def new_notification_email(notification,receiver)
-    @notification = notification
-    @receiver = receiver
-    #DIFFERENT FROM ORIGINAL----------------------
-    subject = notification.subject.to_s
-    subject = decode_basic_notification(subject,notification.notified_object)
-    subject = subject.gsub(/\n/,'')
-    #END OF DIFFERENCE----------------------------
-    subject = strip_tags(subject) unless subject.html_safe?
-    mail(:to => receiver.send(Mailboxer.email_method,notification), :subject => t('mailboxer.notification_mailer.subject', :subject => subject)) do |format|
-      format.text {render __method__}
-      format.html {render __method__}
-    end
-  end
-end

data/base/app/views/notifications/activities/_follow_body.html.erb

@@ -1,2 +0,0 @@
-%{confirm}
-

data/base/app/views/notifications/activities/_follow_subject.html.erb

@@ -1,5 +0,0 @@
-<% if activity.receiver.subject.is_a?(User) %>
-  <%= t('notification.added.user') %>
-<% else %>
-  <%= t('notification.added.other') %>
-<% end %>

data/base/app/views/notifications/activities/_like_body.html.erb

@@ -1,5 +0,0 @@
-<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
-  %{look}
-<% else %>
-  "%{object.text}" 
-<% end %>

data/base/app/views/notifications/activities/_like_subject.html.erb

@@ -1,9 +0,0 @@
-<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
-  <%= t('notification.fan')%>
-<% else %>
-  <% if activity.receiver.subject.is_a?(User) %>
-    <%= t('notification.like.user') %>
-  <% else %>
-    <%= t('notification.like.other') %>
-  <% end %>
-<% end %>

data/base/app/views/notifications/activities/_make-friend_body.html.erb

@@ -1,2 +0,0 @@
-%{look}
-

data/base/app/views/notifications/activities/_make-friend_subject.html.erb

@@ -1,5 +0,0 @@
-<% if activity.receiver.subject.is_a?(User) %>
-  <%= t('notification.makefriend.user') %>
-<% else %>
-  <%= t('notification.makefriend.other') %>
-<% end %>

data/base/app/views/notifications/activities/_post_body.html.erb

@@ -1,6 +0,0 @@
-<% if activity.direct_object.respond_to? :text %>
-  "%{object.text}"
-<%end%>
-<% if SocialStream.activity_forms.include? :document and activity.direct_object.is_a? Document %>
-  %{object.image}
-<% end%>

data/base/app/views/notifications/activities/_post_subject.html.erb

@@ -1,6 +0,0 @@
-<% if activity.receiver.subject.is_a?(User) %>
-  <%= t('notification.post.user') %>
-<% else %>
-  <%= t('notification.post.other') %>
-<% end %>
- 

data/base/app/views/notifications/activities/_update_body.html.erb

@@ -1,5 +0,0 @@
-<% if activity.receiver.subject.is_a?(User) %>
-  <%= t('notification.update.user') %>
-<% else %>
-  <%= t('notification.update.other') %>
-<% end %>

data/base/app/views/notifications/activities/_update_subject.html.erb

@@ -1,5 +0,0 @@
-<% if activity.receiver.subject.is_a?(User) %>
-  <%= t('notification.update.user') %>
-<% else %>
-  <%= t('notification.update.other') %>
-<% end %>