Merge branch 'noosfero' into rails4

Braulio Bhavamitra
2 parents d6340a14 180ad529
Showing 754 changed files with 35050 additions and 9712 deletions Show diff stats
AUTHORS.md
app/controllers/application_controller.rb
app/controllers/my_profile/enterprise_validation_controller.rb
app/controllers/my_profile/favorite_enterprises_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/action_tracker_helper.rb
app/helpers/layout_helper.rb
app/mailers/scrap_notifier.rb
app/models/add_member.rb
app/models/article.rb
app/models/community.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/favorite_enterprise_person.rb
app/models/organization.rb
app/models/person.rb
app/models/person_notifier.rb
app/models/product.rb
@@ -17,11 +17,13 @@ Ana Losnak &lt;analosnak@gmail.com&gt;
 Ana Paula Vargas <anapaulavnoronha@gmail.com>
 Andre Bedran <bedran.fleck@gmail.com>
 André Guedes <andrebsguedes@gmail.com>
+Andrey Aleksanyants <aaleksanyants@yahoo.com>
 Antonio Terceiro <terceiro@colivre.coop.br>
 Arthur Del Esposte <arthurmde@gmail.com>
 Athos Ribeiro <athoscribeiro@gmail.com>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <braulio@eita.org.br>
+Brenddon Gontijo <brenddongontijo@msn.com>
 Caio Formiga <caio.formiga@gmail.com>
 Caio Salgado <caio.csalgado@gmail.com>
 Caio SBA <caio@colivre.coop.br>
@@ -7,7 +7,10 @@ class ApplicationController &lt; ActionController::Base
   before_filter :detect_stuff_by_domain
   before_filter :init_noosfero_plugins
   before_filter :allow_cross_domain_access
+
+  before_filter :login_from_cookie
   before_filter :login_required, :if => :private_environment?
+
   before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
   before_filter :redirect_to_current_user
 class EnterpriseValidationController < MyProfileController
   protect 'validate_enterprise', :profile
-  
+
   def index
     @pending_validations = profile.pending_validations
   end
@@ -27,7 +27,7 @@ class EnterpriseValidationController &lt; MyProfileController
   post_only :reject
   def reject
     @pending = profile.find_pending_validation(params[:id])
-    if @pending 
+    if @pending
       @pending.reject_explanation = params[:reject_explanation]
       begin
         @pending.reject
 class FavoriteEnterprisesController < MyProfileController
-  
-#  protect 'manage_favorite_enteprises', :profile
+
+#  protect 'manage_favorite_enterprises', :profile
   requires_profile_class Person
-  
+
   def index
     @favorite_enterprises = profile.favorite_enterprises
   end
@@ -12,7 +12,7 @@ class FavoriteEnterprisesController &lt; MyProfileController
     @favorite_enterprise = Enterprise.find(params[:id])
     if request.post? && params[:confirmation]
       profile.favorite_enterprises << @favorite_enterprise
-      redirect_to :action => 'index' 
+      redirect_to :action => 'index'
     end
   end
@@ -5,6 +5,7 @@ class ProfileEditorController &lt; MyProfileController
   before_filter :access_welcome_page, :only => [:welcome_page]
   before_filter :back_to
+  before_filter :forbid_destroy_profile, :only => [:destroy_profile]
   helper_method :has_welcome_page
   def index
@@ -109,7 +110,7 @@ class ProfileEditorController &lt; MyProfileController
       profile = environment.profiles.find(params[:id])
       if profile.disable
         profile.save
-        session[:notice] = _("The profile '#{profile.name}' was deactivated.")
+        session[:notice] = _("The profile '%s' was deactivated.") % profile.name
       else
         session[:notice] = _('Could not deactivate profile.')
       end
@@ -123,7 +124,7 @@ class ProfileEditorController &lt; MyProfileController
       profile = environment.profiles.find(params[:id])
       if profile.enable
-        session[:notice] = _("The profile '#{profile.name}' was activated.")
+        session[:notice] = _("The profile '%s' was activated.") % profile.name
       else
         session[:notice] = _('Could not activate the profile.')
       end
@@ -155,4 +156,10 @@ class ProfileEditorController &lt; MyProfileController
     end
   end
+  def forbid_destroy_profile
+    if environment.enabled?('forbid_destroy_profile') && !current_person.is_admin?(environment)
+      session[:notice] = _('You can not destroy the profile.')
+      redirect_to_previous_location
+    end
+  end
 end
@@ -50,10 +50,12 @@ class AccountController &lt; ApplicationController
     if logged_in?
       check_join_in_community(self.current_user)
+
       if params[:remember_me] == "1"
         self.current_user.remember_me
-        cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
+        cookies[:auth_token] = {value: self.current_user.remember_token, expires: self.current_user.remember_token_expires_at}
       end
+
       if redirect?
         go_to_initial_page
         session[:notice] = _("Logged in successfully")
@@ -92,6 +94,7 @@ class AccountController &lt; ApplicationController
     @invitation_code = params[:invitation_code]
     begin
       @user = User.new(params[:user])
+      @user.session = session
       @user.terms_of_use = environment.terms_of_use
       @user.environment = environment
       @terms_of_use = environment.terms_of_use
@@ -435,7 +438,7 @@ class AccountController &lt; ApplicationController
   end
   def go_to_signup_initial_page
-    check_redirection_options(user, user.environment.redirection_after_signup, user.url)
+    check_redirection_options user, user.environment.redirection_after_signup, user.url, signup: true
   end
   def redirect_if_logged_in
@@ -455,8 +458,11 @@ class AccountController &lt; ApplicationController
   protected
-  def check_redirection_options(user, condition, default)
-    case condition
+  def check_redirection_options user, condition, default, options={}
+    if options[:signup] and target = session.delete(:after_signup_redirect_to)
+      redirect_to target
+    else
+      case condition
       when 'keep_on_same_page'
         redirect_back_or_default(user.admin_url)
       when 'site_homepage'
@@ -469,8 +475,11 @@ class AccountController &lt; ApplicationController
         redirect_to user.admin_url
       when 'welcome_page'
         redirect_to :controller => :home, :action => :welcome, :template_id => (user.template && user.template.id)
-    else
-      redirect_back_or_default(default)
+      when 'custom_url'
+        if (url = user.custom_url_redirection).present? then redirect_to url else redirect_back_or_default default end
+      else
+        redirect_back_or_default(default)
+      end
     end
   end
@@ -6,6 +6,7 @@ class ProfileController &lt; PublicController
   before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
   helper TagsHelper
+  helper ActionTrackerHelper
   protect 'send_mail_to_members', :profile, :only => [:send_mail]
@@ -0,0 +1,94 @@
+module ActionTrackerHelper
+
+  def create_article_description ta
+    _('published an article: %{title}') % { title: link_to(truncate(ta.get_name), ta.get_url) }
+  end
+
+  def new_friendship_description ta
+    n_('has made 1 new friend:<br />%{name}', 'has made %{num} new friends:<br />%{name}', ta.get_friend_name.size) % {
+      num: ta.get_friend_name.size,
+      name: ta.collect_group_with_index(:friend_name) do |n,i|
+        link_to image_tag(ta.get_friend_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/person-icon.png")),
+                ta.get_friend_url[i], title: n
+      end.join
+    }
+  end
+
+  def join_community_description ta
+    n_('has joined 1 community:<br />%{name}', 'has joined %{num} communities:<br />%{name}', ta.get_resource_name.size) % {
+      num: ta.get_resource_name.size,
+      name: ta.collect_group_with_index(:resource_name) do |n,i|
+        link_to image_tag(ta.get_resource_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/community-icon.png")),
+                ta.get_resource_url[i], title: n
+      end.join
+    }
+  end
+
+  def add_member_in_community_description ta
+    _('has joined the community.')
+  end
+
+  def upload_image_description ta
+    total = ta.get_view_url.size
+    (n_('uploaded 1 image', 'uploaded %d images', total) % total) +
+      tag(:br) +
+      ta.collect_group_with_index(:thumbnail_path) do |t,i|
+        if total == 1
+          link_to image_tag(t), ta.get_view_url[i], class: 'upimg'
+        else
+          pos = total-i;
+          morethen2 = pos>2 ? 'morethen2' : ''
+          morethen5 = pos>5 ? 'morethen5' : ''
+          t = t.gsub(/(.*)(display)(.*)/, '\\1thumb\\3')
+
+          link_to '&nbsp;'.html_safe, ta.get_view_url[i],
+            style: "background-image:url(#{t})",
+            class: "upimg pos#{pos} #{morethen2} #{morethen5}"
+        end
+      end.reverse.join +
+      if total <= 5 then ''.html_safe else content_tag :span, '&hellip;'.html_safe,
+        class: 'more', onclick: "this.parentNode.className+=' show-all'" end +
+      tag(:br, style: 'clear: both')
+  end
+
+  def reply_scrap_description ta
+    _('sent a message to %{receiver}: <br /> "%{message}"') % {
+      receiver: link_to(ta.get_receiver_name, ta.get_receiver_url),
+      message: auto_link_urls(ta.get_content)
+    }
+  end
+
+  alias :leave_scrap_description :reply_scrap_description
+  alias :reply_scrap_on_self_description :reply_scrap_description
+
+  def leave_scrap_to_self_description ta
+    _('wrote: <br /> "%{text}"') % {
+      text: auto_link_urls(ta.get_content)
+    }
+  end
+
+  def create_product_description
+    _('created the product %{title}') % {
+      title: link_to(truncate(ta.get_name), ta.get_url),
+    }
+  end
+
+  def update_product_description
+    _('updated the product %{title}') % {
+      title: link_to(truncate(ta.get_name), ta.get_url),
+    }
+  end
+
+  def remove_product_description
+    _('removed the product %{title}') % {
+      title: truncate(ta.get_name),
+    }
+  end
+
+  def favorite_enterprise_description ta
+    _('favorited enterprise %{title}') % {
+      title: link_to(truncate(ta.get_enterprise_name), ta.get_enterprise_url),
+    }
+  end
+
+end
@@ -77,15 +77,8 @@ module LayoutHelper
   def icon_theme_stylesheet_path
-    icon_themes = []
     theme_icon_themes = theme_option(:icon_theme) || []
-    for icon_theme in theme_icon_themes do
-      theme_path = "designs/icons/#{icon_theme}/style.css"
-      if File.exists?(Rails.root.join('public', theme_path))
-        icon_themes << theme_path
-      end
-    end
-    icon_themes
+    theme_icon_themes.map{ |it| "designs/icons/#{it}/style.css" }
   end
   def jquery_ui_theme_stylesheet_path
@@ -3,6 +3,8 @@ class ScrapNotifier &lt; ApplicationMailer
   def notification(scrap)
     sender, receiver = scrap.sender, scrap.receiver
     self.environment = sender.environment
+    # for tests
+    return unless receiver.email
     @recipient = receiver.name
     @sender = sender.name
@@ -26,7 +26,8 @@ class AddMember &lt; Task
   end
   def information
-    {:message => _('%{requestor} wants to be a member of this community.')}
+    {:message => _("%{requestor} wants to be a member of '%{organization}'."),
+     variables: {requestor: requestor.name, organization: organization.name}}
   end
   def accept_details
@@ -42,7 +43,7 @@ class AddMember &lt; Task
   end
   def target_notification_description
-    _('%{requestor} wants to be a member of this community.') % {:requestor => requestor.name}
+    _("%{requestor} wants to be a member of '%{organization}'.") % {:requestor => requestor.name, :organization => organization.name}
   end
   def target_notification_message
@@ -8,7 +8,8 @@ class Article &lt; ActiveRecord::Base
                   :accept_comments, :feed, :published, :source, :source_name,
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
-                  :image_builder, :show_to_followers
+                  :image_builder, :show_to_followers,
+                  :author
   acts_as_having_image
@@ -86,8 +86,8 @@ class Community &lt; Organization
     {:title => _('Community Info and settings'), :icon => 'edit-profile-group'}
   end
-  def activities
-    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.target_id = #{self.id} and action_tracker.verb != 'join_community' and action_tracker.verb != 'leave_scrap' UNION SELECT at.id, at.updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} at INNER JOIN articles a ON at.target_id = a.id WHERE a.profile_id = #{self.id} AND at.target_type = 'Article' ORDER BY updated_at DESC")
+  def exclude_verbs_on_activities
+    %w[join_community leave_scrap]
   end
 end
@@ -15,12 +15,15 @@ class Enterprise &lt; Organization
   N_('Enterprise')
-  has_many :products, :foreign_key => :profile_id, :dependent => :destroy, :order => 'name ASC'
+  acts_as_trackable after_add: proc{ |p, t| notify_activity t }
+
+  has_many :products, :foreign_key => :profile_id, :dependent => :destroy
+  has_many :product_categories, :through => :products
   has_many :inputs, :through => :products
   has_many :production_costs, :as => :owner
   has_many :favorite_enterprise_people
-  has_many :fans, through: :favorite_enterprise_people, source: :person
+  has_many :fans, source: :person, through: :favorite_enterprise_people
   def product_categories
     ProductCategory.by_enterprise(self)
@@ -194,10 +197,6 @@ class Enterprise &lt; Organization
     true
   end
-  def activities
-    Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY updated_at DESC")
-  end
-
   def catalog_url
     { :profile => identifier, :controller => 'catalog'}
   end
@@ -206,4 +205,9 @@ class Enterprise &lt; Organization
     ''
   end
+  def followed_by? person
+    super or self.fans.where(id: person.id).count > 0
+  end
+
+
 end
@@ -131,6 +131,7 @@ class Environment &lt; ActiveRecord::Base
       'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
+      'forbid_destroy_profile' => _('Forbid users of removing profiles'),
       'products_for_enterprises' => _('Enable products for enterprises'),
       'enterprise_registration' => _('Enterprise registration'),
@@ -170,7 +171,8 @@ class Environment &lt; ActiveRecord::Base
       'site_homepage' => _('Redirects the user to the environment homepage.'),
       'user_profile_page' => _('Redirects the user to his profile page.'),
       'user_homepage' => _('Redirects the user to his homepage.'),
-      'user_control_panel' => _('Redirects the user to his control panel.')
+      'user_control_panel' => _('Redirects the user to his control panel.'),
+      'custom_url' => _('Specify the URL to redirect to:'),
     }
   end
   validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
@@ -253,6 +255,9 @@ class Environment &lt; ActiveRecord::Base
   # store the Environment settings as YAML-serialized Hash.
   acts_as_having_settings :field => :settings
+  # introduce and explain to users something about the signup
+  settings_items :signup_intro, :type => String
+
   # the environment's terms of use: every user must accept them before registering.
   settings_items :terms_of_use, :type => String
@@ -287,7 +292,20 @@ class Environment &lt; ActiveRecord::Base
   settings_items :activation_blocked_text, :type => String
   settings_items :message_for_disabled_enterprise, :type => String,
                  :default => _('This enterprise needs to be enabled.')
-  settings_items :location, :type => String
+
+  settings_items :contact_phone, type: String
+  settings_items :address, type: String
+  settings_items :city, type: String
+  settings_items :state, type: String
+  settings_items :country_name, type: String
+  settings_items :lat, type: Float
+  settings_items :lng, type: Float
+  settings_items :postal_code, type: String
+  settings_items :location, type: String
+
+  alias_method :zip_code=, :postal_code
+  alias_method :zip_code, :postal_code
+
   settings_items :layout_template, :type => String, :default => 'default'
   settings_items :homepage, :type => String
   settings_items :description, :type => String, :default => '<div style="text-align: center"><a href="http://noosfero.org/"><img src="/images/noosfero-network.png" alt="Noosfero"/></a></div>'
 class FavoriteEnterprisePerson < ActiveRecord::Base
-  self.table_name = :favorite_enteprises_people
+  attr_accessible :person, :enterprise
+
+  track_actions :favorite_enterprise, :after_create, keep_params: [:enterprise_name, :enterprise_url], if: proc{ |f| f.is_trackable? }
   belongs_to :enterprise
   belongs_to :person
+  protected
+
+  def is_trackable?
+    self.enterprise.public?
+  end
+
+  def enterprise_name
+    self.enterprise.short_name(nil)
+  end
+  def enterprise_url
+    self.enterprise.url
+  end
+
 end
@@ -35,6 +35,10 @@ class Organization &lt; Profile
   validate :presence_of_required_fieds, :unless => :is_template
+  def self.notify_activity tracked_action
+    Delayed::Job.enqueue NotifyActivityToProfilesJob.new(tracked_action.id)
+  end
+
   def presence_of_required_fieds
     self.required_fields.each do |field|
       if self.send(field).blank?
@@ -82,6 +82,9 @@ class Person &lt; Profile
   has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy
+  has_many :favorite_enterprise_people
+  has_many :favorite_enterprises, source: :enterprise, through: :favorite_enterprise_people
+
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
@@ -326,8 +329,6 @@ class Person &lt; Profile
     ]
   end
-  has_and_belongs_to_many :favorite_enterprises, :class_name => 'Enterprise', :join_table => 'favorite_enteprises_people'
-
   def email_domain
     user && user.email_domain || environment.default_hostname(true)
   end
@@ -507,8 +508,8 @@ class Person &lt; Profile
     user.save!
   end
-  def activities
-    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' and action_tracker.verb != 'reply_scrap_on_self' ORDER BY updated_at DESC")
+  def exclude_verbs_on_activities
+    %w[leave_scrap_to_self add_member_in_community reply_scrap_on_self]
   end
   # by default, all fields are private
@@ -80,6 +80,7 @@ class PersonNotifier
   class Mailer < ActionMailer::Base
     helper ApplicationHelper
+    helper ActionTrackerHelper
     def session
       {:theme => nil}
@@ -17,13 +17,14 @@ class Product &lt; ActiveRecord::Base
     'full'
   end
-  belongs_to :enterprise, :foreign_key => :profile_id, :class_name => 'Profile'
   belongs_to :profile
+  # backwards compatibility
+  belongs_to :enterprise, :foreign_key => :profile_id, :class_name => 'Profile'
   alias_method :enterprise=, :profile=
   alias_method :enterprise, :profile
-  has_one :region, :through => :enterprise
-  validates_presence_of :enterprise
+  has_one :region, :through => :profile
+  validates_presence_of :profile
   belongs_to :product_category
@@ -37,6 +38,10 @@ class Product &lt; ActiveRecord::Base
   acts_as_having_settings :field => :data
+  track_actions :create_product, :after_create, :keep_params => [:name, :url ], :if => Proc.new { |a| a.is_trackable? }, :custom_user => :action_tracker_user
+  track_actions :update_product, :before_update, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? }, :custom_user => :action_tracker_user
+  track_actions :remove_product, :before_destroy, :keep_params => [:name], :if => Proc.new { |a| a.is_trackable? }, :custom_user => :action_tracker_user
+
   validates_uniqueness_of :name, :scope => :profile_id, :allow_nil => true, :if => :validate_uniqueness_of_column_name?
   validates_presence_of :product_category_id
@@ -54,10 +59,10 @@ class Product &lt; ActiveRecord::Base
   after_update :save_image
   def lat
-    self.enterprise.lat
+    self.profile.lat
   end
   def lng
-    self.enterprise.lng
+    self.profile.lng
   end
   xss_terminate :only => [ :name ], :on => 'validation'
@@ -71,7 +76,7 @@ class Product &lt; ActiveRecord::Base
   filter_iframes :description
   def iframe_whitelist
-    enterprise && enterprise.environment && enterprise.environment.trusted_sites_for_iframe
+    self.profile && self.profile.environment && self.profile.environment.trusted_sites_for_iframe
   end
   def name
@@ -109,16 +114,16 @@ class Product &lt; ActiveRecord::Base
   end
   def url
-    enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => id)
+    self.profile.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => id)
   end
   def public?
-    enterprise.public?
+    self.profile.public?
   end
   def formatted_value(method)
     value = self[method] || self.send(method)
-    ("%.2f" % value).to_s.gsub('.', enterprise.environment.currency_separator) if value
+    ("%.2f" % value).to_s.gsub('.', self.profile.environment.currency_separator) if value
   end
   def price_with_discount
@@ -223,16 +228,16 @@ class Product &lt; ActiveRecord::Base
   end
   def available_production_costs
-    self.enterprise.environment.production_costs + self.enterprise.production_costs
+    self.profile.environment.production_costs + self.profile.production_costs
   end
   include Rails.application.routes.url_helpers
   def price_composition_bar_display_url
-    url_for({:host => enterprise.default_hostname, :controller => 'manage_products', :action => 'display_price_composition_bar', :profile => enterprise.identifier, :id => self.id }.merge(Noosfero.url_options))
+    url_for({:host => self.profile.default_hostname, :controller => 'manage_products', :action => 'display_price_composition_bar', :profile => self.profile.identifier, :id => self.id }.merge(Noosfero.url_options))
   end
   def inputs_cost_update_url
-    url_for({:host => enterprise.default_hostname, :controller => 'manage_products', :action => 'display_inputs_cost', :profile => enterprise.identifier, :id => self.id }.merge(Noosfero.url_options))
+    url_for({:host => self.profile.default_hostname, :controller => 'manage_products', :action => 'display_inputs_cost', :profile => self.profile.identifier, :id => self.id }.merge(Noosfero.url_options))
   end
   def percentage_from_solidarity_economy
@@ -249,7 +254,7 @@ class Product &lt; ActiveRecord::Base
         end
   end
-  delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :enterprise
+  delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :profile, allow_nil: true
   protected
@@ -257,4 +262,13 @@ class Product &lt; ActiveRecord::Base
     true
   end
+  def is_trackable?
+    # shopping_cart create products without profile
+    self.profile.present?
+  end
+
+  def action_tracker_user
+    self.profile
+  end
+
 end
@@ -3,7 +3,9 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
-  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret
+  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time,
+    :redirection_after_login, :custom_url_redirection,
+    :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -152,6 +154,7 @@ class Profile &lt; ActiveRecord::Base
   acts_as_trackable :dependent => :destroy
+  has_many :profile_activities
   has_many :action_tracker_notifications, :foreign_key => 'profile_id'
   has_many :tracked_notifications, :through => :action_tracker_notifications, :source => :action_tracker, :order => 'updated_at DESC'
   has_many :scraps_received, :class_name => 'Scrap', :foreign_key => :receiver_id, :order => "updated_at DESC", :dependent => :destroy
@@ -748,7 +751,11 @@ private :generate_url, :url_options
   include ActionView::Helpers::TextHelper
   def short_name(chars = 40)
     if self[:nickname].blank?
-      truncate self.name, :length => chars, :omission => '...'
+      if chars
+        truncate self.name, length: chars, omission: '...'
+      else
+        self.name
+      end
     else
       self[:nickname]
     end
@@ -981,9 +988,13 @@ private :generate_url, :url_options
     name
   end
-  # Override in your subclasses
+  def exclude_verbs_on_activities
+    %w[]
+  end
+
+  # Customize in subclasses
   def activities
-    []
+    self.profile_activities.includes(:activity).order('updated_at DESC')
   end
   def may_display_field_to? field, user = nil
@@ -1030,6 +1041,7 @@ private :generate_url, :url_options
   def preferred_login_redirection
     redirection_after_login.blank? ? environment.redirection_after_login : redirection_after_login
   end
+  settings_items :custom_url_redirection, type: String, default: nil
   def remove_from_suggestion_list(person)
     suggestion = person.suggested_profiles.find_by_suggestion_id self.id
@@ -0,0 +1,31 @@
+class ProfileActivity < ActiveRecord::Base
+
+  self.record_timestamps = false
+
+  attr_accessible :profile_id,
+    :profile, :activity
+
+  belongs_to :profile
+  belongs_to :activity, polymorphic: true
+
+  # non polymorphic versions
+  belongs_to :scrap, foreign_key: :activity_id, class_name: 'Scrap', conditions: {profile_activities: {activity_type: 'Scrap'}}
+  belongs_to :action_tracker, foreign_key: :activity_id, class_name: 'ActionTracker::Record', conditions: {profile_activities: {activity_type: 'ActionTracker::Record'}}
+
+  before_validation :copy_timestamps
+
+  def self.update_activity activity
+    profile_activity = ProfileActivity.where(activity_id: activity.id, activity_type: activity.class.base_class.name).first
+    profile_activity.send :copy_timestamps
+    profile_activity.save!
+    profile_activity
+  end
+
+  protected
+
+  def copy_timestamps
+    self.created_at = self.activity.created_at
+    self.updated_at = self.activity.updated_at
+  end
+
+end
@@ -16,19 +16,19 @@ class ProfileListBlock &lt; Block
   def profile_list
     result = nil
-    visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])
+    public_profiles = profiles.public.includes([:image,:domains,:preferred_domain,:environment])
     if !prioritize_profiles_with_image
-      result = visible_profiles.all(:limit => get_limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
+result = public_profiles.all(:limit => get_limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
     elsif profiles.visible.with_image.count >= get_limit
-      result = visible_profiles.with_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = public_profiles.with_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
     else
-      result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = public_profiles.with_image.sort_by{ rand } + public_profiles.without_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
     end
     result.slice(0..get_limit-1)
   end
   def profile_count
-    profiles.visible.length
+    profiles.public.length
   end
   # the title of the block. Probably will be overriden in subclasses.
@@ -13,6 +13,11 @@ class Scrap &lt; ActiveRecord::Base
   has_many :replies, :class_name => 'Scrap', :foreign_key => 'scrap_id', :dependent => :destroy
   belongs_to :root, :class_name => 'Scrap', :foreign_key => 'scrap_id'
+  has_many :profile_activities, foreign_key: :activity_id, conditions: {profile_activities: {activity_type: 'Scrap'}}, dependent: :destroy
+
+  after_create :create_activity
+  after_update :update_activity
+
   scope :all_scraps, -> (profile) { limit(30).where("receiver_id = ? OR sender_id = ?", profile, profile) }
   scope :not_replies, -> { where scrap_id: nil }
@@ -23,10 +28,7 @@ class Scrap &lt; ActiveRecord::Base
   track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender != s.receiver && s.sender == s.top_root.receiver}
-  after_create do |scrap|
-    scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil?
-    ScrapNotifier.notification(scrap).deliver if scrap.send_notification?
-  end
+  after_create :send_notification
   before_validation :strip_all_html_tags
@@ -57,4 +59,21 @@ class Scrap &lt; ActiveRecord::Base
     sender != receiver && (is_root? ? root.receiver.receives_scrap_notification? : receiver.receives_scrap_notification?)
   end
+  protected
+
+  def create_activity
+    # do not scrap replies (when scrap_id is not nil)
+    return if self.scrap_id.present?
+    ProfileActivity.create! profile_id: self.receiver_id, activity: self
+  end
+
+  def update_activity
+    ProfileActivity.update_activity self
+  end
+
+  def send_notification
+    self.root.update_attribute('updated_at', DateTime.now) unless self.root.nil?
+    ScrapNotifier.notification(self).deliver if self.send_notification?
+  end
+
 end
@@ -0,0 +1,18 @@
+class Session < ActiveRecord::SessionStore::Session
+
+  # removed and redefined on super class
+  def self.find_by_session_id session_id
+    super
+  end
+
+  belongs_to :user
+
+  before_save :copy_to_columns
+
+  protected
+
+  def copy_to_columns
+    self.user_id = self.data['user']
+  end
+
+end
@@ -164,4 +164,8 @@ class UploadedFile &lt; Article
     true
   end
+  def notifiable?
+    true
+  end
+
 end
@@ -15,6 +15,14 @@ class User &lt; ActiveRecord::Base
     :email => {:label => _('Email'), :weight => 5},
   }
+  # see http://stackoverflow.com/a/2513456/670229
+  def self.current
+    Thread.current[:current_user]
+  end
+  def self.current=(user)
+    Thread.current[:current_user] = user
+  end
+
   def self.[](login)
     self.find_by_login(login)
   end
@@ -89,6 +97,10 @@ class User &lt; ActiveRecord::Base
   has_one :person, dependent: :destroy, autosave: false
   belongs_to :environment
+  has_many :sessions, dependent: :destroy
+  # holds the current session, see lib/authenticated_system.rb
+  attr_accessor :session
+
   attr_protected :activated_at
   # Virtual attribute for the unencrypted password
@@ -242,8 +254,9 @@ class User &lt; ActiveRecord::Base
   # These create and unset the fields required for remembering users between browser closes
   def remember_me
-    self.remember_token_expires_at = 2.weeks.from_now.utc
-    self.remember_token            = encrypt("#{email}--#{remember_token_expires_at}")
+    self.remember_token_expires_at = 1.months.from_now.utc
+    # if the user's email/password changes this won't be valid anymore
+    self.remember_token = encrypt "#{email}-#{self.crypted_password}-#{remember_token_expires_at}"
     save(:validate => false)
   end
@@ -2,9 +2,10 @@ class ValidationInfo &lt; ActiveRecord::Base
   attr_accessible :validation_methodology, :restrictions, :organization
-  validates_presence_of :validation_methodology
-
   belongs_to :organization
+  validates_presence_of :organization
+  validates_presence_of :validation_methodology
+
   xss_terminate :only => [ :validation_methodology, :restrictions ], :on => 'validation'
 end
@@ -13,7 +13,14 @@
      <%= f.password_field :password %>
-     <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
+     <div class='checkbox'>
+       <label>
+         <%= check_box_tag :remember_me, '1', true %>
+         <%= _'Keep me logged in' %>
+       </label>
+     </div>
+
+     <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_exec(&content) }.join("") %>
      <% button_bar do %>
        <%= submit_button( 'login', _('Log in') )%>
 <h1><%= _('Sign up for %s!') % environment.name %></h1>
+
+<div id='signup-intro'>
+  <%= environment.signup_intro %>
+</div>
+
 <%= render :partial => 'signup_form' %>
@@ -0,0 +1,5 @@
+<div class='description'>
+  <%= _('This text will be shown to the user on the top of the sign up form.') %>
+</div>
+
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_intro, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
@@ -17,6 +17,8 @@
     :content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %>
   <% tabs << {:title => _('Signup welcome page'), :id => 'signup-welcome-message',
     :content => (render :partial => 'signup_welcome_screen', :locals => {:f => f}) }%>
+  <% tabs << {:title => _('Signup introduction text'), :id => 'signup-intro',
+    :content => (render :partial => 'signup_intro', :locals => {:f => f})} %>
   <%= render_tabs(tabs) %>
   <% button_bar do %>
     <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
 <ul>
   <%if logged_in? %>
     <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= button(:add, _('Add as favorite'), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :title => _('Add enterprise as favorite')) %></li>
+      <li><%= button(:love, _('Add as favorite'), { profile: user.identifier, controller: 'favorite_enterprises', action: 'add', id: profile.id }, title: _('Add enterprise as favorite')) %></li>
     <% end %>
   <% end %>
   <% if profile.enable_contact? %>
 <div class='join-leave-button require-login-popup'>
   <% if logged_in? %>
-    <% if profile.members.include?(user) %>
-      <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
-        :class => 'leave-community',
-        :title => _("Leave community"),
-        :style => 'position: relative;') %>
-      <%= button(:add, content_tag('span', _('Join')), profile.join_url,
-        :class => 'join-community',
-        :title => _("Join community"),
-        :style => 'position: relative; display: none;') %>
+    <% if profile.already_request_membership? user %>
+      <%= _('Your membership is waiting for approval') %>
     <% else %>
-      <% unless profile.already_request_membership?(user) %>
-        <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
-          :class => 'leave-community',
-          :title => _("Leave community"),
-          :style => 'position: relative; display: none;') %>
-        <%= button(:add, content_tag('span', _('Join')), profile.join_url,
-          :class => 'join-community',
-          :title => _("Join community"),
-          :style => 'position: relative;') %>
+      <% if user.in? profile.members %>
+        <%= button :delete, content_tag('span', _('Leave community')), profile.leave_url,
+          class: 'leave-community',
+          style: 'position: relative;' %>
+        <%= button :add, content_tag('span', _('Join this community')), profile.join_url,
+          class: 'join-community',
+          style: 'position: relative; display: none;' %>
+      <% else %>
+        <%= button :add, _('Join this community'), profile.join_url %>
       <% end %>
     <% end %>
   <% else %>
-      <%= button(:add, _('Join'), profile.join_not_logged_url, :title => _('Join this community')) %>
+    <%= button :add, _('Join this community'), profile.join_not_logged_url %>
   <% end %>
 </div>
+
+<%= javascript_tag do %>
+  noosfero.add_and_join.locales.leaveConfirmation = <%= (_("Please confirm to leave the community '%{name}'") % {name: profile.name}).to_json %>
+<% end %>
+
@@ -53,7 +53,7 @@
   %>
 </div>
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10)) %>
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10, :class => 'mceEditor')) %>
 <%= f.fields_for :image_builder, @article.image do |i| %>
   <%= file_field_or_thumbnail(_('Cover image:'), @article.image, i)%>
@@ -62,7 +62,7 @@
     <% if @page.blog? and !@page.image.nil? %>
       <div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>
     <% end %>
-    <%= link_to(image_tag('/images/icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
+    <%= button_without_text(:feed, _('RSS feed'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
     <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
     <%= render :partial => 'article_title', :locals => {:no_link => true} %>
     <%= article_translations(@page) %>
@@ -12,7 +12,7 @@
       <li>
         <%= radio_button_tag 'v1', v.version, false, :onclick => 'versionInputClicked(this)' %>
         <%= radio_button_tag 'v2', v.version, false, :onclick => 'versionInputClicked(this)' %>
-        <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
+        <%= link_to(_("Version %s") % v.version, @page.url.merge(:version => v.version)) %>
         <%= @page.version == v.version ? _('(current)') : '' %>
         <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url(v.version))} %></span>
         <span class='updated-on'><%= show_time(v.updated_at) %></span>
@@ -5,3 +5,4 @@
 <% end %>
 <%= list_contents contents: folder.children %>
+
@@ -24,7 +24,7 @@
   <%= render :partial => 'article_toolbar' %>
 </div>
-<% if NOOSFERO_CONF['addthis_enabled'] %>
+<% if NOOSFERO_CONF['addthis_enabled'] and @page.public? %>
   <%= render :partial => 'addthis' %>
 <% end %>
-<span class="download-link">
-  <span>Download</span>
-  <strong><%= link_to generic.filename, [Noosfero.root, generic.public_filename].join %></strong>
-</span>
-
 <div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
   <%= generic.abstract %>
 </div>
+<%= button(:download, _('Download'), [Noosfero.root, generic.public_filename].join, class:'download-link', option:'primary', size:'lg') %>
@@ -30,7 +30,7 @@
          </div>
         </td>
-        <td> <%= _("#{p.type}") %> </td>
+        <td> <%= _(p.type) %> </td>
       </tr>
     <% end %>
   </table>
@@ -4,7 +4,10 @@
   </td>
   <td>
     <p>
-      <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
+      <span style="font-size: 14px;">
+        <%= link_to activity.user.name, activity.user.url %>
+        <%= describe activity %>
+      </span>
       <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(activity.created_at) %></span>
     </p>
   </td>
@@ -0,0 +1,13 @@
+<div class='profile-activity-image'>
+  <%= link_to image_tag(activity.target.default_image :minor), activity.target.url, class: 'product-pic' if activity.target.present? %>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'><%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence activity.created_at %></p>
+
+  <div class='profile-wall-actions'>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<div style="clear: both"></div>
@@ -0,0 +1,15 @@
+<div class='profile-activity-image'>
+  <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'>
+    <%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe activity %>
+  </p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence activity.created_at %></p>
+
+  <div class='profile-wall-actions'>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<div style="clear: both"></div>
 <% unless activities.nil? %>
-  <% activities.each do |a| %>
-    <% activity = a.klass.constantize.find(a.id) %>
+  <% activities.each do |profile_activity| %>
+    <% activity = profile_activity.activity %>
     <% if activity.kind_of?(ActionTracker::Record) %>
       <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
     <% else %>
@@ -0,0 +1,12 @@
+<div class='profile-activity-image'>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'><%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence activity.created_at %></p>
+
+  <div class='profile-wall-actions'>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<div style="clear: both"></div>
@@ -0,0 +1,13 @@
+<div class='profile-activity-image'>
+  <%= link_to image_tag(activity.target.default_image :minor), activity.target.url, class: 'product-pic' if activity.target.present? %>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'><%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence activity.created_at %></p>
+
+  <div class='profile-wall-actions'>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<div style="clear: both"></div>
@@ -0,0 +1,9 @@
+<% content_for :head do %>
+  <%= javascript_include_tag 'redirection_after_login' %>
+<% end %>
+
+<h2><%= _('Page to redirect after login') %></h2>
+<%= f.select :redirection_after_login, Environment.login_redirection_options.map{ |key,value| [value,key] }, selected: @profile.preferred_login_redirection %>
+
+<%= f.text_field :custom_url_redirection %>
+
@@ -44,8 +44,7 @@
   <% end %>
   <% if environment.enabled?('allow_change_of_redirection_after_login') %>
-    <h2><%= _('Page to redirect after login') %></h2>
-    <%=  select 'profile_data', 'redirection_after_login', Environment.login_redirection_options.map{|key,value|[value,key]}, { :selected => @profile.preferred_login_redirection} %>
+    <%= render 'redirection_after_login', f: f %>
   <% end %>
   <h2><%= _('Translations') %></h2>
@@ -75,14 +74,23 @@
   <% if user && user.has_permission?('destroy_profile', profile) %>
     <% button_bar(:id => 'delete-profile') do %>
-      <%= button(:remove, _('Delete profile'), {:action => :destroy_profile}) %>
-      <% if environment.admins.include?(current_person) %>
+      <% if !environment.enabled?('forbid_destroy_profile') || user.is_admin?(environment) %>
+        <%= button(:remove, _('Delete profile'), {:action => :destroy_profile}) %>
+      <% end %>
+      <% if user.is_admin?(environment) %>
         <% if profile.visible? %>
-          <%= button(:remove, _('Deactivate profile'), {action: :deactivate_profile, id: profile.id}, id: 'deactivate_profile_button', data: {confirm: _("Are you sure you want to deactivate this profile?")}) %>
+          <%= button(:remove, _('Deactivate profile'),
+            {:action => :deactivate_profile, :id=>profile.id},
+            :id=>'deactivate_profile_button',
+            :data => {:confirm=>_("Are you sure you want to deactivate this profile?")})
+          %>
         <% else %>
-          <%= button(:add, _('Activate profile'), {action: :activate_profile, id: profile.id}, data: {confirm: _("Are you sure you want to deactivate this profile?")}) %>
+          <%= button(:add, _('Activate profile'),
+            {:action => :activate_profile, :id=>profile.id},
+            :data => {:confirm=>_("Are you sure you want to activate this profile?")})
+          %>
         <% end %>
       <% end %>
     <% end %>
 <%= javascript_include_tag('assign_role.js') %>
-<h1> <%= _("Assign #{@role.name}") %> </h1>
+<h1> <%= _("Assign %s") % @role.name %> </h1>
 <%= labelled_form_for :role, :url => { :action => 'define', :id => @role.id } do |f| %>
-<h1> <%= _("Deleting #{@role.name}") %> </h1>
+<h1> <%= _("Deleting %s") % @role.name %> </h1>
 <% if @members.nil? || @members.empty? %>
   <p><%= _('This role is not being currently used.')%></p>
-<h1> <%= _("Editing #{@role.name}") %> </h1>
+<h1> <%= _("Editing %s") % @role.name %> </h1>
 <%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => [@role.kind] } %>
-<h2> <%= _("Editing #{@role.name}") %> </h2>
+<h2> <%= _("Editing %s") % @role.name %> </h2>
 <%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => role_available_permissions(@role) } %>
@@ -6,6 +6,6 @@
     <span class="item-description">
       <%= link_to(content.name, content.url) %>
     </span>
-    <span class="item-date"><%= _("Published at: #{show_date(content.updated_at)}") %></span>
+    <span class="item-date"><%= _("Published at: %s") % show_date(content.updated_at) %></span>
   </div>
 </div>
 <ul id="groups-list">
-<% for group in groups %>
-  <li>
-    <div class='common-profile-list-block'>
-      <%= profile_image_link(group, :portrait, 'div') %>
-    </div>
-    <span class='profile-details'>
-      <strong><%= group.name %></strong><br/>
-      <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
-      <%= _('Type: %s') % _(group.class.identification) %> <br/>
-      <%= _('Description: %s') % group.description  + '<br/>' if group.community? %>
-      <%= _('Members: %s') % group.members_count.to_s %> <br/>
-      <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
-      <% button_bar do %>
-        <% if user.has_permission?(:edit_profile, group) %>
-          <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
-        <% end %>
-        <%= button 'menu-logout', _('Leave community'), group.leave_url(true), :class => 'leave-community' %>
-        <% if (group.community? && user.has_permission?(:destroy_profile, group)) %>
-          <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => group.identifier } %>
+  <% for group in groups %>
+    <li>
+      <div class='common-profile-list-block'>
+        <%= profile_image_link(group, :portrait, 'div') %>
+      </div>
+      <span class='profile-details'>
+        <strong><%= group.name %></strong><br/>
+        <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
+        <%= _('Type: %s') % _(group.class.identification) %> <br/>
+        <%= _('Description: %s') % group.description  + '<br/>' if group.community? %>
+        <%= _('Members: %s') % group.members_count.to_s %> <br/>
+        <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
+        <% button_bar do %>
+          <% if user.has_permission?(:edit_profile, group) %>
+            <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
+          <% end %>
+          <%= button 'menu-logout', _('Leave community'), group.leave_url(true), :class => 'leave-community' %>
+
+          <% if (user.has_permission?(:destroy_profile, group) && !environment.enabled?('forbid_destroy_profile')) || user.is_admin?(environment) %>
+            <%= button 'delete', _('Remove'),
+              { :controller => 'profile_editor',
+                :action => 'destroy_profile',
+                :profile => group.identifier }
+            %>
+          <% end %>
         <% end %>
-      <% end %>
-    </span>
-    <br class="may-clear" />
-  </li>
-<% end %>
+      </span>
+      <br class="may-clear" />
+    </li>
+  <% end %>
 </ul>
-
@@ -101,6 +101,7 @@ module Noosfero
     config.action_dispatch.session = {
       :key    => '_noosfero_session',
     }
+    config.session_store :active_record_store, key: '_noosfero_session'
     config.paths['db/migrate'].concat Dir.glob("#{Rails.root}/{baseplugins,config/plugins}/*/db/migrate")
     config.i18n.load_path.concat Dir.glob("#{Rails.root}/{baseplugins,config/plugins}/*/locales/*.{rb,yml}")
@@ -3,67 +3,51 @@ require &#39;action_tracker_config&#39;
 # ActionTracker plugin stuff
-@reply_scrap_description = proc { _('sent a message to %{receiver}: <br /> "%{message}"') % { :receiver => "{{link_to(ta.get_receiver_name, ta.get_receiver_url)}}", :message => "{{auto_link_urls(ta.get_content)}}" } }
-
 ActionTrackerConfig.verbs = {
-  :create_article => {
-    :description => proc { _('published an article: %{title}') % { :title => '{{link_to(truncate(ta.get_name), ta.get_url)}}' } }
+  create_article: {
+  },
+
+  new_friendship: {
+    type: :groupable
+  },
+
+  join_community: {
+    type: :groupable
   },
-  :new_friendship => {
-    :description => proc { n_('has made 1 new friend:<br />%{name}', 'has made %{num} new friends:<br />%{name}', get_friend_name.size) % { :num => get_friend_name.size, :name => '{{ta.collect_group_with_index(:friend_name){ |n,i| link_to(image_tag(ta.get_friend_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/person-icon.png")), ta.get_friend_url[i], :title => n)}.join}}' } },
-    :type => :groupable
+  add_member_in_community: {
   },
-  :join_community => {
-    :description => proc { n_('has joined 1 community:<br />%{name}', 'has joined %{num} communities:<br />%{name}', get_resource_name.size) % { :num => get_resource_name.size, :name => '{{ta.collect_group_with_index(:resource_name){ |n,i| link_to(image_tag(ta.get_resource_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/community-icon.png")), ta.get_resource_url[i], :title => n)}.join}}' } },
-    :type => :groupable
+  upload_image: {
+    type: :groupable
   },
-  :add_member_in_community => {
-    :description => proc { _('has joined the community.') },
+  leave_scrap: {
   },
-  :upload_image => {
-    :description => proc do
-      total = get_view_url.size
-      n_('uploaded 1 image', 'uploaded %d images', total) % total +
-      '<br />{{'+
-      'ta.collect_group_with_index(:thumbnail_path) { |t,i|' +
-      "  if ( #{total} == 1 );" +
-      '    link_to( image_tag(t), ta.get_view_url[i], :class => \'upimg\' );' +
-      '   else;' +
-      "    pos = #{total}-i;" +
-      '    morethen2 = pos>2 ? \'morethen2\' : \'\';' +
-      '    morethen5 = pos>5 ? \'morethen5\' : \'\';' +
-      '    t = t.gsub(/(.*)(display)(.*)/, \'\\1thumb\\3\');' +
-      '    link_to( \'&nbsp;\', ta.get_view_url[i],' +
-      '      :style => "background-image:url(#{t})",' +
-      '      :class => "upimg pos#{pos} #{morethen2} #{morethen5}" );' +
-      '  end' +
-      '}.reverse.join}}' +
-      ( total > 5 ?
-        '<span class="more" onclick="this.parentNode.className+=\' show-all\'">' +
-        '&hellip;</span>' : '' ) +
-      '<br style="clear: both;" />'
-    end,
-    :type => :groupable
+  leave_scrap_to_self: {
   },
-  :leave_scrap => {
-    :description => @reply_scrap_description
+  reply_scrap_on_self: {
   },
-  :leave_scrap_to_self => {
-    :description => proc { _('wrote: <br /> "%{text}"') % { :text => "{{auto_link_urls(ta.get_content)}}" } }
+  create_product: {
   },
-  :reply_scrap_on_self => {
-    :description => @reply_scrap_description
+  update_product: {
   },
+
+  remove_product: {
+  },
+
+  favorite_enterprise: {
+  },
+
 }
-ActionTrackerConfig.current_user_method = :current_person
+ActionTrackerConfig.current_user = proc do
+  User.current.person rescue nil
+end
 ActionTrackerConfig.timeout = 24.hours
@@ -0,0 +1,4 @@
+ActionDispatch::Reloader.to_prepare do
+  ActiveRecord::SessionStore.session_class = Session
+end
+
@@ -56,37 +56,37 @@ Noosfero::Application.routes.draw do
   match 'search(/:action(/*category_path))', controller: 'search', via: :all
   # events
-  match 'profile/:profile/events_by_day', controller: 'events', action: 'events_by_day', profile: /#{Noosfero.identifier_format_in_url}/, via: :all
-  match 'profile/:profile/events_by_month', controller: 'events', action: 'events_by_month', profile: /#{Noosfero.identifier_format_in_url}/, via: :all
-  match 'profile/:profile/events/:year/:month/:day', controller: 'events', action: 'events', year: /\d*/, month: /\d*/, day: /\d*/, profile: /#{Noosfero.identifier_format_in_url}/, via: :all
-  match 'profile/:profile/events/:year/:month', controller: 'events', action: 'events', year: /\d*/, month: /\d*/, profile: /#{Noosfero.identifier_format_in_url}/, via: :all
-  match 'profile/:profile/events', controller: 'events', action: 'events', profile: /#{Noosfero.identifier_format_in_url}/, via: :all
+  match 'profile/:profile/events_by_day', controller: 'events', action: 'events_by_day', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
+  match 'profile/:profile/events_by_month', controller: 'events', action: 'events_by_month', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
+  match 'profile/:profile/events/:year/:month/:day', controller: 'events', action: 'events', year: /\d*/, month: /\d*/, day: /\d*/, profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
+  match 'profile/:profile/events/:year/:month', controller: 'events', action: 'events', year: /\d*/, month: /\d*/, profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
+  match 'profile/:profile/events', controller: 'events', action: 'events', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
   # catalog
-  match 'catalog/:profile', controller: 'catalog', action: 'index', profile: /#{Noosfero.identifier_format_in_url}/, as: :catalog, via: :all
+  match 'catalog/:profile', controller: 'catalog', action: 'index', profile: /#{Noosfero.identifier_format_in_url}/i, as: :catalog, via: :all
   # invite
-  match 'profile/:profile/invite/friends', controller: 'invite', action: 'invite_friends', profile: /#{Noosfero.identifier_format_in_url}/, via: :all
-  match 'profile/:profile/invite/:action', controller: 'invite', profile: /#{Noosfero.identifier_format_in_url}/, via: :all
+  match 'profile/:profile/invite/friends', controller: 'invite', action: 'invite_friends', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
+  match 'profile/:profile/invite/:action', controller: 'invite', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
   # feeds per tag
-  match 'profile/:profile/tags/:id/feed', controller: 'profile', action:'tag_feed', id: /.+/, profile: /#{Noosfero.identifier_format_in_url}/, as: :tag_feed, via: :all
+  match 'profile/:profile/tags/:id/feed', controller: 'profile', action:'tag_feed', id: /.+/, profile: /#{Noosfero.identifier_format_in_url}/i, as: :tag_feed, via: :all
   # profile tags
-  match 'profile/:profile/tags/:id', controller: 'profile', action: 'content_tagged', id: /.+/, profile: /#{Noosfero.identifier_format_in_url}/, via: :all
-  match 'profile/:profile/tags(/:id)', controller: 'profile', action: 'tags', profile: /#{Noosfero.identifier_format_in_url}/, via: :all
+  match 'profile/:profile/tags/:id', controller: 'profile', action: 'content_tagged', id: /.+/, profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
+  match 'profile/:profile/tags(/:id)', controller: 'profile', action: 'tags', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
   # profile search
-  match 'profile/:profile/search', controller: 'profile_search', action: 'index', profile: /#{Noosfero.identifier_format_in_url}/, via: :all
+  match 'profile/:profile/search', controller: 'profile_search', action: 'index', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
   # comments
-  match 'profile/:profile/comment/:action/:id', controller: 'comment', profile: /#{Noosfero.identifier_format_in_url}/, via: :all
+  match 'profile/:profile/comment/:action/:id', controller: 'comment', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
   # public profile information
-  match 'profile/:profile(/:action(/:id))', controller: 'profile', action: 'index', id: /[^\/]*/, profile: /#{Noosfero.identifier_format_in_url}/, as: :profile, via: :all
+  match 'profile/:profile(/:action(/:id))', controller: 'profile', action: 'index', id: /[^\/]*/, profile: /#{Noosfero.identifier_format_in_url}/i, as: :profile, via: :all
   # contact
-  match 'contact/:profile/:action(/:id)', controller: 'contact', action: 'index', id: /.*/, profile: /#{Noosfero.identifier_format_in_url}/, via: :all
+  match 'contact/:profile/:action(/:id)', controller: 'contact', action: 'index', id: /.*/, profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
   # map balloon
   match 'map_balloon/:action/:id', controller: 'map_balloon', id: /.*/, via: :all
@@ -98,8 +98,8 @@ Noosfero::Application.routes.draw do
   ## Controllers that are profile-specific (for profile admins )
   ######################################################
   # profile customization - "My profile"
-  match 'myprofile/:profile', controller: 'profile_editor', action: 'index', profile: /#{Noosfero.identifier_format_in_url}/, via: :all
-  match 'myprofile/:profile/:controller(/:action(/:id))', controller: Noosfero.pattern_for_controllers_in_directory('my_profile'), profile: /#{Noosfero.identifier_format_in_url}/, as: :myprofile, via: :all
+  match 'myprofile/:profile', controller: 'profile_editor', action: 'index', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
+  match 'myprofile/:profile/:controller(/:action(/:id))', controller: Noosfero.pattern_for_controllers_in_directory('my_profile'), profile: /#{Noosfero.identifier_format_in_url}/i, as: :myprofile, via: :all
   ######################################################
@@ -127,14 +127,14 @@ Noosfero::Application.routes.draw do
   # cache stuff - hack
   match 'public/:action/:id', controller: 'public', via: :all
-  match ':profile/*page/versions', controller: 'content_viewer', action: 'article_versions', profile: /#{Noosfero.identifier_format_in_url}/, constraints: EnvironmentDomainConstraint.new, via: :all
+  match ':profile/*page/versions', controller: 'content_viewer', action: 'article_versions', profile: /#{Noosfero.identifier_format_in_url}/i, constraints: EnvironmentDomainConstraint.new, via: :all
   match '*page/versions', controller: 'content_viewer', action: 'article_versions', via: :all
-  match ':profile/*page/versions_diff', controller: 'content_viewer', action: 'versions_diff', profile: /#{Noosfero.identifier_format_in_url}/, constraints: EnvironmentDomainConstraint.new, via: :all
+  match ':profile/*page/versions_diff', controller: 'content_viewer', action: 'versions_diff', profile: /#{Noosfero.identifier_format_in_url}/i, constraints: EnvironmentDomainConstraint.new, via: :all
   match '*page/versions_diff', controller: 'content_viewer', action: 'versions_diff', via: :all
   # match requests for profiles that don't have a custom domain
-  match ':profile(/*page)', controller: 'content_viewer', action: 'view_page', profile: /#{Noosfero.identifier_format_in_url}/, constraints: EnvironmentDomainConstraint.new, via: :all
+  match ':profile(/*page)', controller: 'content_viewer', action: 'view_page', profile: /#{Noosfero.identifier_format_in_url}/i, constraints: EnvironmentDomainConstraint.new, via: :all
   # match requests for content in domains hosted for profiles
   match '/(*page)', controller: 'content_viewer', action: 'view_page', via: :all
@@ -0,0 +1,26 @@
+class CreateProfileActivity < ActiveRecord::Migration
+  def up
+    ActiveRecord::Base.transaction do
+      create_table :profile_activities do |t|
+        t.integer :profile_id
+        t.integer :activity_id
+        t.string :activity_type
+        t.timestamps
+      end
+      add_index :profile_activities, :profile_id
+      add_index :profile_activities, [:activity_id, :activity_type]
+      add_index :profile_activities, :activity_type
+
+      Scrap.find_each batch_size: 50 do |scrap|
+        scrap.send :create_activity
+      end
+      ActionTracker::Record.find_each batch_size: 50 do |action_tracker|
+        action_tracker.send :create_activity
+      end
+    end
+  end
+
+  def down
+    drop_table :profile_activities
+  end
+end
@@ -0,0 +1,26 @@
+class AddIdToFavoriteEnterprisesPeople < ActiveRecord::Migration
+  def up
+    rename_table :favorite_enteprises_people, :favorite_enterprise_people
+
+    change_table :favorite_enterprise_people do |t|
+      t.timestamps
+    end
+    add_column :favorite_enterprise_people, :id, :primary_key
+
+    add_index :favorite_enterprise_people, [:person_id, :enterprise_id]
+    add_index :favorite_enterprise_people, :person_id
+    add_index :favorite_enterprise_people, :enterprise_id
+  end
+
+  def down
+    rename_table :favorite_enterprise_people, :favorite_enteprises_people
+
+    remove_column :favorite_enteprises_people, :id
+    remove_column :favorite_enteprises_people, :created_at
+    remove_column :favorite_enteprises_people, :updated_at
+
+    remove_index :favorite_enteprises_people, [:person_id, :enterprise_id]
+    remove_index :favorite_enteprises_people, :person_id
+    remove_index :favorite_enteprises_people, :enterprise_id
+  end
+end
@@ -0,0 +1,31 @@
+class AddUserIdToSession < ActiveRecord::Migration
+
+  def change
+    add_column :sessions, :user_id, :integer
+    add_index :sessions, :user_id
+  end
+
+  def up
+    Session.reset_column_information
+
+    # cleanup data: {}
+    Session.where(data: "BAh7AA==\n").delete_all
+    # cleanup data with lang key only
+    Session.where("data ~ 'BAh7BjoJbGFuZyIH.{3,3}=\n'").delete_all
+
+    # very slow migration, only do for the last month
+    Session.where('updated_at > ?', 1.month.ago).find_each batch_size: 50 do |session|
+      begin
+        # this calls Session#copy_to_columns
+        session.save!
+      rescue ArgumentError
+        # old ActionController::Flash::FlashHash from rails 2.3
+        session.destroy
+      end
+
+      # limit limitless allocations
+      GC.start
+    end
+  end
+
+end
@@ -0,0 +1,8 @@
+class IndexUserIdOnProfiles < ActiveRecord::Migration
+
+  def change
+    add_index :profiles, :user_id
+    add_index :profiles, [:user_id, :type]
+  end
+
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150603182105) do
+ActiveRecord::Schema.define(:version => 20150712130827) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -351,11 +351,17 @@ ActiveRecord::Schema.define(:version =&gt; 20150603182105) do
   add_index "external_feeds", ["enabled"], :name => "index_external_feeds_on_enabled"
   add_index "external_feeds", ["fetched_at"], :name => "index_external_feeds_on_fetched_at"
-  create_table "favorite_enteprises_people", :id => false, :force => true do |t|
-    t.integer "person_id"
-    t.integer "enterprise_id"
+  create_table "favorite_enterprise_people", :force => true do |t|
+    t.integer  "person_id"
+    t.integer  "enterprise_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
+  add_index "favorite_enterprise_people", ["enterprise_id"], :name => "index_favorite_enterprise_people_on_enterprise_id"
+  add_index "favorite_enterprise_people", ["person_id", "enterprise_id"], :name => "index_favorite_enterprise_people_on_person_id_and_enterprise_id"
+  add_index "favorite_enterprise_people", ["person_id"], :name => "index_favorite_enterprise_people_on_person_id"
+
   create_table "friendships", :force => true do |t|
     t.integer  "person_id"
     t.integer  "friend_id"
@@ -489,6 +495,18 @@ ActiveRecord::Schema.define(:version =&gt; 20150603182105) do
   add_index "products", ["product_category_id"], :name => "index_products_on_product_category_id"
   add_index "products", ["profile_id"], :name => "index_products_on_profile_id"
+  create_table "profile_activities", :force => true do |t|
+    t.integer  "profile_id"
+    t.integer  "activity_id"
+    t.string   "activity_type"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
+  add_index "profile_activities", ["activity_id", "activity_type"], :name => "index_profile_activities_on_activity_id_and_activity_type"
+  add_index "profile_activities", ["activity_type"], :name => "index_profile_activities_on_activity_type"
+  add_index "profile_activities", ["profile_id"], :name => "index_profile_activities_on_profile_id"
+
   create_table "profile_suggestions", :force => true do |t|
     t.integer  "person_id"
     t.integer  "suggestion_id"
@@ -555,6 +573,8 @@ ActiveRecord::Schema.define(:version =&gt; 20150603182105) do
   add_index "profiles", ["identifier"], :name => "index_profiles_on_identifier"
   add_index "profiles", ["members_count"], :name => "index_profiles_on_members_count"
   add_index "profiles", ["region_id"], :name => "index_profiles_on_region_id"
+  add_index "profiles", ["user_id", "type"], :name => "index_profiles_on_user_id_and_type"
+  add_index "profiles", ["user_id"], :name => "index_profiles_on_user_id"
   create_table "qualifier_certifiers", :force => true do |t|
     t.integer "qualifier_id"
@@ -645,10 +665,12 @@ ActiveRecord::Schema.define(:version =&gt; 20150603182105) do
     t.text     "data"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "user_id"
   end
   add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
   add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
+  add_index "sessions", ["user_id"], :name => "index_sessions_on_user_id"
   create_table "suggestion_connections", :force => true do |t|
     t.integer "suggestion_id",   :null => false
+noosfero (1.2) wheezy; urgency=low
+
+  * Noosfero 1.2
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Fri, 07 Aug 2015 13:39:14 -0300
+
+noosfero (1.2~rc2) wheezy; urgency=low
+
+  * Noosfero 1.2 RC2
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Mon, 27 Jul 2015 09:56:55 -0300
+
 noosfero (1.2~rc1) wheezy; urgency=medium
   [ Joenio Costa ]
@@ -14,7 +14,7 @@ p. Find on top of page the term &quot;Enterprises&quot; and click on it:
 h2(#description). Description
 # Fill in the search field with what you want to look for and click on "Search"  !=/images/doc/enterprises-search-field.en.png(Enterprises search field)!
-# Then you will see the search results. To see more results, click on the pages below the search results.  !=/images/doc/enterprises-search-results-with-example.en.png(Enteprises search results with example)!
+# Then you will see the search results. To see more results, click on the pages below the search results.  !=/images/doc/enterprises-search-results-with-example.en.png(Enterprises search results with example)!
 # Clicking on one of the search results, you will be redirected to the homepage of choosen enterprise.
 h3. More options
@@ -14,6 +14,16 @@ Feature: accept member
     And the community "My Community" is closed
     And "Mario Souto" is admin of "My Community"
+  Scenario: a user should see its merbership is pending
+    Given I am logged in as "mario"
+    And the following communities
+      | owner | identifier        | name              | closed |
+      | marie | private-community | Private Community | true   |
+    And I go to private-community's homepage
+    When I follow "Join this community"
+    And I go to private-community's homepage
+    Then I should see "Your membership is waiting for approval"
+
   @selenium
   Scenario: approve a task to accept a member as admin in a closed community
     Given "Marie Curie" asked to join "My Community"
@@ -9,8 +9,8 @@ Feature:
       | joaosilva  | Joao Silva  |
       | mariasilva | Maria Silva |
     And the following communities
-      | owner     | identifier        | name             |
-      | joaosilva | sample-community  | Sample Community |
+      | owner     | identifier        | name              |
+      | joaosilva | sample-community  | Sample Community  |
     And the following blocks
       | owner            | type         |
       | sample-community | MembersBlock |
@@ -24,7 +24,7 @@ Feature:
   Scenario: a user can join in a community by members block's button
     Given I am logged in as "mariasilva"
     And I go to sample-community's homepage
-    When I follow "Join" within ".members-block"
+    When I follow "Join this community" within ".members-block"
     And I go to mariasilva's control panel
     And I follow "Manage my groups"
     Then I should see "Sample Community"
@@ -42,7 +42,7 @@ Feature:
   Scenario: a not logged in user can log in by members block's button
     Given I am not logged in
     When I go to sample-community's homepage
-    And I follow "Join" within ".members-block"
+    And I follow "Join this community" within ".members-block"
     Then I should see "Username / Email"
   Scenario: the join-leave button do not appear if the checkbox show-join-leave-button is not checked
@@ -52,5 +52,5 @@ Feature:
     And I uncheck "Show join leave button"
     And I press "Save"
     When I go to sample-community's homepage
-    Then I should not see "Join" within ".members-block"
+    Then I should not see "Join this community" within ".members-block"
     And I should not see "Leave community" within ".members-block"
 module AuthenticatedSystem
+
   protected
+
+    # See impl. from http://stackoverflow.com/a/2513456/670229
+    def self.included? base
+      base.around_filter do
+        begin
+          User.current = current_user
+          yield
+        ensure
+          # to address the thread variable leak issues in Puma/Thin webserver
+          User.current = nil
+        end
+      end
+    end
+
     # Returns true or false if the user is logged in.
     # Preloads @current_user with the user model if they're logged in.
     def logged_in?
@@ -8,7 +23,13 @@ module AuthenticatedSystem
     # Accesses the current user from the session.
     def current_user
-      @current_user ||= (session[:user] && User.find_by_id(session[:user])) || nil
+      @current_user ||= begin
+        id = session[:user]
+        user = User.where(id: id).first if id
+        user.session = session if user
+        User.current = user
+        user
+      end
     end
     # Store the given user in the session.
@@ -17,9 +38,10 @@ module AuthenticatedSystem
         session.delete(:user)
       else
         session[:user] = new_user.id
+        new_user.session = session
         new_user.register_login
       end
-      @current_user = new_user
+      @current_user = User.current = new_user
     end
     # Check if the user is authorized.
@@ -121,14 +143,9 @@ module AuthenticatedSystem
     # When called with before_filter :login_from_cookie will check for an :auth_token
     # cookie and log the user back in if apropriate
     def login_from_cookie
-      return unless cookies[:auth_token] && !logged_in?
-      user = User.find_by_remember_token(cookies[:auth_token])
-      if user && user.remember_token?
-        user.remember_me
-        self.current_user = user
-        cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
-        flash[:notice] = "Logged in successfully"
-      end
+      return if cookies[:auth_token].blank? or logged_in?
+      user = User.where(remember_token: cookies[:auth_token]).first
+      self.current_user = user if user and user.remember_token?
     end
   private
@@ -21,7 +21,11 @@ module NeedsProfile
   protected
   def load_profile
-    @profile ||= environment.profiles.find_by_identifier(params[:profile])
+    if params[:profile]
+      params[:profile].downcase!
+      @profile ||= environment.profiles.where(identifier: params[:profile]).first
+    end
+
     if @profile
       profile_hostname = @profile.hostname
       if profile_hostname && profile_hostname != request.host
 Rails.configuration.to_prepare do
-  ActionTracker::Record.module_eval do
+  ActionTracker::Record.class_eval do
     extend CacheCounterHelper
     after_create do |record|
@@ -9,6 +9,11 @@ Rails.configuration.to_prepare do
       end
     end
+    has_many :profile_activities, foreign_key: :activity_id, conditions: {profile_activities: {activity_type: 'ActionTracker::Record'}}, dependent: :destroy
+
+    after_create :create_activity
+    after_update :update_activity
+
     after_destroy do |record|
       if record.created_at >= ActionTracker::Record::RECENT_DELAY.days.ago
         ActionTracker::Record.update_cache_counter(:activities_count, record.user, -1)
@@ -17,5 +22,17 @@ Rails.configuration.to_prepare do
         end
       end
     end
+
+    protected
+
+    def create_activity
+      target = if self.target.is_a? Profile then self.target else self.target.profile rescue self.user end
+      return if self.verb.in? target.exclude_verbs_on_activities
+      ProfileActivity.create! profile: target, activity: self
+    end
+    def update_activity
+      ProfileActivity.update_activity self
+    end
+
   end
 end
@@ -19,7 +19,7 @@ Dir.glob(Rails.root.join(plugins_root, &#39;*&#39;, &#39;controllers&#39;)) do |controllers_dir|
     controllers.each do |controller|
       controller_name = controller.gsub("#{plugin_name}_plugin_",'')
       if %w[profile myprofile].include?(folder.to_s)
-        match "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}(/:action(/:id))", controller: controller, profile: /#{Noosfero.identifier_format}/, via: :all
+        match "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}(/:action(/:id))", controller: controller, profile: /#{Noosfero.identifier_format}/i, via: :all
       else
         match "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}(/:action(/:id))", controller: controller, via: :all
       end
@@ -27,7 +27,7 @@ Dir.glob(Rails.root.join(plugins_root, &#39;*&#39;, &#39;controllers&#39;)) do |controllers_dir|
   end
   match 'plugin/' + plugin_name + '(/:action(/:id))', controller: plugin_name + '_plugin', via: :all
-  match 'profile/:profile/plugin/' + plugin_name + '(/:action(/:id))', controller: plugin_name + '_plugin_profile', profile: /#{Noosfero.identifier_format}/, via: :all
-  match 'myprofile/:profile/plugin/' + plugin_name + '(/:action(/:id))', controller: plugin_name + '_plugin_myprofile', profile: /#{Noosfero.identifier_format}/, via: :all
+  match "profile/:profile/plugin/#{plugin_name}(/:action(/:id))", controller: "#{plugin_name}_plugin_profile", profile: /#{Noosfero.identifier_format}/i, via: :all
+  match "myprofile/:profile/plugin/#{plugin_name}(/:action(/:id))", controller: "#{plugin_name}_plugin_myprofile", profile: /#{Noosfero.identifier_format}/i, via: :all
   match 'admin/plugin/' + plugin_name + '(/:action(/:id))', controller: plugin_name + '_plugin_admin', via: :all
 end
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.2~rc1'
+  VERSION = '1.2'
 end
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
@@ -22,6 +22,12 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id)
     # Notify all friends
     ActionTrackerNotification.connection.execute("insert into action_tracker_notifications(profile_id, action_tracker_id) select f.friend_id, #{tracked_action.id} from friendships as f where person_id=#{tracked_action.user.id} and f.friend_id not in (select atn.profile_id from action_tracker_notifications as atn where atn.action_tracker_id = #{tracked_action.id})")
+    if tracked_action.user.is_a? Organization
+      ActionTrackerNotification.connection.execute "insert into action_tracker_notifications(profile_id, action_tracker_id) " +
+      "select distinct accessor_id, #{tracked_action.id} from role_assignments where resource_id = #{tracked_action.user.id} and resource_type='Profile' " +
+      if tracked_action.user.is_a? Enterprise then "union select distinct person_id, #{tracked_action.id} from favorite_enterprise_people where enterprise_id = #{tracked_action.user.id}" else "" end
+    end
+
     if target.is_a?(Community)
       ActionTrackerNotification.create(:profile_id => target.id, :action_tracker_id => tracked_action.id) unless NOT_NOTIFY_COMMUNITY.include?(tracked_action.verb)
@@ -37,6 +37,11 @@ namespace :ci do
           tests << t unless tests.include?(t)
         end
       end
+      if f =~ %r{^app/views/(\w*)/}
+        controller = $1
+        t = "test/functional/#{controller}_controller_test.rb"
+        tests << t if File.exists?(t) && !tests.include?(t)
+      end
     end
     if tests.empty? && features.empty? && changed_plugins.empty?
 namespace :noosfero do
   namespace :plugins do
+    desc 'Enable all installed plugins on all environment'
     task :enable_all => :environment do
       Environment.all.each do |env|
         puts "Plugins Activated on #{env.name}" if env.enable_all_plugins
@@ -60,6 +60,8 @@ task :updatepo do
   puts 'Extracting strings from source. This may take a while ...'
+  # XXX this list is duplicated in test/unit/i18n_test.rb; if you change it
+  # here, please also update it there.
   files_to_translate = [
     "{app,lib}/**/*.{rb,rhtml,erb}",
     'config/initializers/*.rb',
@@ -98,7 +100,7 @@ Dir.glob(&#39;plugins/*&#39;).each do |plugindir|
       }
     )
     plugin_pot = File.join(po_root, "#{plugin}.pot")
-    if File.exists?(plugin_pot) && system("LANG=C msgfmt --statistics --output /dev/null #{plugin_pot} 2>&1 | grep -q '^0 translated messages.'")
+    if File.exists?(plugin_pot) && system("LANG=C msgfmt --statistics --output /dev/null #{plugin_pot} 2>&1 | grep -q '^0 translated messages.$'")
       rm_f plugin_pot
     end
     sh 'find', po_root, '-type', 'd', '-empty', '-delete'
@@ -106,8 +108,25 @@ Dir.glob(&#39;plugins/*&#39;).each do |plugindir|
   end
 end
+def checkpo(po_files)
+  max = po_files.map(&:size).max
+  po_files.each do |po|
+    printf "%#{max}s: ", po
+    system "msgfmt --statistics --output /dev/null " + po
+  end
+end
+
+desc "checks core translation files"
 task :checkpo do
-  sh 'for po in po/*/noosfero.po; do echo -n "$po: "; msgfmt --statistics --output /dev/null $po; done'
+  checkpo(Dir.glob('po/*/noosfero.po'))
+end
+
+languages = Dir.glob('po/*').select { |d| File.directory?(d) }.map { |d| File.basename(d) }
+languages.each do |lang|
+  desc "checks #{lang} translation files"
+  task "checkpo:#{lang}" do
+    checkpo(Dir.glob("po/#{lang}/*.po") + Dir.glob("plugins/*/po/#{lang}/*.po"))
+  end
 end
 # vim: ft=ruby
@@ -169,7 +169,7 @@ def test_sequence(plugins, tasks)
         failed[plugin] << task
       end
     end
-    disable_plugins(plugin)
+    disable_plugins
   end
   fail_flag = false
   failed.each do |plugin, tasks|
@@ -121,6 +121,10 @@ EOF
   desc "uploads the packages to the repository"
   task :upload_packages, :target do |t, args|
     target = args[:target] || 'stable'
+    source = Dir['pkg/noosfero-*.tar.gz'].first
+    sh "gpg --detach-sign #{source}"
+    sh "sha256sum #{source} > #{source}.sha256sum"
+    sh "scp #{source}* download.noosfero.org:repos/source/"
     sh "dput --unchecked noosfero-#{target} #{Dir['pkg/*.changes'].first}"
   end
@@ -189,6 +193,14 @@ EOF
     abort if missing
   end
+  task :tag do
+    sh "git tag -s -m 'Noosfero #{$version}' #{$version.gsub('~','-')}"
+  end
+
+  task :pushtag do
+    sh "git push origin #{$version.gsub('~','-')}"
+  end
+
   desc 'prepares a release tarball'
   task :release, :target do |t, args|
     target = args[:target]
@@ -220,15 +232,14 @@ EOF
     Rake::Task['noosfero:debian_packages'].invoke
     if confirm("Create tag for version #{$version}")
-      sh "git tag #{$version.gsub('~','-')}"
-
+      Rake::Task['noosfero:tag'].invoke
       if confirm('Push new version tag')
-        repository = ask('Repository name', 'origin')
         puts "==> Uploading tags..."
-        sh "git push #{repository} #{$version.gsub('~','-')}"
+        Rake::Task['noosfero:pushtag'].invoke
       end
     end
+    Rake::Task['noosfero:upload'].invoke
     if confirm('Upload the packages')
       puts "==> Uploading debian packages..."
       Rake::Task['noosfero:upload_packages'].invoke(target)
@@ -239,6 +250,9 @@ EOF
     rm_f "tmp/pending-release"
   end
+  desc "finishes the release"
+  task 'release:finish' => ['noosfero:upload_packages', 'noosfero:tag', 'noosfero:pushtag']
+
   desc 'Build Debian packages'
   task :debian_packages => :package do
     target = "pkg/noosfero-#{$version}"
@@ -11,12 +11,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
 "PO-Revision-Date: 2015-07-21 09:23-0300\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
-"/plugin-solr/pt/>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
+"plugin-solr/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,5 @@ msgstr &quot;&quot;
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.3-dev\n"
-msgid "Select the set of communities and users to track"
-msgstr "Seleciona o conjunto de comunidades e usuários para rastrear"
-
+#~ msgid "Select the set of communities and users to track"
+#~ msgstr "Seleciona o conjunto de comunidades e usuários para rastrear"
@@ -0,0 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
+"PO-Revision-Date: 2015-08-06 17:21-0300\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: plugins/anti_spam/lib/anti_spam_plugin.rb:8
+msgid ""
+"Tests comments and suggested articles against a spam checking service "
+"compatible with the Akismet API"
+msgstr ""
+
+#: plugins/anti_spam/views/anti_spam_plugin_admin/index.html.erb:1
+msgid "AntiSpam settings"
+msgstr ""
+
+#: plugins/anti_spam/views/anti_spam_plugin_admin/index.html.erb:5
+msgid "Host"
+msgstr ""
+
+#: plugins/anti_spam/views/anti_spam_plugin_admin/index.html.erb:7
+msgid "API key"
+msgstr ""
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -0,0 +1,46 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
+"PO-Revision-Date: 2015-08-06 17:21-0300\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin.rb:8
+msgid "A plugin that add a block to display breadcrumbs."
+msgstr ""
+
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:10
+msgid "Content Breadcrumbs"
+msgstr ""
+
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:14
+msgid "This block displays breadcrumb trail."
+msgstr ""
+
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:68
+msgid "Upload Files"
+msgstr ""
+
+#: plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb:2
+msgid "Show cms action"
+msgstr ""
+
+#: plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb:3
+msgid "Show profile"
+msgstr ""
+
+#: plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb:4
+msgid "Show section name"
+msgstr ""
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -30,8 +30,8 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     post :save, :id => @block.id, :profile => @profile.identifier, :block => {:title => 'breadcrumbs', :show_cms_action => false, :show_profile => false}
     @block.reload
     assert_equal 'breadcrumbs', @block.title
-    assert !@block.show_profile
-    assert !@block.show_cms_action
+    refute @block.show_profile
+    refute @block.show_cms_action
   end
   should 'be able save breadcrumbs block with show_section_name option' do
@@ -7,11 +7,11 @@ class BreadcrumbsPluginTest &lt; ActiveSupport::TestCase
   end
   should 'has a name' do
-    assert !BreadcrumbsPlugin.plugin_name.blank?
+    refute BreadcrumbsPlugin.plugin_name.blank?
   end
   should 'has a description' do
-    assert !BreadcrumbsPlugin.plugin_description.blank?
+    refute BreadcrumbsPlugin.plugin_description.blank?
   end
   should 'add a block' do
@@ -69,7 +69,7 @@ class ContentBreadcrumbsBlockTest &lt; ActiveSupport::TestCase
   end
   should 'not be cacheable' do
-    assert !@block.cacheable?
+    refute @block.cacheable?
   end
 end
@@ -12,4 +12,14 @@ class Product
   def display_supplier_on_search?
     false
   end
+
+  def action_tracker_user
+    return self.enterprise if self.enterprise.validated
+
+    if self.enterprise.bsc
+       self.enterprise.bsc
+    else
+       self.enterprise
+    end
+  end
 end
@@ -0,0 +1,351 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
+"PO-Revision-Date: 2015-08-06 17:21-0300\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: plugins/bsc/lib/bsc_plugin.rb:10
+msgid "Adds the Bsc feature"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:14
+msgid "Create Bsc"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:15
+msgid "Validate Enterprises"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:20
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:1
+msgid "Manage associated enterprises"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:21 plugins/bsc/lib/bsc_plugin.rb:27
+msgid "Transfer ownership"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:22
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:1
+msgid "Manage contracts"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:98
+msgid "Bsc"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:109
+#: plugins/bsc/views/shared/_fields.html.erb:53
+msgid "Contact"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/bsc.rb:28
+msgid "Bsc info and settings"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:10
+msgid "BSC association"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:18
+msgid "%{requestor} wants to associate this enterprise with %{linked_subject}."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:35
+msgid "%{enterprise} accepted your request to associate it with %{bsc}."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:39
+msgid "%{enterprise} rejected your request to associate it with %{bsc}."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:41
+msgid ""
+"Here is the reject explanation left by the administrator:\n"
+"\n"
+"%{reject_explanation}"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:46
+msgid "%{requestor} wants assoaciate %{bsc} as your BSC."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/mailer.rb:7
+msgid "[%s] Bsc management transferred to you."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Opened"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Negotiating"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Executing"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Closed"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:46
+msgid "Federal"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+msgid "ProjectA"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+msgid "ProjectB"
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:38
+msgid "This Bsc associations were saved successfully."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:42
+msgid "This Bsc associations couldn't be saved."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:71
+msgid "Enterprise ownership transferred."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:85
+msgid "Enterprise was created in association with %s."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:117
+msgid "Contract created."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:120
+msgid "Contract created but some products could not be added."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:131
+msgid "Contract doesn't exists! Maybe it was already removed."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:140
+msgid "Could not edit such contract."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:170
+msgid "Contract edited."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:173
+msgid "Contract edited but some products could not be added."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:183
+msgid "Contract removed."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:185
+msgid "Contract could not be removed. Sorry! ^^"
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:11
+msgid "Your Bsc was created."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:21
+msgid "Enterprises validated."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:24
+msgid "Enterprise validations couldn't be saved."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:4
+msgid "Associations awaiting approval:"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:16
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:5
+msgid "Type in a search term for enterprise"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:19
+msgid "Add new enterprise"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/new_contract.html.erb:1
+#: plugins/bsc/views/bsc_plugin_myprofile/edit_contract.html.erb:1
+msgid "New contract"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:6
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:7
+msgid "Client type"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:7
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:8
+msgid "Business type"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:10
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:11
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:5
+msgid "Status"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:18
+msgid "Type in search term for enterprise"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:23
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:27
+msgid "Quantity"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:24
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:28
+msgid "Unit price"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:27
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:38
+msgid "Total"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:31
+msgid "Add new product"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:35
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:13
+msgid "Supply period"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:57
+msgid "Type in a search term for product"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:5
+#: plugins/bsc/views/shared/_fields.html.erb:5
+msgid "Basic information"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:12
+msgid "Number of producers"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:48
+msgid "Annotations"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:17
+msgid "Sort by"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(newest first)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(oldest first)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(A-Z)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(Z-A)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:24
+msgid "There are no contracts at all."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:35
+msgid "Are you sure?"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:45
+msgid "Create new contract"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:2
+msgid "Existing enterprises:"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:3
+msgid ""
+"Were found %{count} enterprises with similar names on the same city, you can "
+"decide to associate one of them or create the new enterprise confirming the "
+"informations you typed in."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:20
+msgid "Associate"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:1
+msgid "Transfer Ownership"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:4
+msgid ""
+"This option allows you to transfer this enterprise's management to another "
+"user. This action will remove all the current administrators. Be careful "
+"when confirming this procedure."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:8
+msgid "Current administrators:"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:19
+msgid "Administrator:"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:22
+msgid "Type in a search term for the new administrator"
+msgstr ""
+
+#: plugins/bsc/views/shared/_fields.html.erb:39
+msgid ""
+"You are about to change the address, and this will break external links to "
+"this bsc or to posts inside it. Do you really want to change?"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin/mailer/admin_notification.html.erb:1
+msgid "The management of %{bsc} was transferred to you."
+msgstr ""
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:2
+msgid "Contact phone: "
+msgstr ""
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:3
+msgid "Email: "
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_admin/new.html.erb:2
+msgid "BSC registration"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:1
+msgid "Validate enterprises"
+msgstr ""
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
 "PO-Revision-Date: 2014-11-03 15:52+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
@@ -4,9 +4,9 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
 "PO-Revision-Date: 2014-12-12 14:22+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
 "PO-Revision-Date: 2009-10-26 16:20-0300\n"
 "Last-Translator: Anahit Minassian <anahit.minassian@cooperation.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.2~rc2-23-g29aba34\n"
+"POT-Creation-Date: 2015-08-06 18:47-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/"
@@ -73,6 +73,6 @@ class BscPluginAdminControllerTest &lt; ActionController::TestCase
     assert e1.validated
     assert e2.validated
-    assert !e3.validated
+    refute e3.validated
   end
 end
@@ -41,7 +41,7 @@ class BscPlugin::BscTest &lt; ActiveSupport::TestCase
     bsc.enterprise_requests.stubs(:pending).returns([task])
     assert bsc.already_requested?(e1)
-    assert !bsc.already_requested?(e2)
+    refute bsc.already_requested?(e2)
   end
   should 'return associated enterprises products' do
@@ -68,7 +68,7 @@ class BscPlugin::BscTest &lt; ActiveSupport::TestCase
   end
   should 'not be able to create product' do
-    assert !bsc.create_product?
+    refute bsc.create_product?
   end
   should 'have many contracts' do
@@ -14,7 +14,7 @@ class BscPlugin::ContractTest &lt; ActiveSupport::TestCase
     contract.bsc = BscPlugin::Bsc.new
     contract.valid?
-    assert !contract.errors.invalid?(:bsc)
+    refute contract.errors.invalid?(:bsc)
   end
   should 'associate contract with products through sales' do
@@ -18,8 +18,8 @@ class BscPlugin::SaleTest &lt; ActiveSupport::TestCase
     sale.product = product
     sale.contract = contract
-    assert !sale.errors.invalid?(product)
-    assert !sale.errors.invalid?(contract)
+    refute sale.errors.invalid?(product)
+    refute sale.errors.invalid?(contract)
   end
   should 'validate uniqueness of product and contract composed' do
@@ -43,7 +43,7 @@ class BscPlugin::SaleTest &lt; ActiveSupport::TestCase
     sale.quantity = 3
     sale.valid?
-    assert !sale.errors.invalid?(:quantity)
+    refute sale.errors.invalid?(:quantity)
   end
   should 'set default price as product price if no price indicated' do
1	class EnterpriseValidationController < MyProfileController	1	class EnterpriseValidationController < MyProfileController
2		2
3	protect 'validate_enterprise', :profile	3	protect 'validate_enterprise', :profile
4	-	4	+
5	def index	5	def index
6	@pending_validations = profile.pending_validations	6	@pending_validations = profile.pending_validations
7	end	7	end
	@@ -27,7 +27,7 @@ class EnterpriseValidationController < MyProfileController		@@ -27,7 +27,7 @@ class EnterpriseValidationController < MyProfileController
27	post_only :reject	27	post_only :reject
28	def reject	28	def reject
29	@pending = profile.find_pending_validation(params[:id])	29	@pending = profile.find_pending_validation(params[:id])
30	- if @pending	30	+ if @pending
31	@pending.reject_explanation = params[:reject_explanation]	31	@pending.reject_explanation = params[:reject_explanation]
32	begin	32	begin
33	@pending.reject	33	@pending.reject
	@@ -6,6 +6,7 @@ class ProfileController < PublicController		@@ -6,6 +6,7 @@ class ProfileController < PublicController
6	before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]	6	before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
7		7
8	helper TagsHelper	8	helper TagsHelper
		9	+ helper ActionTrackerHelper
9		10
10	protect 'send_mail_to_members', :profile, :only => [:send_mail]	11	protect 'send_mail_to_members', :profile, :only => [:send_mail]
11		12
@@ -0,0 +1,94 @@		@@ -0,0 +1,94 @@
	1	+module ActionTrackerHelper
	2	+
	3	+ def create_article_description ta
	4	+ _('published an article: %{title}') % { title: link_to(truncate(ta.get_name), ta.get_url) }
	5	+ end
	6	+
	7	+ def new_friendship_description ta
	8	+ n_('has made 1 new friend:<br />%{name}', 'has made %{num} new friends:<br />%{name}', ta.get_friend_name.size) % {
	9	+ num: ta.get_friend_name.size,
	10	+ name: ta.collect_group_with_index(:friend_name) do \|n,i\|
	11	+ link_to image_tag(ta.get_friend_profile_custom_icon[i] \|\| default_or_themed_icon("/images/icons-app/person-icon.png")),
	12	+ ta.get_friend_url[i], title: n
	13	+ end.join
	14	+ }
	15	+ end
	16	+
	17	+ def join_community_description ta
	18	+ n_('has joined 1 community:<br />%{name}', 'has joined %{num} communities:<br />%{name}', ta.get_resource_name.size) % {
	19	+ num: ta.get_resource_name.size,
	20	+ name: ta.collect_group_with_index(:resource_name) do \|n,i\|
	21	+ link_to image_tag(ta.get_resource_profile_custom_icon[i] \|\| default_or_themed_icon("/images/icons-app/community-icon.png")),
	22	+ ta.get_resource_url[i], title: n
	23	+ end.join
	24	+ }
	25	+ end
	26	+
	27	+ def add_member_in_community_description ta
	28	+ _('has joined the community.')
	29	+ end
	30	+
	31	+ def upload_image_description ta
	32	+ total = ta.get_view_url.size
	33	+ (n_('uploaded 1 image', 'uploaded %d images', total) % total) +
	34	+ tag(:br) +
	35	+ ta.collect_group_with_index(:thumbnail_path) do \|t,i\|
	36	+ if total == 1
	37	+ link_to image_tag(t), ta.get_view_url[i], class: 'upimg'
	38	+ else
	39	+ pos = total-i;
	40	+ morethen2 = pos>2 ? 'morethen2' : ''
	41	+ morethen5 = pos>5 ? 'morethen5' : ''
	42	+ t = t.gsub(/(.)(display)(.)/, '\\1thumb\\3')
	43	+
	44	+ link_to ' '.html_safe, ta.get_view_url[i],
	45	+ style: "background-image:url(#{t})",
	46	+ class: "upimg pos#{pos} #{morethen2} #{morethen5}"
	47	+ end
	48	+ end.reverse.join +
	49	+ if total <= 5 then ''.html_safe else content_tag :span, '…'.html_safe,
	50	+ class: 'more', onclick: "this.parentNode.className+=' show-all'" end +
	51	+ tag(:br, style: 'clear: both')
	52	+ end
	53	+
	54	+ def reply_scrap_description ta
	55	+ _('sent a message to %{receiver}: <br /> "%{message}"') % {
	56	+ receiver: link_to(ta.get_receiver_name, ta.get_receiver_url),
	57	+ message: auto_link_urls(ta.get_content)
	58	+ }
	59	+ end
	60	+
	61	+ alias :leave_scrap_description :reply_scrap_description
	62	+ alias :reply_scrap_on_self_description :reply_scrap_description
	63	+
	64	+ def leave_scrap_to_self_description ta
	65	+ _('wrote: <br /> "%{text}"') % {
	66	+ text: auto_link_urls(ta.get_content)
	67	+ }
	68	+ end
	69	+
	70	+ def create_product_description
	71	+ _('created the product %{title}') % {
	72	+ title: link_to(truncate(ta.get_name), ta.get_url),
	73	+ }
	74	+ end
	75	+
	76	+ def update_product_description
	77	+ _('updated the product %{title}') % {
	78	+ title: link_to(truncate(ta.get_name), ta.get_url),
	79	+ }
	80	+ end
	81	+
	82	+ def remove_product_description
	83	+ _('removed the product %{title}') % {
	84	+ title: truncate(ta.get_name),
	85	+ }
	86	+ end
	87	+
	88	+ def favorite_enterprise_description ta
	89	+ _('favorited enterprise %{title}') % {
	90	+ title: link_to(truncate(ta.get_enterprise_name), ta.get_enterprise_url),
	91	+ }
	92	+ end
	93	+
	94	+end
	@@ -8,7 +8,8 @@ class Article < ActiveRecord::Base		@@ -8,7 +8,8 @@ class Article < ActiveRecord::Base
8	:accept_comments, :feed, :published, :source, :source_name,	8	:accept_comments, :feed, :published, :source, :source_name,
9	:highlighted, :notify_comments, :display_hits, :slug,	9	:highlighted, :notify_comments, :display_hits, :slug,
10	:external_feed_builder, :display_versions, :external_link,	10	:external_feed_builder, :display_versions, :external_link,
11	- :image_builder, :show_to_followers	11	+ :image_builder, :show_to_followers,
		12	+ :author
12		13
13	acts_as_having_image	14	acts_as_having_image
14		15
1	class FavoriteEnterprisePerson < ActiveRecord::Base	1	class FavoriteEnterprisePerson < ActiveRecord::Base
2		2
3	- self.table_name = :favorite_enteprises_people	3	+ attr_accessible :person, :enterprise
		4	+
		5	+ track_actions :favorite_enterprise, :after_create, keep_params: [:enterprise_name, :enterprise_url], if: proc{ \|f\| f.is_trackable? }
4		6
5	belongs_to :enterprise	7	belongs_to :enterprise
6	belongs_to :person	8	belongs_to :person
7		9
		10	+ protected
		11	+
		12	+ def is_trackable?
		13	+ self.enterprise.public?
		14	+ end
		15	+
		16	+ def enterprise_name
		17	+ self.enterprise.short_name(nil)
		18	+ end
		19	+ def enterprise_url
		20	+ self.enterprise.url
		21	+ end
		22	+
8	end	23	end
	@@ -80,6 +80,7 @@ class PersonNotifier		@@ -80,6 +80,7 @@ class PersonNotifier
80	class Mailer < ActionMailer::Base	80	class Mailer < ActionMailer::Base
81		81
82	helper ApplicationHelper	82	helper ApplicationHelper
		83	+ helper ActionTrackerHelper
83		84
84	def session	85	def session
85	{:theme => nil}	86	{:theme => nil}
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+class ProfileActivity < ActiveRecord::Base
	2	+
	3	+ self.record_timestamps = false
	4	+
	5	+ attr_accessible :profile_id,
	6	+ :profile, :activity
	7	+
	8	+ belongs_to :profile
	9	+ belongs_to :activity, polymorphic: true
	10	+
	11	+ # non polymorphic versions
	12	+ belongs_to :scrap, foreign_key: :activity_id, class_name: 'Scrap', conditions: {profile_activities: {activity_type: 'Scrap'}}
	13	+ belongs_to :action_tracker, foreign_key: :activity_id, class_name: 'ActionTracker::Record', conditions: {profile_activities: {activity_type: 'ActionTracker::Record'}}
	14	+
	15	+ before_validation :copy_timestamps
	16	+
	17	+ def self.update_activity activity
	18	+ profile_activity = ProfileActivity.where(activity_id: activity.id, activity_type: activity.class.base_class.name).first
	19	+ profile_activity.send :copy_timestamps
	20	+ profile_activity.save!
	21	+ profile_activity
	22	+ end
	23	+
	24	+ protected
	25	+
	26	+ def copy_timestamps
	27	+ self.created_at = self.activity.created_at
	28	+ self.updated_at = self.activity.updated_at
	29	+ end
	30	+
	31	+end
	@@ -16,19 +16,19 @@ class ProfileListBlock < Block		@@ -16,19 +16,19 @@ class ProfileListBlock < Block
16		16
17	def profile_list	17	def profile_list
18	result = nil	18	result = nil
19	- visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])	19	+ public_profiles = profiles.public.includes([:image,:domains,:preferred_domain,:environment])
20	if !prioritize_profiles_with_image	20	if !prioritize_profiles_with_image
21	- result = visible_profiles.all(:limit => get_limit, :order => 'profiles.updated_at DESC').sort_by{ rand }	21	+result = public_profiles.all(:limit => get_limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
22	elsif profiles.visible.with_image.count >= get_limit	22	elsif profiles.visible.with_image.count >= get_limit
23	- result = visible_profiles.with_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }	23	+ result = public_profiles.with_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
24	else	24	else
25	- result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }	25	+ result = public_profiles.with_image.sort_by{ rand } + public_profiles.without_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
26	end	26	end
27	result.slice(0..get_limit-1)	27	result.slice(0..get_limit-1)
28	end	28	end
29		29
30	def profile_count	30	def profile_count
31	- profiles.visible.length	31	+ profiles.public.length
32	end	32	end
33		33
34	# the title of the block. Probably will be overriden in subclasses.	34	# the title of the block. Probably will be overriden in subclasses.
	@@ -13,6 +13,11 @@ class Scrap < ActiveRecord::Base		@@ -13,6 +13,11 @@ class Scrap < ActiveRecord::Base
13	has_many :replies, :class_name => 'Scrap', :foreign_key => 'scrap_id', :dependent => :destroy	13	has_many :replies, :class_name => 'Scrap', :foreign_key => 'scrap_id', :dependent => :destroy
14	belongs_to :root, :class_name => 'Scrap', :foreign_key => 'scrap_id'	14	belongs_to :root, :class_name => 'Scrap', :foreign_key => 'scrap_id'
15		15
		16	+ has_many :profile_activities, foreign_key: :activity_id, conditions: {profile_activities: {activity_type: 'Scrap'}}, dependent: :destroy
		17	+
		18	+ after_create :create_activity
		19	+ after_update :update_activity
		20	+
16	scope :all_scraps, -> (profile) { limit(30).where("receiver_id = ? OR sender_id = ?", profile, profile) }	21	scope :all_scraps, -> (profile) { limit(30).where("receiver_id = ? OR sender_id = ?", profile, profile) }
17		22
18	scope :not_replies, -> { where scrap_id: nil }	23	scope :not_replies, -> { where scrap_id: nil }
	@@ -23,10 +28,7 @@ class Scrap < ActiveRecord::Base		@@ -23,10 +28,7 @@ class Scrap < ActiveRecord::Base
23		28
24	track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.sender != s.receiver && s.sender == s.top_root.receiver}	29	track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.sender != s.receiver && s.sender == s.top_root.receiver}
25		30
26	- after_create do \|scrap\|
27	- scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil?
28	- ScrapNotifier.notification(scrap).deliver if scrap.send_notification?
29	- end	31	+ after_create :send_notification
30		32
31	before_validation :strip_all_html_tags	33	before_validation :strip_all_html_tags
32		34
	@@ -57,4 +59,21 @@ class Scrap < ActiveRecord::Base		@@ -57,4 +59,21 @@ class Scrap < ActiveRecord::Base
57	sender != receiver && (is_root? ? root.receiver.receives_scrap_notification? : receiver.receives_scrap_notification?)	59	sender != receiver && (is_root? ? root.receiver.receives_scrap_notification? : receiver.receives_scrap_notification?)
58	end	60	end
59		61
		62	+ protected
		63	+
		64	+ def create_activity
		65	+ # do not scrap replies (when scrap_id is not nil)
		66	+ return if self.scrap_id.present?
		67	+ ProfileActivity.create! profile_id: self.receiver_id, activity: self
		68	+ end
		69	+
		70	+ def update_activity
		71	+ ProfileActivity.update_activity self
		72	+ end
		73	+
		74	+ def send_notification
		75	+ self.root.update_attribute('updated_at', DateTime.now) unless self.root.nil?
		76	+ ScrapNotifier.notification(self).deliver if self.send_notification?
		77	+ end
		78	+
60	end	79	end
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+class Session < ActiveRecord::SessionStore::Session
	2	+
	3	+ # removed and redefined on super class
	4	+ def self.find_by_session_id session_id
	5	+ super
	6	+ end
	7	+
	8	+ belongs_to :user
	9	+
	10	+ before_save :copy_to_columns
	11	+
	12	+ protected
	13	+
	14	+ def copy_to_columns
	15	+ self.user_id = self.data['user']
	16	+ end
	17	+
	18	+end