social_stream-base 0.7.4 → 0.7.5

data/app/assets/javascripts/posts.js

@@ -0,0 +1 @@
+//= require jquery.scrollTo.min

data/app/assets/stylesheets/activities.css

@@ -22,7 +22,8 @@
 	display: inline-block;	color: #000;	width: 100%;  font-size: 13px;  color: #2A3890;}
 .actor_logo {	width: 38px;	padding: 8px 0px 5px 5px;	display: inline-block;	vertical-align: top;}
 .activity_content {	padding: 8px 0px 0px 0px;	display: inline-block;	color: #000;	width: 90%;}
-.actor_name {	font-weight: bold;	color: #2A3890;  font-size: 13px;}
+.actor_name {font-size: 13px;}
+.actor_name a{font-weight: bold;}
 .post a {	color: #2A3890;}
 
 /***************** ACTIVITY OPTIONS ***/

data/app/assets/stylesheets/base.css

@@ -8,7 +8,7 @@ img {	border: 0px;}
 div {	margin: 0px;	padding: 0px;	font-family: Helvetica;	font-size: 11px;}
 .AbsWrap {	width: 100%;	position: relative;}
 .rowWrap {	width: 100%;}
-a:link,a:visited {	color: inherit;	text-decoration: inherit;}
+a:link,a:visited {	color: #2A3890;	text-decoration: inherit;}
 a:hover {	text-decoration: underline;}
 .clearfloat {	clear: both;	height: 0px;}
 h2{padding-left:10px;}

data/app/assets/stylesheets/header.css

@@ -28,6 +28,7 @@
 
 /******** MENU HEADER *******/
 #menu_home{	vertical-align: top; }
+#menu_home a {color:white;}
 #menu_home span {	float:left;	padding-right: 5px;	vertical-align: top;	padding-top: 5px;}
 #menu_home ul{	list-style: none;	margin: 0px;	float:left;}
 #menu_home ul li{	line-height:20px;	padding:5px 0px 5px 20px; vertical-align:top;}
@@ -53,6 +54,7 @@ li.btn_menu_browse{background: transparent url("btn/btn_browse.png") no-repeat l
 #account, #representation_li,#current_user_info, #representations_menu, #account_menu, #settings_menu {display:inline-block;vertical-align: top; height:22px; color:#FFF;}
 #representation_li{margin-left:10px;}
 #representation_text{display:inline;margin-left:2px;color:#FFF;}
+#current_user_info a{color:white;}
 li.btn_menu_representation{}
 #menu_home ul li.pipe,#menu_account ul li.pipe{padding:0px 3px 0px 3px; margin:0px;}
 .menu_white{display:inline-block; color:#fff;}

data/app/controllers/comments_controller.rb

@@ -8,5 +8,11 @@ class CommentsController < InheritedResources::Base
 
     destroy!
   end
+  
+  def show    
+    parent = resource.post_activity.parent
+    redirect_to polymorphic_path(parent.direct_object,:anchor => dom_id(parent))
+  end
+
 
 end

data/app/controllers/contacts_controller.rb

@@ -54,7 +54,7 @@ class ContactsController < ApplicationController
 
     respond_to do |format|
       format.html { @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
-      format.js { Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
+      format.js { @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
       format.json { render :text => @contacts.map{ |c| { 'key' => c.receiver_id.to_s, 'value' => self.class.helpers.truncate_name(c.receiver.name) } }.to_json }
     end
   end

data/app/helpers/notifications_helper.rb

@@ -12,6 +12,14 @@ module NotificationsHelper
                                                                               :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
     notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
     
+    if activity.receiver.subject.is_a?(User)
+      notification_text = notification_text.gsub(/\%\{whose\}/,"your")
+      notification_text = notification_text.gsub(/\%\{who\}/,"you")
+    else
+      notification_text = notification_text.gsub(/\%\{whose\}/,truncate_name(activity.receiver.name)+"'s")
+      notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
+    end
+      
     if activity.direct_object.present?
       object = activity.direct_object
       object = object.subject if object.is_a? Actor
@@ -21,7 +29,8 @@ module NotificationsHelper
       notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.downcase)
       notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '), 
                                                                           url_for(:controller=> object.class.to_s.downcase.pluralize, :action=> :show, 
-                                                                                  :id=> object.id, :only_path => false))) if object.respond_to? :text 
+                                                                                  :id=> object.id, :only_path => false))) if object.respond_to? :text
+      
       #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
       
     else

data/app/mailers/notification_mailer.rb

@@ -0,0 +1,31 @@
+#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
+  include Mailboxer::NotificationDecoder
+
+  #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 = notifications.subject_decoded
+    #END OF DIFFERENCE----------------------------
+    subject = strip_tags(subject) unless subject.html_safe?
+    mail(:to => receiver.send(Mailboxer.email_method), :subject => t('mailboxer.notification_mailer.subject', :subject => subject)) do |format|
+      format.text {render __method__}
+      format.html {render __method__}
+    end
+  end
+end

data/app/models/activity.rb

@@ -16,9 +16,12 @@ class Activity < ActiveRecord::Base
 
   paginates_per 10
 
-  belongs_to :contact
   belongs_to :activity_verb
 
+  belongs_to :contact
+  has_one :sender,   :through => :contact
+  has_one :receiver, :through => :contact
+
   has_many :audiences, :dependent => :destroy
   has_many :relations, :through => :audiences
 

data/app/models/actor.rb

@@ -28,6 +28,8 @@ class Actor < ActiveRecord::Base
   has_many :avatars,
            :validate => true,
            :autosave => true
+  has_one  :avatar,
+           :conditions => { :active => true }
   		  
   has_many :sent_contacts,
            :class_name  => 'Contact',
@@ -373,7 +375,7 @@ class Actor < ActiveRecord::Base
   end
 
   def avatar!
-    avatars.active.first || avatars.build
+    avatar || avatars.build
   end
   
   # The 'like' qualifications emmited to this actor

data/app/models/user.rb

@@ -12,7 +12,8 @@ class User < ActiveRecord::Base
   validates_presence_of :email
 
   validates_format_of :email, :with => Devise.email_regexp, :allow_blank => true
-  # TODO: uniqueness of email, which is in actor
+
+  validate :email_must_be_uniq
   
   with_options :if => :password_required? do |v|
     v.validates_presence_of     :password
@@ -45,9 +46,11 @@ class User < ActiveRecord::Base
     !persisted? || !password.nil? || !password_confirmation.nil?
   end
 
-     def find_first(options)
-      raise options.inspect
-    end
+  private
+
+  def email_must_be_uniq
+    errors.add(:email, "is already taken") if User.find_by_email(email).present?
+  end
   
   class << self
     %w( email slug name ).each do |a|

data/app/views/activities/_index.html.erb

@@ -8,8 +8,7 @@
     <%= render :partial => 'activities/new', :locals => { :receiver => owner } %>
   </div>
 
-  <div id="wall">
-    <%= render activities  %>
-    <%= paginate activities %>
-  </div>
+  <%= render :partial => 'activities/wall',
+             :locals  => { :activities => activities } %>
+
 </div>

data/app/views/activities/_wall.html.erb

@@ -0,0 +1,5 @@
+<div id="wall">
+  <%= render activities  %>
+  <%= paginate activities %>
+</div>
+

data/app/views/contacts/_contact.html.erb

@@ -5,7 +5,7 @@
   </div>
   <div class="sub-block">
     <div class="name">
-      <%= link_to(contact.receiver_subject.name, contact.receiver_subject, :class => "contact_link") %>
+      <%= link_to(truncate_name(contact.receiver_subject.name), contact.receiver_subject, :class => "contact_link") %>
     </div>
     <div class="brief">
       <%= contact_brief(contact.receiver_subject) %>

data/app/views/groups/show.js.erb

@@ -0,0 +1,2 @@
+<%= render :partial => 'subjects/show',
+           :locals  => { :subject => @group } %>

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

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

data/app/views/message_mailer/new_message_email.html.erb

@@ -1,3 +1,4 @@
+<% self.class.send :include, SubjectsHelper %>
 <!DOCTYPE html>
 <html>
   <head>
@@ -6,8 +7,8 @@
   <body>
     <div>
       <div style="padding: 10px 5px 5px 5px;">
-        <span style="font-weight: bold;"><%= @message.sender.name%></span>
-         has sent you a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %></h1>
+        <span style="font-weight: bold;"><%= truncate_name(@message.sender.name)%></span>
+         has sent a new message to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
       </div>
       <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
         <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
@@ -19,7 +20,7 @@
               <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @message.sender.profile.organization%></span>
             <% end %>
           </p>       
-          <p>
+          <p style="text-align: justify; font-style: italic;">
             <%= raw @message.body %>
           </p>
         </div>

data/app/views/message_mailer/new_message_email.text.erb

@@ -1,4 +1,5 @@
-<%= @message.sender.name%> has sent you a new message: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
+<% self.class.send :include, SubjectsHelper %>
+<%=truncate_name(@message.sender.name)%> has sent a new message to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
 
 -----------------------------------------------
 <%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>

data/app/views/message_mailer/reply_message_email.html.erb

@@ -1,3 +1,4 @@
+<% self.class.send :include, SubjectsHelper %>
 <!DOCTYPE html>
 <html>
   <head>
@@ -6,8 +7,8 @@
   <body>
     <div>
       <div style="padding: 10px 5px 5px 5px;">
-        <span style="font-weight: bold;"><%= @message.sender.name%></span> 
-        has sent a reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
+        <span style="font-weight: bold;"><%= truncate_name(@message.sender.name)%></span> 
+        has sent a reply to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
       </div>
       <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
         <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
@@ -19,7 +20,7 @@
               <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @message.sender.profile.organization%></span>
             <% end %>
           </p>       
-          <p>
+          <p style="text-align: justify; font-style: italic;">
             <%= raw @message.body %>
           </p>
         </div>

data/app/views/message_mailer/reply_message_email.text.erb

@@ -1,4 +1,5 @@
-<%= @message.sender.name%> has sent a reply: <%= @message.subject.html_safe? ? @message.subject : strip_tags(@message.subject) %>
+<% self.class.send :include, SubjectsHelper %>
+<%= truncate_name(@message.sender.name)%> has sent a reply to <%= @receiver.subject.is_a?(Group) ? @receiver.name : "you" %>
 
 -----------------------------------------------
 "<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>"

data/app/views/notification_mailer/new_notification_email.html.erb

@@ -5,14 +5,35 @@
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
   </head>
   <body>
-    <h1><%= strip_tags decode_notification @notification.subject,@notification.notified_object %></h1>
-    <blockquote>
-      <p>
-        <%= raw decode_notification @notification.body,@notification.notified_object %>
-      </p>
-    </blockquote>
-    <p>
-      Visit <%= link_to notifications_url,notifications_url %> and check all your notifications.
-    </p>
+    <div>
+      
+      <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
+        <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
+          <%if @notification.notified_object.nil? %>
+            <img src="http://<%= ActionMailer::Base.default_url_options[:host] +User.new.logo.url(:profile)%>" >
+          <%else%>
+            <img src="http://<%= ActionMailer::Base.default_url_options[:host] +@notification.notified_object.sender.logo.url(:profile)%>" alt="<%=@notification.notified_object.sender.name%>">
+          <%end%>
+        </div>
+        <div style=" margin: 5px 5px 5px 5px;">
+          <p style="font-weight: bold; "><%= @notification.notified_object.sender.name %>
+            <% if @notification.notified_object.sender.profile.organization? %>
+              <br/><span style="color: #6C6D6F; font-weight: normal;"><%= @notification.notified_object.sender.profile.organization%></span>
+            <% end %>
+          </p>
+          <p>
+            <%= strip_tags decode_notification @notification.subject,@notification.notified_object %>
+          </p>       
+          <p style="text-align: justify; font-style: italic;">
+            <%= raw decode_notification @notification.body,@notification.notified_object %>
+          </p>
+        </div>
+      </div>
+      <div style="padding: 10px 5px 5px 5px;">    
+        <p>
+          Visit <%= link_to notifications_url,notifications_url %> and check all your notifications. 
+        </p>
+      </div>
+    </div>
   </body>
 </html>

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

@@ -1,2 +1,2 @@
-%{sender} added you as contact.
+%{sender} added %{who} as contact.
 

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

@@ -1,5 +1,5 @@
 <% if activity.direct_object.is_a? Actor %>
-  %{sender} is now your fan.
+  %{sender} is now %{whose} fan.
 <% else %>
-  %{sender} likes your %{object.name} 
+  %{sender} likes %{whose} %{object.name} 
 <% end %>

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

@@ -1,2 +1,2 @@
-%{sender} also added you as contact. 
+%{sender} also added %{who} as contact. 
 

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

@@ -1 +1 @@
-%{sender} added a %{object} in your wall 
+%{sender} added a %{object} in %{whose} wall 

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

@@ -1 +1 @@
-%{sender} updated a %{object} in your wall. 
+%{sender} updated a %{object} in %{whose} wall. 

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

@@ -1 +1 @@
-%{sender.name} updated a %{object.name} in your wall
+%{sender.name} updated a %{object.name} in %{whose} wall

data/app/views/posts/show.html.erb

@@ -1,2 +1,10 @@
+<% content_for :javascript do %>
+    var message_hash = window.location.hash.match(/^.*activity_(\d+).*$/);
+    if (message_hash && message_hash > 0){
+      $.scrollTo('#activity_' + message_hash[1] ,1500,{axis:'y'});
+    }
+<% end %>
+
 <%= render :partial => 'objects/show',
            :locals  => { :object => @post } %>
+

data/app/views/subjects/_show.js.erb

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

data/app/views/users/show.js.erb

@@ -0,0 +1,2 @@
+<%= render :partial => 'subjects/show',
+           :locals  => { :subject => @user } %>

data/config/locales/en.yml

@@ -76,7 +76,7 @@ en:
     confirm_delete: "Delete comment?"
   contact:
     all_n: "All contacts (%{count})"
-    addressbook: "Addressbook"
+    current: "Current"
     edit:
       title: "Edit contact to %{name}"
       submit: "Edit Contact"
@@ -88,7 +88,7 @@ en:
     one: "Contact"
     other: "Contacts"
     pending:
-      other: "Pending requests"
+      other: "Pending"
       all: "All"
       all_n: "See all pending requests (%{count})"
     relation:

data/lib/mailboxer/notification_decoder.rb

@@ -0,0 +1,5 @@
+module Mailboxer
+  module NotificationDecoder
+   
+  end
+end

data/lib/social_stream-base.rb

@@ -104,4 +104,8 @@ module SocialStream
   end
 end
 
+module Mailboxer
+  autoload :NotificationDecoder,   'mailboxer/notification_decoder'
+end
+
 require 'social_stream/base'

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.7.4".freeze
+    VERSION = "0.7.5".freeze
   end
 end

data/lib/social_stream/toolbar_config.rb

@@ -42,9 +42,9 @@ module SocialStream
         :url => "#",
         :options => {:link => {:id => "contacts_menu"}},
         :items => [
-          {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.addressbook'), :url => contacts_path},
-          {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path},
-          {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => contacts_path(:pending=>true)}
+          {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.current'), :url => contacts_path},
+          {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => contacts_path(:pending=>true)},
+          {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
         ]}
 
       #Subjects

data/social_stream-base.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.4.2')
+  s.add_runtime_dependency('mailboxer','~> 0.4.3')
   # Avatar manipulation
   s.add_runtime_dependency('rmagick','~> 2.13.1')
   # Tagging

data/vendor/assets/stylesheets/smoothness/jquery-ui-1.7.3.custom.css

@@ -49,7 +49,7 @@
 .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
 .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
+/* .ui-widget-content a { color: #222222; }*/
 .ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
 .ui-widget-header a { color: #222222; }
 

data/vendor/assets/stylesheets/smoothness/jquery-ui-1.8.4.custom.css

@@ -60,7 +60,7 @@
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
 .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(/images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
+/*.ui-widget-content a { color: #222222; }*/
 .ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
 .ui-widget-header a { color: #222222; }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -205,12 +205,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 4
-        - 2
-        version: 0.4.2
+        - 3
+        version: 0.4.3
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -612,6 +612,7 @@ files:
 - app/assets/javascripts/invitations.js
 - app/assets/javascripts/layouts.js
 - app/assets/javascripts/messages.js
+- app/assets/javascripts/posts.js
 - app/assets/javascripts/profiles.js
 - app/assets/javascripts/relation_customs.js
 - app/assets/javascripts/settings.js
@@ -685,6 +686,7 @@ files:
 - app/helpers/toolbar_helper.rb
 - app/helpers/users_helper.rb
 - app/mailers/invitation_mailer.rb
+- app/mailers/notification_mailer.rb
 - app/models/ability.rb
 - app/models/activity.rb
 - app/models/activity_object.rb
@@ -713,6 +715,7 @@ files:
 - app/views/activities/_new.html.erb
 - app/views/activities/_options.html.erb
 - app/views/activities/_root.html.erb
+- app/views/activities/_wall.html.erb
 - app/views/activities/_walls.html.erb
 - app/views/activities/index.js.erb
 - app/views/activity_objects/_activity_object.html.erb
@@ -765,9 +768,11 @@ files:
 - app/views/groups/index.js.erb
 - app/views/groups/new.html.erb
 - app/views/groups/show.html.erb
+- app/views/groups/show.js.erb
 - app/views/home/_groups.html.erb
 - app/views/home/_sidebar.html.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
@@ -839,6 +844,7 @@ files:
 - app/views/settings/index.html.erb
 - app/views/settings/index.js.erb
 - app/views/subjects/_contacts.html.erb
+- app/views/subjects/_show.js.erb
 - app/views/subjects/_subject.html.erb
 - app/views/toolbar/_home.html.erb
 - app/views/toolbar/_logo.html.erb
@@ -851,6 +857,7 @@ files:
 - app/views/users/index.js.erb
 - app/views/users/info.html.erb
 - app/views/users/show.html.erb
+- app/views/users/show.js.erb
 - app/views/users/show.xml.builder
 - bin/social_stream
 - bin/social_stream_heroku
@@ -866,6 +873,7 @@ files:
 - lib/generators/social_stream/base/templates/initializer.rb
 - lib/generators/social_stream/base/templates/navigation.rb
 - lib/generators/social_stream/base/templates/relations.yml
+- lib/mailboxer/notification_decoder.rb
 - lib/paperclip/social_stream.rb
 - lib/social_stream-base.rb
 - lib/social_stream/ability.rb