Merge branch 'master' into api

Antonio Terceiro
2 parents 24913d87 ef2f9593
Showing 897 changed files with 40376 additions and 10326 deletions Show diff stats
AUTHORS.md
app/controllers/application_controller.rb
app/controllers/my_profile/cms_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/controllers/public/search_controller.rb
app/helpers/action_tracker_helper.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/blog_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/dates_helper.rb
app/helpers/events_helper.rb
app/helpers/forms_helper.rb
app/helpers/layout_helper.rb
app/mailers/scrap_notifier.rb
app/models/add_member.rb
+This list is automatically generated at release time. Please do not change it.
+
 If you are not listed here, but should be, please write to the noosfero mailing
 list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
 (this list requires subscription to post, but since you are an author of
@@ -6,280 +8,123 @@ noosfero, that&#39;s not a problem).
 Developers
 ==========
+Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
 Alan Freihof Tygel <alantygel@gmail.com>
-Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
-Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
-Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
-Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
-Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
 Alessandro Palmeira <alessandro.palmeira@gmail.com>
+Alex Campelo <campelo.al1@gmail.com>
+Álvaro Fernando <alvarofernandoms@gmail.com>
 Ana Losnak <analosnak@gmail.com>
-Andre Bernardes <andrebsguedes@gmail.com>
-André Bernardes <andrebsguedes@gmail.com>
-André Guedes <andrebsguedes@fedora.local>
+Ana Paula Vargas <anapaulavnoronha@gmail.com>
+Andre Bedran <bedran.fleck@gmail.com>
 André Guedes <andrebsguedes@gmail.com>
-Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
-Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
+Andrey Aleksanyants <aaleksanyants@yahoo.com>
 Antonio Terceiro <terceiro@colivre.coop.br>
 Arthur Del Esposte <arthurmde@gmail.com>
-Arthur Del Esposte <arthurmde@yahoo.com.br>
 Athos Ribeiro <athoscribeiro@gmail.com>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <braulio@eita.org.br>
-Braulio Bhavamitra <brauliobo@gmail.com>
-Bráulio Bhavamitra <brauliobo@gmail.com>
-Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
-Caio <caio.csalgado@gmail.com>
+Brenddon Gontijo <brenddongontijo@msn.com>
 Caio Formiga <caio.formiga@gmail.com>
-Caio SBA <caio@colivre.coop.br>
-Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
-Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
-Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
-Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
-Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
-Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
-Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
-Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
 Caio Salgado <caio.csalgado@gmail.com>
+Caio SBA <caio@colivre.coop.br>
 Caio Tiago Oliveira <caiotiago@colivre.coop.br>
-Caio, Pedro <caio.csalgado@gmail.com>
 Carlos Andre de Souza <carlos.andre.souza@msn.com>
-Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
-Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
-Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
-Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
 Carlos Morais <carlos88morais@gmail.com>
 Christophe DANIEL <papaeng@gmail.com>
-Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
-Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
-Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
-Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
-Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
-Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
-Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
-Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
-Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
+Daniela Feitosa <alessandro.palmeira@gmail.com>
+Daniel Alves <danpaulalves@gmail.com>
+Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
-Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
+Daniel Tygel <dtygel@eita.org.br>
 David Carlos <ddavidcarlos1392@gmail.com>
-Diego + Jefferson <diegoamc90@gmail.com>
-Diego + Renan <renanteruoc@gmail.com>
-Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
-Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
-Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
-Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
-Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
-Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
-Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
-Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
-Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
-Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
-Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
-Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
-Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Diego Araújo + João Machini <diegoamc90@gmail.com>
-Diego Araújo + João Machini <digoamc90@gmail.com>
-Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
-Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
-Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
-Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
-Diego Araújo <diegoamc90@gmail.com>
-Diego Martinez <diegoamc90@gmail.com>
-DylanGuedes <djmgguedes@gmail.com>
-Eduardo Passos <eduardo@risa.localdomain.localhost>
+Diego Araujo <diegoamc90@gmail.com>
+Dylan Guedes <djmgguedes@gmail.com>
+Eduardo Morais
 Eduardo Passos <eduardosteps@gmail.com>
 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
 Eduardo Vital <vitaldu@gmail.com>
-Evandro Jr <evandrojr@gmail.com>
-Evandro Junior <evandrojr@gmail.com>
 Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
 Fabio Teixeira <fabio1079@gmail.com>
 FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
-Fabio Teixeira <fabio1079@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Filipe Ribeiro <firibeiro77@live.com>
-Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
-Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
-Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
 Gabriela Navarro <navarro1703@gmail.com>
 Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
-Gust <darksshades@hotmail.com>
+Guilherme C. Muniz <guilherme.cmuniz@gmail.com>
+Guilherme Rojas <guilhermehrojas@gmail.com>
+Gustavo Jaruga <darksshades@gmail.com>
 Hebert Douglas <hebertdougl@gmail.com>
 Hugo Melo <hugo@riseup.net>
+Iolane Andrade <andrade.icaa@gmail.com>
 Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
-Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
-Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
-Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
-Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
-Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
+Jefferson Fernandes <jeffs.fernandes@gmail.com>
+Jérôme Jutteau <j.jutteau@gmail.com>
+João Machini
+João M. M. da Silva <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
-Jose Pedro <1jpsneto@gmail.com>
 Josef Spillner <josef.spillner@tu-dresden.de>
-João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
-João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva <jaodsilv@linux.ime.usp.br>
-João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
-João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
-João da Silva <jaodsilv@linux.ime.usp.br>
-Junior Silva <junior@bajor.localhost.localdomain>
-Junior Silva <junior@sedeantigo.colivre.coop.br>
+Jose Pedro <1jpsneto@gmail.com>
 Junior Silva <juniorsilva1001@gmail.com>
-Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
-Junior Silva <juniorsilva@colivre.coop.br>
-Jérôme Jutteau <j.jutteau@gmail.com>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
-Larissa Reis <reiss.larissa@gmail.com>
 Leandro Alves <leandrosustenido@gmail.com>
-Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
-Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
-Leandro Nunes dos Santos <leandronunes@gmail.com>
+Leandro Veloso <leandrovelosorodrigues@gmail.com>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
+Lucas Couto <loc.unb@gmail.com>
 Lucas Kanashiro <kanashiro.duarte@gmail.com>
-Lucas Melo <lucas@colivre.coop.br>
 Lucas Melo <lucaspradomelo@gmail.com>
-Luciano <lucianopcbr@gmail.com>
-Luciano Prestes Cavacanti <lucianopcbr@gmail.com>
 Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
-M for Momo <mo@rtnp.org>
-Marcelo Júnior <maljunior@gmail.com>
-Marcos <marcos.rpj2@gmail.com>
+Luiz Matos <luizff.matos@gmail.com>
 Marcos Ramos <ms.ramos@outlook.com>
+Marcos Ronaldo <marcos.rpj2@gmail.com>
+Mariel Zasso <noosfero-br@listas.softwarelivre.org>
 Martín Olivera <molivera@solar.org.ar>
+Matheus Faria <matheus.sousa.faria@gmail.com>
 Maurilio Atila <cabelotaina@gmail.com>
+M for Momo <mo@rtnp.org>
 Michal Čihař <michal@cihar.com>
 Michel Felipe <mfelipeof@gmail.com>
 Moises Machado <moises@colivre.coop.br>
-Nanda Lopes <nanda.listas+psl@gmail.com>
 Naíla Alves <naila@colivre.coop.br>
+Nanda Lopes <nanda.listas+psl@gmail.com>
 Niemand Jedermann <predatorix@web.de>
 Parley Martins <parleypachecomartins@gmail.com>
-Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
-Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
-Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
-Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
-Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
-Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
 Paulo Meirelles <paulo@softwarelivre.org>
+Pedro de Lyra <pedrodelyra@gmail.com>
+Pedro Leal
+Rafael de Souza Queiroz <querafael@live.com>
 Rafael Gomes <rafaelgomes@techfree.com.br>
-Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
-Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
-Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
-Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
-Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
 Rafael Martins <rmmartins@gmail.com>
-Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
-Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
-Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
-Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
-Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
 Rafael Reggiani Manzo <rr.manzo@gmail.com>
 Raphaël Rousseau <raph@r4f.org>
-Raquel <rcordioli@gmail.com>
 Raquel Lira <raquel.lira@gmail.com>
-Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
-Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
-Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
-Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
-Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
-Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
-Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
+Raquel <rcordioli@gmail.com>
+Renan Costa <renan2727@hotmail.com>
+Renan Teruo <renanteruoc@gmail.com>
+Rodrigo Medeiros <rodrigo.mss01@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 Samuel R. C. Vale <srcvale@holoscopio.com>
-TWS <tablettws@gmail.com>
-Tallys Martins <tallysmartins@gmail.com>
 Tallys Martins <tallysmartins@yahoo.com.br>
 Thiago Casotti <thiago.casotti@uol.com.br>
+Thiago Kairala <thiagor.kairala@gmail.com>
 Thiago Ribeiro <thiagitosouza@hotmail.com>
 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
 Tuux <tuxa@galaxie.eu.org>
+TWS <tablettws@gmail.com>
 Valessio Brito <contato@valessiobrito.com.br>
-Valessio Brito <contato@valessiobrito.info>
-Valessio Brito <valessio@gmail.com>
-Victor Carvalho <victorhugodf.ac@gmail.com>
 Victor Costa <vfcosta@gmail.com>
 Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
 Vinicius Cubas Brand <viniciuscb@gmail.com>
-Visita <visita@debian.(none)>
+Wilton Rodrigues <braynwilton@gmail.com>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
-alcampelo <alcampelo@alcampelo.(none)>
-analosnak <analosnak@gmail.com>
-daniel <dtygel@eita.org.br>
-diegoamc <diegoamc90@gmail.com>
-dtygel <dtygel@gmail.com>
-juniorsilva <juniorsilva@QonoS.localhost.localdomain>
-root <root@17edebf1ae91>
-root <root@debian.sdr.serpro>
-tallys <tallys@tallys.(none)>
-tallys <tallys@tallys>
-vfcosta <vfcosta@gmail.com>
-Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
 Ideas, specifications and incentive
 ===================================
@@ -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
@@ -111,10 +111,7 @@ class CmsController &lt; MyProfileController
       end
     end
-    unless @article.kind_of?(RssFeed)
-      @escaped_body = CGI::escapeHTML(@article.body || '')
-      @escaped_abstract = CGI::escapeHTML(@article.abstract || '')
-    end
+    escape_fields @article
   end
   def new
@@ -185,6 +182,8 @@ class CmsController &lt; MyProfileController
       end
     end
+    escape_fields @article
+
     render :action => 'edit'
   end
@@ -534,4 +533,10 @@ class CmsController &lt; MyProfileController
     end
   end
+  def escape_fields article
+    unless article.kind_of?(RssFeed)
+      @escaped_body = CGI::escapeHTML(article.body || '')
+      @escaped_abstract = CGI::escapeHTML(article.abstract || '')
+    end
+  end
 end
 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
@@ -162,4 +163,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
@@ -46,14 +46,20 @@ class AccountController &lt; ApplicationController
     self.current_user = plugins_alternative_authentication
-    self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
-
+    begin
+      self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
+    rescue User::UserNotActivated => e
+      session[:notice] = e.message
+      return
+    end
     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 +98,7 @@ class AccountController &lt; ApplicationController
     @invitation_code = params[:invitation_code]
     begin
       @user = User.build(params[:user], params[:profile_data], environment)
+      @user.session = session
       @terms_of_use = environment.terms_of_use
       @user.return_to = session[:return_to]
       @person = Person.new(params[:profile_data])
@@ -432,7 +439,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
@@ -452,8 +459,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'
@@ -466,8 +476,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]
@@ -92,10 +92,10 @@ class SearchController &lt; PublicController
   def events
     if params[:year].blank? && params[:year].blank? && params[:day].blank?
-      @date = Date.today
+      @date = DateTime.now
     else
-      year = (params[:year] ? params[:year].to_i : Date.today.year)
-      month = (params[:month] ? params[:month].to_i : Date.today.month)
+      year = (params[:year] ? params[:year].to_i : DateTime.now.year)
+      month = (params[:month] ? params[:month].to_i : DateTime.now.month)
       day = (params[:day] ? params[:day].to_i : 1)
       @date = build_date(year, month, day)
     end
@@ -106,9 +106,7 @@ class SearchController &lt; PublicController
       @events = @category ?
         environment.events.by_day(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
         environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
-    end
-
-    if params[:year] || params[:month]
+    elsif params[:year] || params[:month]
       @events = @category ?
         environment.events.by_month(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
         environment.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
@@ -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
@@ -903,7 +903,7 @@ module ApplicationHelper
   end
   def base_url
-    environment.top_url(request.scheme)
+    profile ? profile.top_url(request.scheme) : environment.top_url(request.scheme)
   end
   alias :top_url :base_url
@@ -88,7 +88,7 @@ module ArticleHelper
     content_tag( 'small', _('Who will be able to create new topics on this forum?')) +
     content_tag('div', '', slider_options) +
     hidden_field_tag('article[topic_creation]', article.topic_creation) +
-    javascript_include_tag('topic-creation-config')
+    javascript_include_tag("#{Noosfero.root}/assets/topic-creation-config.js")
   end
   def privacity_exceptions(article, tokenized_children)
@@ -6,7 +6,13 @@ module BlogHelper
     @article = article
     hidden_field_tag('article[published]', 1) +
     hidden_field_tag('article[accept_comments]', 0) +
-    visibility_options(article,tokenized_children)
+    visibility_options(article,tokenized_children) +
+    content_tag('h4', _('Visualization of posts')) +
+    content_tag(
+      'div',
+      check_box(:article, :display_preview) +
+      content_tag('label', _('I want to display the preview of posts before the text'), :for => 'article_display_preview')
+    )
   end
   def cms_label_for_new_children
@@ -51,7 +51,7 @@ module ContentViewerHelper
     elsif date_format == 'past_time'
       left_time = true
     end
-    content_tag('span', show_date(article.published_at, use_numbers , year, left_time), :class => 'date')
+    content_tag('span', show_time(article.published_at, use_numbers , year, left_time), :class => 'date')
   end
   def link_to_comments(article, args = {})
@@ -43,9 +43,14 @@ module DatesHelper
   end
   # formats a datetime for displaying.
-  def show_time(time)
-    if time
-      _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") }
+  def show_time(time, use_numbers = false, year = true, left_time = false)
+    if time && use_numbers
+      _('%{month}/%{day}/%{year}, %{hour}:%{minutes}') % { :year => (year ? time.year : ''), :month => time.month, :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") }
+    elsif time && left_time
+      date_format = time_ago_in_words(time)
+    elsif time
+      date_format = year ? _('%{month_name} %{day}, %{year} %{hour}:%{minutes}') : _('%{month_name} %{day} %{hour}:%{minutes}')
+      date_format % { :day => time.day, :month_name => month_name(time.month), :year => time.year, :hour => time.hour, :minutes => time.strftime("%M") }
     else
       ''
     end
@@ -53,7 +58,7 @@ module DatesHelper
   def show_period(date1, date2 = nil, use_numbers = false)
     if (date1 == date2) || (date2.nil?)
-      show_date(date1, use_numbers)
+      show_time(date1, use_numbers)
     else
       if date1.year == date2.year
         if date1.month == date2.month
@@ -72,8 +77,8 @@ module DatesHelper
         end
       else
         _('from %{date1} to %{date2}') % {
-          :date1 => show_date(date1, use_numbers),
-          :date2 => show_date(date2, use_numbers)
+          :date1 => show_time(date1, use_numbers),
+          :date2 => show_time(date2, use_numbers)
         }
       end
     end
@@ -106,18 +111,18 @@ module DatesHelper
   def build_date(year, month, day = 1)
     if year.blank? and month.blank? and day.blank?
-      Date.today
+      DateTime.now
     else
       if year.blank?
-        year = Date.today.year
+        year = DateTime.now.year
       end
       if month.blank?
-        month = Date.today.month
+        month = DateTime.now.month
       end
       if day.blank?
         day = 1
       end
-      Date.new(year.to_i, month.to_i, day.to_i)
+      DateTime.new(year.to_i, month.to_i, day.to_i)
     end
   end
@@ -16,7 +16,7 @@ module EventsHelper
     content_tag( 'tr',
       content_tag('td',
-        content_tag('div', show_date(article.start_date) + ( article.end_date.nil? ?  '' : (_(" to ") + show_date(article.end_date))),:class => 'event-date' ) +
+        content_tag('div', show_time(article.start_date) + ( article.end_date.nil? ?  '' : (_(" to ") + show_time(article.end_date))),:class => 'event-date' ) +
         content_tag('div',link_to(article.name,article.url),:class => 'event-title') +
         content_tag('div',(article.address.nil? or article.address == '')  ? '' : (_('Place: ') + article.address),:class => 'event-place')
       )
@@ -30,7 +30,7 @@ module EventsHelper
         # the day itself
         date,
         # is there any events in this date?
-        events.any? {|event| event.date_range.include?(date)},
+        events.any? {|event| event.date_range.cover?(date)},
         # is this date in the current month?
         true
       ]
@@ -151,7 +151,7 @@ module FormsHelper
     datepicker_options[:close_text] ||= _('Done')
     datepicker_options[:constrain_input] ||= true
     datepicker_options[:current_text] ||= _('Today')
-    datepicker_options[:date_format] ||= 'mm/dd/yy'
+    datepicker_options[:date_format] ||= 'yy/mm/dd'
     datepicker_options[:day_names] ||= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
     datepicker_options[:day_names_min] ||= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
     datepicker_options[:day_names_short] ||= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
@@ -236,7 +236,7 @@ module FormsHelper
         weekHeader: #{datepicker_options[:week_header].to_json},
         yearRange: #{datepicker_options[:year_range].to_json},
         yearSuffix: #{datepicker_options[:year_suffix].to_json}
-      })
+      }).datepicker('setDate', new Date('#{value}'))
     </script>
     ".html_safe
     result
@@ -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
@@ -93,7 +86,7 @@ module LayoutHelper
   end
   def theme_stylesheet_path
-    "/assets#{theme_path}/style.css"
+    "#{theme_path}/style.css".gsub(%r{^/}, '')
   end
   def layout_template
 class ScrapNotifier < ActionMailer::Base
   def notification(scrap)
     sender, receiver = scrap.sender, scrap.receiver
+    # for tests
+    return unless receiver.email
+
     @recipient = receiver.name
     @sender = sender.name
     @sender_link = sender.url
@@ -29,7 +29,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
@@ -45,7 +46,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, :display_preview
   acts_as_having_image
@@ -641,6 +642,20 @@ class Article &lt; ActiveRecord::Base
     can_display_hits? && display_hits
   end
+  def display_media_panel?
+    can_display_media_panel? && environment.enabled?('media_panel')
+  end
+
+  def can_display_media_panel?
+    false
+  end
+
+  settings_items :display_preview, :type => :boolean, :default => false
+
+  def display_preview?
+    false
+  end
+
   def image?
     false
   end
@@ -754,9 +769,10 @@ class Article &lt; ActiveRecord::Base
   end
   def body_images_paths
-    require 'uri'
     Nokogiri::HTML.fragment(self.body.to_s).css('img[src]').collect do |i|
-      (self.profile && self.profile.environment) ? URI.join(self.profile.environment.top_url, URI.escape(i['src'])).to_s : i['src']
+      src = i['src']
+      src = URI.escape src if self.new_record? # xss_terminate runs on save
+      (self.profile && self.profile.environment) ? URI.join(self.profile.environment.top_url, src).to_s : src
     end
   end
@@ -81,7 +81,7 @@ class Category &lt; ActiveRecord::Base
   end
   def upcoming_events(limit = 10)
-    self.events.paginate(:conditions => [ 'start_date >= ?', Date.today ], :order => 'start_date', :page => 1, :per_page => limit)
+    self.events.paginate(:conditions => [ 'start_date >= ?', DateTime.now.beginning_of_day ], :order => 'start_date', :page => 1, :per_page => limit)
   end
   def display_in_menu?
@@ -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
@@ -35,4 +35,8 @@ class EnterpriseHomepage &lt; Article
     false
   end
+  def can_display_media_panel?
+    true
+  end
+
 end
@@ -13,7 +13,7 @@ class Environment &lt; ActiveRecord::Base
                   :reports_lower_bound, :noreply_email,
                   :signup_welcome_screen_body, :members_whitelist_enabled,
                   :members_whitelist, :highlighted_news_amount,
-                  :portal_news_amount, :date_format
+                  :portal_news_amount, :date_format, :signup_intro
   has_many :users
@@ -128,6 +128,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'),
@@ -167,7 +168,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
@@ -248,6 +250,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
@@ -282,7 +287,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>'
@@ -23,7 +23,7 @@ class Event &lt; Article
   def initialize(*args)
     super(*args)
-    self.start_date ||= Date.today
+    self.start_date ||= DateTime.now
   end
   validates_presence_of :title, :start_date
@@ -35,7 +35,7 @@ class Event &lt; Article
   end
   scope :by_day, lambda { |date|
-    { :conditions => ['start_date = :date AND end_date IS NULL OR (start_date <= :date AND end_date >= :date)', {:date => date}],
+    { :conditions => [' start_date >= :start_date AND start_date <= :end_date AND end_date IS NULL OR (start_date <= :end_date  AND end_date >= :start_date)', {:start_date => date.beginning_of_day, :end_date => date.end_of_day}],
       :order => 'start_date ASC'
     }
   }
@@ -80,7 +80,7 @@ class Event &lt; Article
   def self.date_range(year, month)
     if year.nil? || month.nil?
-      today = Date.today
+      today = DateTime.now
       year = today.year
       month = today.month
     else
@@ -88,7 +88,7 @@ class Event &lt; Article
       month = month.to_i
     end
-    first_day = Date.new(year, month, 1)
+    first_day = DateTime.new(year, month, 1)
     last_day = first_day + 1.month - 1.day
     first_day..last_day
@@ -114,7 +114,7 @@ class Event &lt; Article
   end
   def duration
-    ((self.end_date || self.start_date) - self.start_date).to_i
+    (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24)
   end
   alias_method :article_lead, :lead
@@ -134,6 +134,10 @@ class Event &lt; Article
     true
   end
+  def can_display_media_panel?
+    true
+  end
+
   include Noosfero::TranslatableContent
   include MaybeAddHttp
 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
@@ -59,6 +59,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?
@@ -94,6 +94,9 @@ roles] }
   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'
@@ -333,8 +336,6 @@ roles] }
     ]
   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
@@ -514,8 +515,8 @@ roles] }
     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
@@ -76,7 +76,8 @@ class PersonNotifier
   class Mailer < ActionMailer::Base
-    add_template_helper(ApplicationHelper)
+    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
@@ -73,10 +78,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'
@@ -90,7 +95,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
@@ -128,16 +133,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
@@ -242,16 +247,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
@@ -268,7 +273,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
@@ -276,4 +281,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
@@ -188,6 +190,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
@@ -613,6 +616,14 @@ class Profile &lt; ActiveRecord::Base
     options.merge(Noosfero.url_options)
   end
+  def top_url(scheme = 'http')
+    url = scheme + '://'
+    url << url_options[:host]
+    url << ':' << url_options[:port].to_s if url_options.key?(:port)
+    url << Noosfero.root('')
+    url
+  end
+
 private :generate_url, :url_options
   def default_hostname
@@ -785,7 +796,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
@@ -1025,9 +1040,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
@@ -1074,6 +1093,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,20 +13,22 @@ 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, lambda {|profile| {:conditions => ["receiver_id = ? OR sender_id = ?", profile, profile], :limit => 30}}
   scope :not_replies, :conditions => {:scrap_id => nil}
-  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target
+  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target, :custom_user => :sender
-  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}
+  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}, :custom_user => :sender
-  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}
+  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}, :custom_user => :sender
-  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
@@ -33,12 +33,16 @@ class TextArticle &lt; Article
   end
   def change_element_path(el, attribute)
-    fullpath = /(https?):\/\/(#{environment.default_hostname})(:\d+)?(\/.*)/.match(el[attribute])
+    fullpath = /(https?):\/\/(#{profile.default_hostname})(:\d+)?(\/.*)/.match(el[attribute])
     if fullpath
       domain = fullpath[2]
       path = fullpath[4]
-      el[attribute] = path if domain == environment.default_hostname
+      el[attribute] = path if domain == profile.default_hostname
     end
   end
+  def display_preview?
+    parent && parent.kind_of?(Blog) && parent.display_preview
+  end
+
 end
@@ -24,6 +24,10 @@ class TextileArticle &lt; TextArticle
     true
   end
+  def can_display_media_panel?
+    true
+  end
+
   protected
   def convert_to_html(textile)
@@ -28,4 +28,8 @@ class TinyMceArticle &lt; TextArticle
     true
   end
+  def can_display_media_panel?
+    true
+  end
+
 end
@@ -163,4 +163,8 @@ class UploadedFile &lt; Article
     true
   end
+  def notifiable?
+    true
+  end
+
 end
@@ -16,6 +16,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
@@ -97,6 +105,10 @@ class User &lt; ActiveRecord::Base
   has_one :person, :dependent => :destroy
   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
@@ -118,11 +130,18 @@ class User &lt; ActiveRecord::Base
   validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('{fn} must be checked in order to signup.').fix_i18n
+  scope :has_login?, lambda { |login,email,environment_id|
+    where('login = ? OR email = ?', login, email).
+    where(environment_id: environment_id)
+  }
+
   # Authenticates a user by their login name or email and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password, environment = nil)
     environment ||= Environment.default
-    u = self.first :conditions => ['(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL',
-                                   login, login, environment.id] # need to get the salt
+
+    u = self.has_login?(login, login, environment.id)
+    u = u.first if u.is_a?(ActiveRecord::Relation)
+
     if u && u.authenticated?(password)
       u.generate_private_token_if_not_exist
       return u
@@ -259,7 +278,23 @@ class User &lt; ActiveRecord::Base
     password.crypt(salt)
   end
+  class UserNotActivated < StandardError
+    attr_reader :user
+
+    def initialize(message, user = nil)
+      @user = user
+
+      super(message)
+    end
+  end
+
   def authenticated?(password)
+
+    unless self.activated?
+      message = _('The user "%{login}" is not activated! Please check your email to activate your user') % {login: self.login}
+      raise UserNotActivated.new(message, self)
+    end
+
     result = (crypted_password == encrypt(password))
     if (encryption_method != User.system_encryption_method) && result
       self.password_type = User.system_encryption_method.to_s
@@ -276,8 +311,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
@@ -297,9 +333,15 @@ class User &lt; ActiveRecord::Base
   #   current password.
   # * Saves the record unless it is a new one.
   def change_password!(current, new, confirmation)
-    unless self.authenticated?(current)
-      self.errors.add(:current_password, _('does not match.'))
-      raise IncorrectPassword
+
+    begin
+      unless self.authenticated?(current)
+        self.errors.add(:current_password, _('does not match.'))
+        raise IncorrectPassword
+      end
+    rescue UserNotActivated => e
+      self.errors.add(:current_password, e.message)
+      raise UserNotActivated
     end
     self.force_change_password!(new, confirmation)
   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, class: 'join-community' %>
       <% 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)%>
@@ -8,9 +8,8 @@
 <%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
-<%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %>
+<%= date_range_field('article[start_date]', 'article[end_date]', @article.start_date, @article.end_date, _('%Y-%m-%d %H:%M'), {:time => true}, {:id => 'article_start_date'} ) %>
-<%= labelled_form_field(_('End date'), pick_date(:article, :end_date)) %>
 <%= labelled_form_field(_('Event website:'), text_field(:article, :link)) %>
 <%= error_messages_for 'article' %>
-<% show_media_panel = environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
-
-<div class='<%= (show_media_panel ? 'with_media_panel' : 'no_media_panel') %>'>
+<div class='<%= (@article.display_media_panel? ? 'with_media_panel' : 'no_media_panel') %>'>
 <%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
   <%= hidden_field_tag("type", @type) if @type %>
-  <%= hidden_field_tag('parent_id', @parent_id) if @parent_id %>
-
   <%= hidden_field_tag('back_to', @back_to) %>
   <%= hidden_field_tag('success_back_to', @success_back_to) %>
@@ -68,7 +64,7 @@
 <% end %>
 </div>
-<% if show_media_panel %>
+<% if @article.display_media_panel? %>
   <%= render :partial => 'text_editor_sidebar' %>
 <% end %>
@@ -7,7 +7,7 @@
     <% end %>
   </h1>
   <%= render :partial => "publishing_info" %>
-  <% unless @page.abstract.blank? %>
+  <% if @page.display_preview? %>
     <div class="preview">
       <%= @page.lead %>
     </div>
@@ -29,10 +29,10 @@
         <%= expirable_button @page, :locale, content, url %>
       <% end %>
-      <%= modal_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new, @page) %>
+      <%= modal_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:new, @page) %>
       <% content = content_tag('span', label_for_clone_article(@page)) %>
-      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true, :type => @page.class }) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true,  :parent_id => (@page.folder? ? @page : @page.parent), :type => @page.class}) %>
       <%= expirable_button @page, :clone, content, url %>
     <% end %>
@@ -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) %>
 <span class="publishing-info">
   <span class="date">
-    <%= show_date(@page.published_at) %>
+    <%= show_time(@page.published_at) %>
   </span>
   <span class="author">
     <%= _(", by %s") % (@page.author ? link_to(@page.author_name, @page.author_url) : @page.author_name) %>
@@ -2,7 +2,7 @@
   <%= link_to '',
         uploaded_file.view_url,
         :class => 'image',
-        :style => 'background-image: url(%s)'% uploaded_file.public_filename(:thumb)
+        :style => 'background-image: url(%s)'% [Noosfero.root, uploaded_file.public_filename(:thumb)].join
   %>
   <span><%=h uploaded_file.title %></span>
 <% else %>
@@ -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>
@@ -4,8 +4,5 @@
   </div>
 <% end %>
-<% if folder.children.empty? %>
-  <em><%= _('(empty folder)') %></em>
-<% else %>
-  <%= list_contents(:contents=>folder.children) %>
-<% 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>
-
@@ -126,7 +126,7 @@ module Noosfero
     # Make sure the secret is at least 30 characters and all random,
     # no regular words or you'll be exposed to dictionary attacks.
     config.secret_token = noosfero_session_secret
-    config.session_store :cookie_store, :key => '_noosfero_session'
+    config.session_store :active_record_store, key: '_noosfero_session'
     config.paths['db/migrate'] += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/db/migrate"
     config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/locales/*.{rb,yml}"
@@ -2,67 +2,51 @@ require &#39;noosfero/i18n&#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
+
@@ -57,37 +57,37 @@ Noosfero::Application.routes.draw do
   match 'search(/:action(/*category_path))', :controller => 'search'
   # events
-  match 'profile/:profile/events_by_day', :controller => 'events', :action => 'events_by_day', :profile => /#{Noosfero.identifier_format_in_url}/
-  match 'profile/:profile/events_by_month', :controller => 'events', :action => 'events_by_month', :profile => /#{Noosfero.identifier_format_in_url}/
-  match 'profile/:profile/events/:year/:month/:day', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :day => /\d*/, :profile => /#{Noosfero.identifier_format_in_url}/
-  match 'profile/:profile/events/:year/:month', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :profile => /#{Noosfero.identifier_format_in_url}/
-  match 'profile/:profile/events', :controller => 'events', :action => 'events', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/events_by_day', :controller => 'events', :action => 'events_by_day', :profile => /#{Noosfero.identifier_format_in_url}/i
+  match 'profile/:profile/events_by_month', :controller => 'events', :action => 'events_by_month', :profile => /#{Noosfero.identifier_format_in_url}/i
+  match 'profile/:profile/events/:year/:month/:day', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :day => /\d*/, :profile => /#{Noosfero.identifier_format_in_url}/i
+  match 'profile/:profile/events/:year/:month', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :profile => /#{Noosfero.identifier_format_in_url}/i
+  match 'profile/:profile/events', :controller => 'events', :action => 'events', :profile => /#{Noosfero.identifier_format_in_url}/i
   # catalog
-  match 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/, :as => :catalog
+  match 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/i, :as => :catalog
   # invite
-  match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => /#{Noosfero.identifier_format_in_url}/
-  match 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => /#{Noosfero.identifier_format_in_url}/i
+  match 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format_in_url}/i
   # feeds per tag
-  match 'profile/:profile/tags/:id/feed', :controller => 'profile', :action =>'tag_feed', :id => /.+/, :profile => /#{Noosfero.identifier_format_in_url}/, :as => :tag_feed
+  match 'profile/:profile/tags/:id/feed', :controller => 'profile', :action =>'tag_feed', :id => /.+/, :profile => /#{Noosfero.identifier_format_in_url}/i, :as => :tag_feed
   # profile tags
-  match 'profile/:profile/tags/:id', :controller => 'profile', :action => 'content_tagged', :id => /.+/, :profile => /#{Noosfero.identifier_format_in_url}/
-  match 'profile/:profile/tags(/:id)', :controller => 'profile', :action => 'tags', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/tags/:id', :controller => 'profile', :action => 'content_tagged', :id => /.+/, :profile => /#{Noosfero.identifier_format_in_url}/i
+  match 'profile/:profile/tags(/:id)', :controller => 'profile', :action => 'tags', :profile => /#{Noosfero.identifier_format_in_url}/i
   # profile search
-  match 'profile/:profile/search', :controller => 'profile_search', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/search', :controller => 'profile_search', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/i
   # comments
-  match 'profile/:profile/comment/:action/:id', :controller => 'comment', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/comment/:action/:id', :controller => 'comment', :profile => /#{Noosfero.identifier_format_in_url}/i
   # public profile information
-  match 'profile/:profile(/:action(/:id))', :controller => 'profile', :action => 'index', :id => /[^\/]*/, :profile => /#{Noosfero.identifier_format_in_url}/, :as => :profile
+  match 'profile/:profile(/:action(/:id))', :controller => 'profile', :action => 'index', :id => /[^\/]*/, :profile => /#{Noosfero.identifier_format_in_url}/i, :as => :profile
   # contact
-  match 'contact/:profile/:action(/:id)', :controller => 'contact', :action => 'index', :id => /.*/, :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'contact/:profile/:action(/:id)', :controller => 'contact', :action => 'index', :id => /.*/, :profile => /#{Noosfero.identifier_format_in_url}/i
   # map balloon
   match 'map_balloon/:action/:id', :controller => 'map_balloon', :id => /.*/
@@ -99,8 +99,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}/
-  match 'myprofile/:profile/:controller(/:action(/:id))', :controller => Noosfero.pattern_for_controllers_in_directory('my_profile'), :profile => /#{Noosfero.identifier_format_in_url}/, :as => :myprofile
+  match 'myprofile/:profile', :controller => 'profile_editor', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/i
+  match 'myprofile/:profile/:controller(/:action(/:id))', :controller => Noosfero.pattern_for_controllers_in_directory('my_profile'), :profile => /#{Noosfero.identifier_format_in_url}/i, :as => :myprofile
   ######################################################
@@ -128,14 +128,14 @@ Noosfero::Application.routes.draw do
   # cache stuff - hack
   match 'public/:action/:id', :controller => 'public'
-  match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format_in_url}/, :constraints => EnvironmentDomainConstraint.new
+  match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format_in_url}/i, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions', :controller => 'content_viewer', :action => 'article_versions'
-  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format_in_url}/, :constraints => EnvironmentDomainConstraint.new
+  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format_in_url}/i, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff'
   # 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
+  match ':profile(/*page)', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format_in_url}/i, :constraints => EnvironmentDomainConstraint.new
   # match requests for content in domains hosted for profiles
   match '/(*page)', :controller => 'content_viewer', :action => 'view_page'
@@ -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
@@ -0,0 +1,27 @@
+class ChangeArticleDateToDatetime < ActiveRecord::Migration
+
+  def up
+    change_table :articles do |t|
+      t.change :start_date, :datetime
+      t.change :end_date, :datetime
+    end
+
+    change_table :article_versions do |t|
+      t.change :start_date, :datetime
+      t.change :end_date, :datetime
+    end
+  end
+
+  def down
+    change_table :articles do |t|
+      t.change :start_date, :date
+      t.change :end_date, :date
+    end
+
+    change_table :article_versions do |t|
+      t.change :start_date, :date
+      t.change :end_date, :date
+    end
+  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 => 20150722042714) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -75,8 +75,8 @@ ActiveRecord::Schema.define(:version =&gt; 20150603182105) do
     t.integer  "comments_count"
     t.boolean  "advertise",            :default => true
     t.boolean  "published",            :default => true
-    t.date     "start_date"
-    t.date     "end_date"
+    t.datetime "start_date"
+    t.datetime "end_date"
     t.integer  "children_count",       :default => 0
     t.boolean  "accept_comments",      :default => true
     t.integer  "reference_article_id"
@@ -127,8 +127,8 @@ ActiveRecord::Schema.define(:version =&gt; 20150603182105) do
     t.integer  "comments_count",       :default => 0
     t.boolean  "advertise",            :default => true
     t.boolean  "published",            :default => true
-    t.date     "start_date"
-    t.date     "end_date"
+    t.datetime "start_date"
+    t.datetime "end_date"
     t.integer  "children_count",       :default => 0
     t.boolean  "accept_comments",      :default => true
     t.integer  "reference_article_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
@@ -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"
@@ -223,7 +223,7 @@ Feature: events
       | owner     | name         | start_date | end_date   |
       | josesilva | WikiSym 2009 | 2009-10-25 | 2009-10-27 |
     When I am on /profile/josesilva/events/2009/10/26
-    Then I should see "October 25, 2009 to October 27, 2009"
+    Then I should see "October 25, 2009 0:00 to October 27, 2009 0:00"
   Scenario: show place of the event
     Given I am on /profile/josesilva/events/2009/10
@@ -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"
@@ -41,7 +41,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
@@ -51,5 +51,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,15 +19,15 @@ 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}/
+        match "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}(/:action(/:id))", controller: controller, profile: /#{Noosfero.identifier_format_in_url}/i
       else
-        match "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}(/:action(/:id))", :controller => controller
+        match "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}(/:action(/:id))", controller: controller
       end
     end
   end
-  match 'plugin/' + plugin_name + '(/:action(/:id))', :controller => plugin_name + '_plugin'
-  match 'profile/:profile/plugin/' + plugin_name + '(/:action(/:id))', :controller => plugin_name + '_plugin_profile', :profile => /#{Noosfero.identifier_format}/
-  match 'myprofile/:profile/plugin/' + plugin_name + '(/:action(/:id))', :controller => plugin_name + '_plugin_myprofile', :profile => /#{Noosfero.identifier_format}/
-  match 'admin/plugin/' + plugin_name + '(/:action(/:id))', :controller => plugin_name + '_plugin_admin'
+  match 'plugin/' + plugin_name + '(/:action(/:id))', controller: plugin_name + '_plugin'
+  match 'profile/:profile/plugin/' + plugin_name + '(/:action(/:id))', controller: plugin_name + '_plugin_profile', profile: /#{Noosfero.identifier_format_in_url}/i
+  match 'myprofile/:profile/plugin/' + plugin_name + '(/:action(/:id))', controller: plugin_name + '_plugin_myprofile', profile: /#{Noosfero.identifier_format_in_url}/i
+  match 'admin/plugin/' + plugin_name + '(/:action(/:id))', controller: plugin_name + '_plugin_admin'
 end
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.2~rc2'
+  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|
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
	@@ -903,7 +903,7 @@ module ApplicationHelper		@@ -903,7 +903,7 @@ module ApplicationHelper
903	end	903	end
904		904
905	def base_url	905	def base_url
906	- environment.top_url(request.scheme)	906	+ profile ? profile.top_url(request.scheme) : environment.top_url(request.scheme)
907	end	907	end
908	alias :top_url :base_url	908	alias :top_url :base_url
909		909
	@@ -88,7 +88,7 @@ module ArticleHelper		@@ -88,7 +88,7 @@ module ArticleHelper
88	content_tag( 'small', _('Who will be able to create new topics on this forum?')) +	88	content_tag( 'small', _('Who will be able to create new topics on this forum?')) +
89	content_tag('div', '', slider_options) +	89	content_tag('div', '', slider_options) +
90	hidden_field_tag('article[topic_creation]', article.topic_creation) +	90	hidden_field_tag('article[topic_creation]', article.topic_creation) +
91	- javascript_include_tag('topic-creation-config')	91	+ javascript_include_tag("#{Noosfero.root}/assets/topic-creation-config.js")
92	end	92	end
93		93
94	def privacity_exceptions(article, tokenized_children)	94	def privacity_exceptions(article, tokenized_children)
	@@ -51,7 +51,7 @@ module ContentViewerHelper		@@ -51,7 +51,7 @@ module ContentViewerHelper
51	elsif date_format == 'past_time'	51	elsif date_format == 'past_time'
52	left_time = true	52	left_time = true
53	end	53	end
54	- content_tag('span', show_date(article.published_at, use_numbers , year, left_time), :class => 'date')	54	+ content_tag('span', show_time(article.published_at, use_numbers , year, left_time), :class => 'date')
55	end	55	end
56		56
57	def link_to_comments(article, args = {})	57	def link_to_comments(article, args = {})
	@@ -16,7 +16,7 @@ module EventsHelper		@@ -16,7 +16,7 @@ module EventsHelper
16		16
17	content_tag( 'tr',	17	content_tag( 'tr',
18	content_tag('td',	18	content_tag('td',
19	- content_tag('div', show_date(article.start_date) + ( article.end_date.nil? ? '' : (_(" to ") + show_date(article.end_date))),:class => 'event-date' ) +	19	+ content_tag('div', show_time(article.start_date) + ( article.end_date.nil? ? '' : (_(" to ") + show_time(article.end_date))),:class => 'event-date' ) +
20	content_tag('div',link_to(article.name,article.url),:class => 'event-title') +	20	content_tag('div',link_to(article.name,article.url),:class => 'event-title') +
21	content_tag('div',(article.address.nil? or article.address == '') ? '' : (_('Place: ') + article.address),:class => 'event-place')	21	content_tag('div',(article.address.nil? or article.address == '') ? '' : (_('Place: ') + article.address),:class => 'event-place')
22	)	22	)
	@@ -30,7 +30,7 @@ module EventsHelper		@@ -30,7 +30,7 @@ module EventsHelper
30	# the day itself	30	# the day itself
31	date,	31	date,
32	# is there any events in this date?	32	# is there any events in this date?
33	- events.any? {\|event\| event.date_range.include?(date)},	33	+ events.any? {\|event\| event.date_range.cover?(date)},
34	# is this date in the current month?	34	# is this date in the current month?
35	true	35	true
36	]	36	]
	@@ -151,7 +151,7 @@ module FormsHelper		@@ -151,7 +151,7 @@ module FormsHelper
151	datepicker_options[:close_text] \|\|= _('Done')	151	datepicker_options[:close_text] \|\|= _('Done')
152	datepicker_options[:constrain_input] \|\|= true	152	datepicker_options[:constrain_input] \|\|= true
153	datepicker_options[:current_text] \|\|= _('Today')	153	datepicker_options[:current_text] \|\|= _('Today')
154	- datepicker_options[:date_format] \|\|= 'mm/dd/yy'	154	+ datepicker_options[:date_format] \|\|= 'yy/mm/dd'
155	datepicker_options[:day_names] \|\|= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]	155	datepicker_options[:day_names] \|\|= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
156	datepicker_options[:day_names_min] \|\|= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]	156	datepicker_options[:day_names_min] \|\|= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
157	datepicker_options[:day_names_short] \|\|= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]	157	datepicker_options[:day_names_short] \|\|= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
	@@ -236,7 +236,7 @@ module FormsHelper		@@ -236,7 +236,7 @@ module FormsHelper
236	weekHeader: #{datepicker_options[:week_header].to_json},	236	weekHeader: #{datepicker_options[:week_header].to_json},
237	yearRange: #{datepicker_options[:year_range].to_json},	237	yearRange: #{datepicker_options[:year_range].to_json},
238	yearSuffix: #{datepicker_options[:year_suffix].to_json}	238	yearSuffix: #{datepicker_options[:year_suffix].to_json}
239	- })	239	+ }).datepicker('setDate', new Date('#{value}'))
240	</script>	240	</script>
241	".html_safe	241	".html_safe
242	result	242	result
	@@ -81,7 +81,7 @@ class Category < ActiveRecord::Base		@@ -81,7 +81,7 @@ class Category < ActiveRecord::Base
81	end	81	end
82		82
83	def upcoming_events(limit = 10)	83	def upcoming_events(limit = 10)
84	- self.events.paginate(:conditions => [ 'start_date >= ?', Date.today ], :order => 'start_date', :page => 1, :per_page => limit)	84	+ self.events.paginate(:conditions => [ 'start_date >= ?', DateTime.now.beginning_of_day ], :order => 'start_date', :page => 1, :per_page => limit)
85	end	85	end
86		86
87	def display_in_menu?	87	def display_in_menu?
	@@ -35,4 +35,8 @@ class EnterpriseHomepage < Article		@@ -35,4 +35,8 @@ class EnterpriseHomepage < Article
35	false	35	false
36	end	36	end
37		37
		38	+ def can_display_media_panel?
		39	+ true
		40	+ end
		41	+
38	end	42	end