Merge branch 'master' into stoa

Conflicts: app/controllers/my_profile/cms_controller.rb db/schema.rb

Merge branch 'master' into stoa
Conflicts: app/controllers/my_profile/cms_controller.rb db/schema.rb
Rodrigo Souto
2 parents 6ccbcfa6 176bce4b
Showing 402 changed files with 8248 additions and 14676 deletions Show diff stats
.ackrc
AUTHORS
AUTHORS.md
Gemfile
Gemfile.lock
Rakefile
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/catalog_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/block_helper.rb
app/helpers/blog_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/folder_helper.rb
app/models/article.rb
app/models/block.rb
app/models/comment.rb
@@ -0,0 +1,3 @@
+--ignore-dir=log
+--ignore-dir=tmp
+--ignore-dir=pkg
@@ -1,250 +0,0 @@
-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
-noosfero, that's not a problem).
-
-Developers
-==========
-
-Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
-Alan Freihof Tygel <alantygel@gmail.com>
-alcampelo <alcampelo@alcampelo.(none)>
-Alessandro Palmeira <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
-Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
-Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
-Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@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 Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@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 + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
-Ana Losnak <analosnak@gmail.com>
-Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
-Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
-Antonio Terceiro <terceiro@colivre.coop.br>
-Arthur Del Esposte <arthurmde@gmail.com>
-Arthur Del Esposte <arthurmde@yahoo.com.br>
-Aurelio A. Heckert <aurelio@colivre.coop.br>
-Braulio Bhavamitra <brauliobo@gmail.com>
-Bráulio Bhavamitra <brauliobo@gmail.com>
-Braulio Bhavamitra <braulio@eita.org.br>
-Caio <caio.csalgado@gmail.com>
-Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
-Caio Formiga <caio.formiga@gmail.com>
-Caio, Pedro <caio.csalgado@gmail.com>
-Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
-Caio Salgado <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 <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo <diegoamc90@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 + 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 <caio.csalgado@gmail.com>
-Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
-Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
-Caio SBA <caio@colivre.coop.br>
-Caio Tiago Oliveira <caiotiago@colivre.coop.br>
-Carlos Andre de Souza <carlos.andre.souza@msn.com>
-Carlos Morais <carlos88morais@gmail.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>
-Daniela Feitosa <dani@dohko.(none)>
-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 + Guilherme Rojas <danpaulalves@gmail.com>
-Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
-Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
-Daniel Bucher <daniel.bucher88@gmail.com>
-Daniel Cunha <daniel@colivre.coop.br>
-David Carlos <ddavidcarlos1392@gmail.com>
-diegoamc <diegoamc90@gmail.com>
-Diego Araújo + Alessandro Palmeira <diegoamc90@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 Araujo + Caio Salgado <diegoamc90@gmail.com>
-Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
-Diego Araújo <diegoamc90@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 Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Diego Araújo + João Machini <diegoamc90@gmail.com>
-Diego Araújo + João Machini <digoamc90@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 <diegoamc90@gmail.com>
-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 + Paulo Meirelles <diegoamc90@gmail.com>
-Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Diego Araujo + Rafael Manzo <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 Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
-Diego + Jefferson <diegoamc90@gmail.com>
-Diego Martinez <diegoamc90@gmail.com>
-Diego Martinez <diego@diego-K55A.(none)>
-Diego + Renan <renanteruoc@gmail.com>
-Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
-Evandro Jr <evandrojr@gmail.com>
-Evandro Junior <evandrojr@gmail.com>
-Fabio Teixeira <fabio1079@gmail.com>
-Fernanda Lopes <nanda.listas+psl@gmail.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>
-Grazieno Pellegrino <grazieno@gmail.com>
-Gust <darksshades@hotmail.com>
-Hugo Melo <hugo@riseup.net>
-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. da Silva <jeffs.fernandes@gmail.com>
-Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
-João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
-João da Silva <jaodsilv@linux.ime.usp.br>
-João Marco Maciel da Silva + Rafael Manzo + 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>
-Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira <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 + 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 <diegoamc90@gmail.com>
-João M. M. da Silva + Diego Araújo <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 <jaodsilv@linux.ime.usp.br>
-Joao M. M. da Silva + Jefferson Fernandes <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. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
-Joao M. M. Silva + Jefferson Fernandes <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>
-Joenio Costa <joenio@colivre.coop.br>
-Josef Spillner <josef.spillner@tu-dresden.de>
-Junior Silva <junior@bajor.localhost.localdomain>
-Junior Silva <juniorsilva1001@gmail.com>
-Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
-Junior Silva <juniorsilva@colivre.coop.br>
-juniorsilva <juniorsilva@QonoS.localhost.localdomain>
-Keilla Menezes <keilla@colivre.coop.br>
-Larissa Reis <larissa@colivre.coop.br>
-Larissa Reis <reiss.larissa@gmail.com>
-Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
-Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
-Leandro Nunes dos Santos <leandronunes@gmail.com>
-Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
-LinguÁgil 2010 <linguagil.bahia@gmail.com>
-Lucas Melo <lucas@colivre.coop.br>
-Lucas Melo <lucaspradomelo@gmail.com>
-Luciano <lucianopcbr@gmail.com>
-Luis David Aguilar Carlos <ludwig9003@gmail.com>
-Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
-Marcos Ramos <ms.ramos@outlook.com>
-Martín Olivera <molivera@solar.org.ar>
-Moises Machado <moises@colivre.coop.br>
-Naíla Alves <naila@colivre.coop.br>
-Nanda Lopes <nanda.listas+psl@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 <paulo@softwarelivre.org>
-Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
-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 Lira <raquel.lira@gmail.com>
-Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
-Renan Teruoc + Diego Araujo <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>
-Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
-Rodrigo Souto <diguliu@gmail.com>
-Rodrigo Souto <rodrigo@colivre.coop.br>
-Ronny Kursawe <kursawe.ronny@googlemail.com>
-root <root@debian.sdr.serpro>
-Samuel R. C. Vale <srcvale@holoscopio.com>
-Valessio Brito <contato@valessiobrito.com.br>
-Valessio Brito <contato@valessiobrito.info>
-Valessio Brito <valessio@gmail.com>
-vfcosta <vfcosta@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)>
-Yann Lugrin <yann.lugrin@liquid-concept.ch>
-
-Ideas, specifications and incentive
-===================================
-Daniel Tygel <dtygel@fbes.org.br>
-Guilherme Rocha <guilherme@gf7.com.br>
-Raphael Rousseau <raph@r4f.org>
-Théo Bondolfi <move@cooperation.net>
-Vicente Aguiar <vicenteaguiar@colivre.coop.br>
-
-Arts
-===================================
-Nara Oliveira <narananet@gmail.com>
-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 noosfero, that's not a problem).
+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
+noosfero, that's not a problem).
 Developers
 ==========
+Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
 Alan Freihof Tygel <alantygel@gmail.com>
+alcampelo <alcampelo@alcampelo.(none)>
 Alessandro Palmeira <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
@@ -35,9 +40,12 @@ Alessandro Palmeira + João M. M. Silva &lt;alessandro.palmeira@gmail.com&gt;
 Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
+Ana Losnak <analosnak@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
+Arthur Del Esposte <arthurmde@gmail.com>
+Arthur Del Esposte <arthurmde@yahoo.com.br>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
@@ -65,11 +73,14 @@ Caio Salgado + Renan Teruo &lt;caio.salgado@gmail.com&gt;
 Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
 Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
 Caio SBA <caio@colivre.coop.br>
+Caio Tiago Oliveira <caiotiago@colivre.coop.br>
+Carlos Andre de Souza <carlos.andre.souza@msn.com>
 Carlos Morais <carlos88morais@gmail.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>
+Daniela Feitosa <dani@dohko.(none)>
 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>
@@ -78,7 +89,9 @@ Daniel Alves + Diego Araújo + Guilherme Rojas &lt;guilhermehrojas@gmail.com&gt;
 Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
 Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
+Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
+David Carlos <ddavidcarlos1392@gmail.com>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
@@ -107,15 +120,25 @@ Diego + Jefferson &lt;diegoamc90@gmail.com&gt;
 Diego Martinez <diegoamc90@gmail.com>
 Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@gmail.com>
+Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
+Evandro Jr <evandrojr@gmail.com>
+Evandro Junior <evandrojr@gmail.com>
+Fabio Teixeira <fabio1079@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.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>
 Grazieno Pellegrino <grazieno@gmail.com>
+Gust <darksshades@hotmail.com>
+Hugo Melo <hugo@riseup.net>
 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. da Silva <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
+João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
 João da Silva <jaodsilv@linux.ime.usp.br>
 João Marco Maciel da Silva + Rafael Manzo + 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>
@@ -146,17 +169,29 @@ João M. M. Silva + Rafael Manzo &lt;jaodsilv@linux.ime.usp.br&gt;
 João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
+Jose Pedro <1jpsneto@gmail.com>
+Junior Silva <junior@bajor.localhost.localdomain>
+Junior Silva <junior@sedeantigo.colivre.coop.br>
 Junior Silva <juniorsilva1001@gmail.com>
 Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
+Junior Silva <juniorsilva@colivre.coop.br>
+juniorsilva <juniorsilva@QonoS.localhost.localdomain>
 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.Home>
+Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
 Leandro Nunes dos Santos <leandronunes@gmail.com>
 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
 Lucas Melo <lucas@colivre.coop.br>
 Lucas Melo <lucaspradomelo@gmail.com>
+Luciano <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>
+Marcos Ramos <ms.ramos@outlook.com>
 Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
 Naíla Alves <naila@colivre.coop.br>
@@ -189,14 +224,19 @@ Renan Teruo + Diego Araujo &lt;renanteruoc@gmail.com&gt;
 Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
 Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
 Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
+Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
 Rodrigo Souto <diguliu@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
+Valessio Brito <contato@valessiobrito.com.br>
+Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
 vfcosta <vfcosta@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)>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
@@ -15,6 +15,8 @@ gem &#39;thin&#39;
 gem 'hpricot'
 gem 'nokogiri'
 gem 'rake', :require => false
+gem 'rest-client'
+gem 'exception_notification'
 gem 'whenever', :require => false
@@ -32,7 +34,6 @@ group :test do
 end
 group :cucumber do
-  gem 'rake'
   gem 'cucumber-rails', :require => false
   gem 'capybara'
   gem 'cucumber'
@@ -62,7 +62,10 @@ GEM
     database_cleaner (1.2.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (0.12.11)
+    eventmachine (0.12.10)
+    exception_notification (4.0.1)
+      actionmailer (>= 3.0.4)
+      activesupport (>= 3.0.4)
     fast_gettext (0.6.8)
     ffi (1.0.11)
     gherkin (2.4.21)
@@ -112,6 +115,8 @@ GEM
       thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.9.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rmagick (2.13.1)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
@@ -169,6 +174,7 @@ DEPENDENCIES
   daemons
   dalli
   database_cleaner
+  exception_notification
   fast_gettext
   hpricot
   mocha
@@ -179,6 +185,7 @@ DEPENDENCIES
   rails
   rails_autolink
   rake
+  rest-client
   rmagick
   rspec
   rspec-rails
 #!/usr/bin/env rake
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
@@ -146,6 +146,7 @@ class CmsController &lt; MyProfileController
     end
     @article.profile = profile
+    @article.author = user
     @article.last_changed_by = user
     @article.created_by = user
@@ -194,7 +195,18 @@ class CmsController &lt; MyProfileController
     end
     if request.post? && params[:uploaded_files]
       params[:uploaded_files].each do |file|
-        @uploaded_files << UploadedFile.create({:uploaded_data => file, :profile => profile, :parent => @parent, :last_changed_by => user}, :without_protection => true) unless file == ''
+        unless file == ''
+          @uploaded_files << UploadedFile.create(
+            {
+              :uploaded_data => file,
+              :profile => profile,
+              :parent => @parent,
+              :last_changed_by => user,
+              :author => user,
+            },
+            :without_protection => true
+          )
+        end
       end
       @errors = @uploaded_files.select { |f| f.errors.any? }
       if @errors.any?
@@ -277,6 +289,9 @@ class CmsController &lt; MyProfileController
       article_name = params[:name]
       params_marked = params['q'].split(',').select { |marked| user.memberships.map(&:id).include? marked.to_i }
       @marked_groups = Profile.find(params_marked)
+      if @marked_groups.empty?
+        return session[:notice] = _("Select some group to publish your article")
+      end
       @marked_groups.each do |item|
         task = ApproveArticle.create!(:article => @article, :name => article_name, :target => item, :requestor => user)
         begin
@@ -12,7 +12,7 @@ class FriendsController &lt; MyProfileController
   def remove
     @friend = profile.friends.find(params[:id])
     if request.post? && params[:confirmation]
-      profile.remove_friend(@friend)
+      Friendship.remove_friendship(profile, @friend)
       redirect_to :action => 'index'
     end
   end
@@ -2,7 +2,7 @@ class AccountController &lt; ApplicationController
   no_design_blocks
-  before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
+  before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise, :change_password]
   before_filter :redirect_if_logged_in, :only => [:login, :signup]
   before_filter :protect_from_bots, :only => :signup
@@ -11,7 +11,7 @@ class CatalogController &lt; PublicController
   protected
   def check_enterprise_and_environment
-    unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')
+    unless profile.enterprise? && @profile.environment.enabled?('products_for_enterprises')
       redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
     end
   end
@@ -31,8 +31,8 @@ class ContentViewerController &lt; ApplicationController
     if request.post? && @page.forum?
       process_forum_terms_of_use(user, params[:terms_accepted])
-    elsif is_a_forum_topic?(@page)
-      redirect_to @page.parent.url unless @page.parent.agrees_with_terms?(user)
+    elsif is_a_forum_topic?(@page) && !@page.parent.agrees_with_terms?(user)
+      redirect_to @page.parent.url
       return
     end
@@ -74,7 +74,7 @@ class ContentViewerController &lt; ApplicationController
   end
   def versions_diff
-    path = params[:page].join('/')
+    path = params[:page]
     @page = profile.articles.find_by_path(path)
     @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
   end
@@ -216,6 +216,8 @@ class ContentViewerController &lt; ApplicationController
     if @page.has_posts?
       posts = get_posts(params[:year], params[:month])
+      posts = posts.includes(:parent, {:profile => [:domains, :environment]}, :author)
+
       #FIXME Need to run this before the pagination because this version of
       #      will_paginate returns a will_paginate collection instead of a
       #      relation.
@@ -51,7 +51,7 @@ class ProfileController &lt; PublicController
   def communities
     if is_cache_expired?(profile.communities_cache_key(params))
-      @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
+      @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.communities.count)
     end
   end
@@ -202,7 +202,8 @@ class ProfileController &lt; PublicController
   end
   def more_comments
-    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity], :user_id => @profile})
+    profile_filter = @profile.person? ? {:user_id => @profile} : {:target_id => @profile}
+    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity]}.merge(profile_filter))
     comments_count = activity.comments.count
     comment_page = (params[:comment_page] || 1).to_i
     comments_per_page = 5
@@ -312,13 +312,13 @@ module ApplicationHelper
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
   end
-  def view_for_profile_actions(klass)
-    raise ArgumentError, 'No profile actions view for this class.' if klass.nil?
-
-    name = klass.name.underscore
-    return "blocks/profile_info_actions/" + name + '.html.erb' if File.exists?(Rails.root.join('app', 'views', 'blocks', 'profile_info_actions', name + '.html.erb'))
-
-    view_for_profile_actions(klass.superclass)
+  def render_profile_actions klass
+    name = klass.to_s.underscore
+    begin
+      render "blocks/profile_info_actions/#{name}"
+    rescue ActionView::MissingTemplate
+      render_profile_actions klass.superclass
+    end
   end
   def user
@@ -671,7 +671,7 @@ module ApplicationHelper
   def theme_javascript_ng
     script = File.join(theme_path, 'theme.js')
-    if File.join(Rails.root, 'public', script)
+    if File.exists?(File.join(Rails.root, 'public', script))
       javascript_include_tag script
     else
       nil
@@ -1095,7 +1095,7 @@ module ApplicationHelper
     result
   end
-  def manage_link(list, kind)
+  def manage_link(list, kind, title)
     if list.present?
       link_to_all = nil
       if list.count > 5
@@ -1108,19 +1108,19 @@ module ApplicationHelper
       if link_to_all
         link << link_to_all
       end
-      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s}
+      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s, :title => title}
     end
   end
   def manage_enterprises
     return '' unless user && user.environment.enabled?(:display_my_enterprises_on_user_menu)
-    manage_link(user.enterprises, :enterprises).to_s
+    manage_link(user.enterprises, :enterprises, _('My enterprises')).to_s
   end
   def manage_communities
     return '' unless user && user.environment.enabled?(:display_my_communities_on_user_menu)
     administered_communities = user.communities.more_popular.select {|c| c.admins.include? user}
-    manage_link(administered_communities, :communities).to_s
+    manage_link(administered_communities, :communities, _('My communities')).to_s
   end
   def admin_link
@@ -1223,22 +1223,9 @@ module ApplicationHelper
   end
   def add_zoom_to_images
-    stylesheet_link_tag('fancybox') +
-    javascript_include_tag('jquery.fancybox-1.3.4.pack') +
-    javascript_tag("jQuery(function($) {
-      $(window).load( function() {
-        $('#article .article-body img').each( function(index) {
-          var original = original_image_dimensions($(this).attr('src'));
-          if ($(this).width() < original['width'] || $(this).height() < original['height']) {
-            $(this).wrap('<div class=\"zoomable-image\" />');
-            $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
-            $(this).attr('style', '');
-            $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
-          }
-        });
-        $('.zoomify-image').fancybox();
-      });
-    });" % _('Zoom in'))
+    stylesheet_link_tag('jquery.fancybox') +
+    javascript_include_tag('jquery.fancybox.pack') +
+    javascript_tag("apply_zoom_to_images(#{_('Zoom in').to_json})")
   end
   def render_dialog_error_messages(instance_name)
@@ -1373,7 +1360,7 @@ module ApplicationHelper
       @message = _("The content here is available to %s's friends only.") % profile.short_name
     else
       @action = :join
-      @message = _('The contents in this community is available to members only.')
+      @message = _('The contents in this profile is available to members only.')
     end
     @no_design_blocks = true
   end
@@ -6,19 +6,20 @@ module BlockHelper
     content_tag 'h3', content_tag('span', h(title)), :class => tag_class
   end
-  def highlights_block_config_image_fields(block, image={})
+  def highlights_block_config_image_fields(block, image={}, row_number=nil)
     "
-    <tr class=\"image-data-line\">
+    <tr class=\"image-data-line\" data-row-number='#{row_number}'>
       <td>
         #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
       </td>
       <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
       <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
-    </tr><tr class=\"image-title\">
+    </tr><tr class=\"image-title\" data-row-number='#{row_number}'>
       <td colspan=\"3\"><label>#{
         content_tag('span', _('Title')) +
         text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
       }</label></td>
+      <td>#{link_to '', '#', :class=>'button icon-button icon-delete delete-highlight', :confirm=>_('Are you sure you want to remove this highlight')}</td>
     </tr>
     "
   end
@@ -17,13 +17,13 @@ module BlogHelper
     _('Configure blog')
   end
-  def list_posts(articles, format = 'full')
+  def list_posts(articles, format = 'full', paginate = true)
     pagination = will_paginate(articles, {
       :param_name => 'npage',
       :previous_label => _('&laquo; Newer posts'),
       :next_label => _('Older posts &raquo;'),
       :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
-    }) if articles.present?
+    }) if articles.present? && paginate
     content = []
     artic_len = articles.length
     articles.each_with_index{ |art,i|
@@ -45,9 +45,9 @@ module BlogHelper
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
+    title = article_title(article, :no_comments => no_comments)
     html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
-
-    article_title(article, :no_comments => no_comments) + html
+    title + html
   end
   def display_full_format(article)
@@ -10,7 +10,7 @@ module ContentViewerHelper
   end
   def number_of_comments(article)
-    display_number_of_comments(article.comments.without_spam.count)
+    display_number_of_comments(article.comments_count - article.spam_comments_count)
   end
   def article_title(article, args = {})
@@ -26,7 +26,7 @@ module ContentViewerHelper
       end
       title << content_tag('span',
         content_tag('span', show_date(article.published_at), :class => 'date') +
-        content_tag('span', _(", by %s") % link_to(article.author_name, article.author_url), :class => 'author') +
+        content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
         :class => 'created-at'
       )
@@ -5,15 +5,17 @@ module FolderHelper
   include ShortFilename
   include ArticleHelper
-  def list_articles(articles, recursive = false)
-    if !articles.blank?
-      articles = articles.paginate(
+  def list_contents(configure={})
+    configure[:recursive] ||= false
+    configure[:list_type] ||= :folder
+    if !configure[:contents].blank?
+      configure[:contents] = configure[:contents].paginate(
         :order => "updated_at DESC",
         :per_page => 10,
         :page => params[:npage]
       )
-      render :file => 'shared/articles_list', :locals => {:articles => articles, :recursive => recursive}
+      render :file => 'shared/content_list', :locals => configure
     else
       content_tag('em', _('(empty folder)'))
     end
@@ -23,21 +25,33 @@ module FolderHelper
     articles.select {|article| article.display_to?(user)}
   end
-  def display_article_in_listing(article, recursive = false, level = 0)
-    article = FilePresenter.for article
-    article_link = if article.image?
-         link_to('&nbsp;' * (level * 4) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true))
+  def display_content_in_listing(configure={})
+    recursive = configure[:recursive] || false
+    list_type = configure[:list_type] || :folder
+    level = configure[:level] || 0
+    content = FilePresenter.for configure[:content]
+    content_link = if content.image?
+         link_to('&nbsp;' * (level * 4) +
+           image_tag(icon_for_article(content)) + short_filename(content.name),
+           content.url.merge(:view => true)
+         )
        else
-         link_to('&nbsp;' * (level * 4) + short_filename(article.name), article.url.merge(:view => true), :class => icon_for_article(article))
+         link_to('&nbsp;' * (level * 4) +
+           short_filename(content.name),
+           content.url.merge(:view => true), :class => icon_for_article(content)
+         )
        end
     result = content_tag(
       'tr',
-      content_tag('td', article_link )+
-      content_tag('td', show_date(article.updated_at), :class => 'last-update'),
-      :class => 'sitemap-item'
+      content_tag('td', content_link ) +
+      content_tag('td', show_date(content.updated_at), :class => 'last-update'),
+      :class => "#{list_type}-item"
     )
     if recursive
-      result + article.children.map {|item| display_article_in_listing(item, recursive, level + 1) }.join('')
+      result + content.children.map {|item|
+        display_content_in_listing :content=>item, :recursive=>recursive,
+                                   :list_type=>list_type, :level=>level+1
+      }.join("\n")
     else
       result
     end
@@ -2,7 +2,7 @@ require &#39;hpricot&#39;
 class Article < ActiveRecord::Base
-  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link
+  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link, :image_builder
   acts_as_having_image
@@ -37,6 +37,12 @@ class Article &lt; ActiveRecord::Base
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
+  before_create do |article|
+    if article.author
+      article.author_name = article.author.name
+    end
+  end
+
   belongs_to :profile
   validates_presence_of :profile_id, :name
   validates_presence_of :slug, :path, :if => lambda { |article| !article.name.blank? }
@@ -45,6 +51,7 @@ class Article &lt; ActiveRecord::Base
   validates_uniqueness_of :slug, :scope => ['profile_id', 'parent_id'], :message => N_('The title (article name) is already being used by another article, please use another title.'), :if => lambda { |article| !article.slug.blank? }
+  belongs_to :author, :class_name => 'Person'
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
   belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
@@ -453,10 +460,10 @@ class Article &lt; ActiveRecord::Base
     ['TextArticle', 'TextileArticle', 'TinyMceArticle']
   end
-  scope :published, :conditions => { :published => true }
-  scope :folders, lambda {|profile|{:conditions => { :type => profile.folder_types} }}
-  scope :no_folders, lambda {|profile|{:conditions => ['type NOT IN (?)', profile.folder_types]}}
-  scope :galleries, :conditions => { :type => 'Gallery' }
+  scope :published, :conditions => ['articles.published = ?', true]
+  scope :folders, lambda {|profile|{:conditions => ['articles.type IN (?)', profile.folder_types] }}
+  scope :no_folders, lambda {|profile|{:conditions => ['articles.type NOT IN (?)', profile.folder_types]}}
+  scope :galleries, :conditions => [ "articles.type IN ('Gallery')" ]
   scope :images, :conditions => { :is_image => true }
   scope :no_images, :conditions => { :is_image => false }
   scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
@@ -468,7 +475,7 @@ class Article &lt; ActiveRecord::Base
   scope :more_recent, :order => "created_at DESC"
   def self.display_filter(user, profile)
-    return {:conditions => ['published = ?', true]} if !user
+    return {:conditions => ['articles.published = ?', true]} if !user
     {:conditions => ["  articles.published = ? OR
                         articles.last_changed_by_id = ? OR
                         articles.profile_id = ? OR
@@ -495,6 +502,7 @@ class Article &lt; ActiveRecord::Base
   end
   def allow_post_content?(user = nil)
+    return true if allow_edit_topic?(user)
     user && (user.has_permission?('post_content', profile) || allow_publish_content?(user) && (user == author))
   end
@@ -517,9 +525,14 @@ class Article &lt; ActiveRecord::Base
   end
   def allow_edit?(user)
+    return true if allow_edit_topic?(user)
     allow_post_content?(user) || user && allow_members_to_edit && user.is_member_of?(profile)
   end
+  def allow_edit_topic?(user)
+    self.belongs_to_forum? && (user == author) && user.present? && user.is_member_of?(profile)
+  end
+
   def moderate_comments?
     moderate_comments == true
   end
@@ -634,35 +647,36 @@ class Article &lt; ActiveRecord::Base
     can_display_versions? && display_versions
   end
-  def author(version_number = nil)
-    if version_number
-      version = self.versions.find_by_version(version_number)
-      author_id = version.last_changed_by_id if version
-    else
-      author_id = self.created_by_id
-    end
+  def get_version(version_number = nil)
+    version_number ? versions.find(:first, :order => 'version', :offset => version_number - 1) : versions.earliest
+  end
-    environment.people.find_by_id(author_id)
+  def author_by_version(version_number = nil)
+    version_number ? profile.environment.people.find_by_id(get_version(version_number).author_id) : author
   end
   def author_name(version_number = nil)
-    person = author(version_number)
-    person ? person.name : (setting[:author_name] || _('Unknown'))
+    person = author_by_version(version_number)
+    if version_number
+      person ? person.name : _('Unknown')
+    else
+      person ? person.name : (setting[:author_name] || _('Unknown'))
+    end
   end
   def author_url(version_number = nil)
-    person = author(version_number)
+    person = author_by_version(version_number)
     person ? person.url : nil
   end
   def author_id(version_number = nil)
-    person = author(version_number)
+    person = author_by_version(version_number)
     person ? person.id : nil
   end
   def version_license(version_number = nil)
     return license if version_number.nil?
-    profile.environment.licenses.find_by_id(versions.find_by_version(version_number).license_id)
+    profile.environment.licenses.find_by_id(get_version(version_number).license_id)
   end
   alias :active_record_cache_key :cache_key
@@ -22,6 +22,10 @@ class Block &lt; ActiveRecord::Base
     false
   end
+  def get_limit
+    [0,limit].max
+  end
+
   def embed_code
     me = self
     proc do
@@ -109,14 +109,17 @@ class Comment &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
   include Spammable
+  include CacheCounterHelper
   def after_spam!
     SpammerLogger.log(ip_address, self)
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
+    update_cache_counter(:spam_comments_count, source, 1) if source.kind_of?(Article)
   end
   def after_ham!
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
+    update_cache_counter(:spam_comments_count, source, -1) if source.kind_of?(Article)
   end
   def verify_and_notify
@@ -2,7 +2,7 @@ require &#39;noosfero/multi_tenancy&#39;
 class Domain < ActiveRecord::Base
-  attr_accessible :name, :owner
+  attr_accessible :name, :owner, :is_default
   # relationships
   ###############
@@ -28,7 +28,10 @@ class Enterprise &lt; Organization
   N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
   settings_items :organization_website, :historic_and_current_context, :activities_short_description
+
   settings_items :products_per_catalog_page, :type => :integer, :default => 6
+  alias_method :products_per_catalog_page_before_type_cast, :products_per_catalog_page
+  validates_numericality_of :products_per_catalog_page, :allow_nil => true, :greater_than => 0
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -288,7 +288,7 @@ class Environment &lt; ActiveRecord::Base
     www.youtube.com
   ] + ('a' .. 'z').map{|i| "#{i}.yimg.com"}
-  settings_items :enabled_plugins, :type => Array, :default => []
+  settings_items :enabled_plugins, :type => Array, :default => Noosfero::Plugin.available_plugin_names
   settings_items :search_hints, :type => Hash, :default => {}
 class FeaturedProductsBlock < Block
+  attr_accessible :product_ids, :groups_of, :speed, :reflect
+
   settings_items :product_ids, :type => Array, :default => []
   settings_items :groups_of, :type => :integer, :default => 3
   settings_items :speed, :type => :integer, :default => 1000
@@ -15,4 +15,9 @@ class Friendship &lt; ActiveRecord::Base
     Friendship.update_cache_counter(:friends_count, friendship.person, -1)
     Friendship.update_cache_counter(:friends_count, friendship.friend, -1)
   end
+
+  def self.remove_friendship(person1, person2)
+    person1.remove_friend(person2)
+    person2.remove_friend(person1)
+  end
 end
 class HighlightsBlock < Block
-  attr_accessible :images
+  attr_accessible :images, :interval, :shuffle, :navigation
   settings_items :images, :type => Array, :default => []
   settings_items :interval, :type => 'integer', :default => 4
 class LocationBlock < Block
+  attr_accessible :zoom, :map_type
+
   settings_items :zoom, :type => :integer, :default => 4
   settings_items :map_type, :type => :string, :default => 'roadmap'
@@ -82,7 +82,7 @@ class PersonNotifier
       @url = @profile.environment.top_url
       mail(
         content_type: "text/html",
-        from: "#{@profile.environment.name} <#{@profile.environment.contact_email}>",
+        from: "#{@profile.environment.name} <#{@profile.environment.noreply_email}>",
         to: @profile.email,
         subject: _("[%s] Network Activity") % [@profile.environment.name]
       )
@@ -10,7 +10,7 @@ class Product &lt; ActiveRecord::Base
     :display => %w[map full]
   }
-  attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers
+  attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers, :unit_id, :discount, :inputs
   def self.default_search_display
     'full'
@@ -17,7 +17,7 @@ class ProductCategoriesBlock &lt; Block
     profile = owner
     proc do
       if @categories.nil? or @categories.length == 0
-        categories = ProductCategory.on_level().order(:name)
+        categories = ProductCategory.on_level(nil).order(:name)
         if @categories and @categories.length == 0
           notice = _('There are no sub-categories for %s') % @category.name
         end
@@ -33,7 +33,7 @@ class ProductCategoriesBlock &lt; Block
     end
   end
-  DISPLAY_OPTIONS['catalog_only'] = _('Only on the catalog')
+  DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
   def display
     settings[:display].nil? ? 'catalog_only' : super
@@ -49,17 +49,10 @@ class ProductsBlock &lt; Block
   def products(reload = false)
     if product_ids.blank?
-      products_list = owner.products(reload)
-      result = []
-      [4, products_list.size].min.times do
-        p = products_list.sample
-        result << p
-        products_list -= [p]
-      end
-      result
+      owner.products.order('RANDOM()').limit([4,owner.products.count].min)
     else
-      product_ids.map {|item| owner.products.find(item) }
-    end
+      owner.products.where(:id => product_ids)
+    end.compact
   end
 end
@@ -3,7 +3,7 @@
 # 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
+  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
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
 class ProfileListBlock < Block
-  attr_accessible :limit, :prioritize_profiles_with_image
+  attr_accessible :prioritize_profiles_with_image
   settings_items :limit, :type => :integer, :default => 6
   settings_items :prioritize_profiles_with_image, :type => :boolean, :default => true
@@ -18,13 +18,13 @@ class ProfileListBlock &lt; Block
     result = nil
     visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])
     if !prioritize_profiles_with_image
-      result = visible_profiles.all(:limit => limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
-    elsif profiles.visible.with_image.count >= limit
-      result = visible_profiles.with_image.all(:limit => limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = visible_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 }
     else
-      result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      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 }
     end
-    result.slice(0..limit-1)
+    result.slice(0..get_limit-1)
   end
   def profile_count
@@ -33,7 +33,7 @@ class RecentDocumentsBlock &lt; Block
   end
   def docs
-    self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.limit, {}, false)
+    self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.get_limit, {}, false)
   end
   def self.expire_on
 class RssFeed < Article
-  attr_accessible :limit, :enabled, :language, :include
+  attr_accessible :limit, :enabled, :language, :include, :feed_item_description
   def self.type_name
     _('RssFeed')
@@ -6,6 +6,8 @@ class SlideshowBlock &lt; Block
   settings_items :navigation, :type => 'boolean', :default => false
   settings_items :image_size, :type => 'string', :default => 'thumb'
+  attr_accessible :gallery_id, :image_size, :interval, :shuffle, :navigation
+
   def self.description
     _('Slideshow')
   end
@@ -5,7 +5,7 @@ require &#39;user_activation_job&#39;
 # Rails generator.
 class User < ActiveRecord::Base
-  attr_accessible :login, :email, :password, :password_confirmation
+  attr_accessible :login, :email, :password, :password_confirmation, :activated_at
   N_('Password')
   N_('Password confirmation')
@@ -11,4 +11,9 @@ class FilePresenter::Image &lt; FilePresenter
   def short_description
     _('Image (%s)') % content_type.split('/')[1].upcase
   end
+
+  #Overwriting method from FilePresenter to allow download of images
+  def download?(view = nil)
+    view.blank? || view == 'false'
+  end
 end
@@ -136,8 +136,6 @@
 <script type="text/javascript">
 jQuery(function($) {
-  $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());
-
   $('#signup-form input[type=text], #signup-form textarea').each(function() {
     $(this).bind('blur', function() {
       if ($(this).val() == '') {
 <%= block_title(title) %>
-<%= render :file => 'blocks/my_network/' + owner.class.name.underscore, :locals => { :owner => owner } %>
+<%= render_profile_actions owner.class %>
 <ul>
   <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
@@ -11,5 +11,5 @@
 </ul>
 <div class="my-network-actions">
-  <%= render :file => 'blocks/profile_info_actions/' + owner.class.name.underscore %>
+  <%= render 'blocks/profile_info_actions/' + owner.class.name.underscore %>
 </div>
@@ -23,6 +23,6 @@
 <% end %>
 <div class="profile-info-options">
-  <%= render :file => view_for_profile_actions(block.owner.class) %>
+  <%= render_profile_actions block.owner.class %>
 </div>
 </div><!-- end class="vcard" -->
@@ -40,7 +40,7 @@
 <% end %>
 <div class="profile-info-options">
-  <%= render :file => view_for_profile_actions(block.owner.class) %>
+  <%= render_profile_actions block.owner.class %>
 </div>
 </div><!-- end class="vcard" -->
@@ -0,0 +1,20 @@
+<ul>
+  <li>
+    <%= render "blocks/profile_info_actions/join_leave_community" %>
+  </li>
+  <% if logged_in? %>
+    <% if profile.enable_contact? %>
+      <li>
+      <%= link_to content_tag('span', _('Send an e-mail')),
+        { :profile => profile.identifier,
+          :controller => 'contact',
+          :action => 'new' },
+        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
+      </li>
+    <% end %>
+
+    <li><%= report_abuse(profile, :button) %></li>
+
+    <%= render_environment_features(:profile_actions) %>
+  <% end %>
+</ul>
@@ -0,0 +1,12 @@
+<ul>
+  <%if logged_in? %>
+    <%if !user.favorite_enterprises.include?(profile) %>
+      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>
+    <% end %>
+  <% end %>
+  <% if profile.enable_contact? %>
+    <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
+  <% end %>
+
+  <li><%= report_abuse(profile, :button) %></li>
+</ul>
@@ -0,0 +1,16 @@
+<ul>
+  <%if logged_in? && (user != profile) %>
+
+    <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
+      <li>
+      <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
+      </li>
+    <% end %>
+
+    <% if user.is_a_friend?(profile) && profile.enable_contact? %>
+      <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
+    <% end %>
+
+    <li><%= report_abuse(profile, :button) %></li>
+  <% end %>
+</ul>
@@ -1,20 +0,0 @@
-<ul>
-  <li>
-    <%= render "blocks/profile_info_actions/join_leave_community" %>
-  </li>
-  <% if logged_in? %>
-    <% if profile.enable_contact? %>
-      <li>
-      <%= link_to content_tag('span', _('Send an e-mail')),
-        { :profile => profile.identifier,
-          :controller => 'contact',
-          :action => 'new' },
-        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
-      </li>
-    <% end %>
-
-    <li><%= report_abuse(profile, :button) %></li>
-
-    <%= render_environment_features(:profile_actions) %>
-  <% end %>
-</ul>
@@ -1,12 +0,0 @@
-<ul>
-  <%if logged_in? %>
-    <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>
-    <% end %>
-  <% end %>
-  <% if profile.enable_contact? %>
-    <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
-  <% end %>
-
-  <li><%= report_abuse(profile, :button) %></li>
-</ul>
@@ -1,16 +0,0 @@
-<ul>
-  <%if logged_in? && (user != profile) %>
-
-    <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
-      <li>
-      <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
-      </li>
-    <% end %>
-
-    <% if user.is_a_friend?(profile) && profile.enable_contact? %>
-      <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
-    <% end %>
-
-    <li><%= report_abuse(profile, :button) %></li>
-  <% end %>
-</ul>
+<%= javascript_include_tag "highlight_block" %>
+
 <strong><%= _('Highlights') %></strong>
 <table class="noborder"><tbody id="highlights-data-table">
   <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th></tr>
-  <% for image in @block.images do %>
-    <%= highlights_block_config_image_fields @block, image %>
+  <% @block.images.each_with_index do |image, index| %>
+    <%= highlights_block_config_image_fields @block, image, index %>
   <% end %>
 </tbody></table>
-<%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do |page|
-  page.insert_html :bottom, 'highlights-data-table', highlights_block_config_image_fields(@block)
-end %>
+<table class="hidden highlight-table-row">
+  <tbody>
+    <%= highlights_block_config_image_fields(@block) %>
+  </tbody>
+</table>
+
+<%= link_to(_('New highlight'), '#', :class => 'button icon-add with-text new-highlight-button')%>
 <%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
@@ -25,7 +25,9 @@
   <div id='article-full-path'>
     <strong><%= _('Current folder: ') %></strong>
     <%= link_to profile.identifier, :action => 'index' %>
-    <%= @article.hierarchy.map {|item| " / " + ((item == @article) ? item.name : link_to(item.slug, :id => item.id)) } %>
+    <% @article.hierarchy.each do |item| %>
+      <%= " / " + ((item == @article) ? item.name.html_safe : link_to(item.slug, :id => item.id).html_safe) %>
+    <% end %>
   </div>
 <% end %>
@@ -31,7 +31,7 @@ function check_captcha(button, confirm_action) {
   return true;
   <% else %>
   jQuery('#recaptcha-container').show();
-  jQuery.colorbox({ inline : true, href : '#recaptcha-container', maxWidth : '600px', maxHeight : '300px' });
+  jQuery.colorbox({ html: jQuery('#recaptcha-container').html(), maxWidth : '600px', maxHeight : '300px' });
   jQuery('#confirm-captcha').unbind('click');
   jQuery('#confirm-captcha').bind('click', function() {
     jQuery.colorbox.close();
@@ -1,19 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
-
-<%= word_wrap(_('Title: %s') % @comment_title) %>
-
-<%= _("Comment:") %>
--------------------------------------------------------------------------------
-<%= word_wrap(@comment_body) %>
--------------------------------------------------------------------------------
-
-<%= _('Access the address below to view this comment:') %>
-<%= url_for @comment_url %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
@@ -0,0 +1,19 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
+
+<%= word_wrap(_('Title: %s') % @comment_title) %>
+
+<%= _("Comment:") %>
+-------------------------------------------------------------------------------
+<%= word_wrap(@comment_body) %>
+-------------------------------------------------------------------------------
+
+<%= _('Access the address below to view this comment:') %>
+<%= url_for @comment_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
 <div class="article-versions">
-  <%= button(:back, _('Go back to latest version'), {:action => 'view_page'}) %>
+  <%= button(:back, _('Go back to latest version'), @page.url) %>
 </div>
 <%= article_title(@page, :no_link => true) %>
 <p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
-<%= form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path.split('/')}, :method => 'get') do %>
+<%= form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path}, :method => 'get') do %>
   <ul id="article-versions">
     <% @versions.each do |v| %>
       <li>
@@ -9,13 +9,15 @@
 </div>
 <hr class="pre-posts"/>
 <div class="blog-posts">
+  <% paginate = true %>
   <%=
    posts = @posts
    format = blog.visualization_format
    if inside_block
      posts = blog.posts.paginate(:page=>1, :per_page=>inside_block.posts_per_page)
      format = inside_block.visualization_format
+     paginate = false
    end
-   (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, format))
+   (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, format, paginate))
   %>
 </div>
@@ -8,5 +8,5 @@
 <% if folder.children.empty? %>
   <em><%= _('(empty folder)') %></em>
 <% else %>
-  <%= list_articles(folder.children) %>
+  <%= list_contents(:contents=>folder.children) %>
 <% end %>
@@ -23,7 +23,6 @@
   <p id="no-current-version">
     <%= _('This is not the latest version of this content.') %>
   </p>
-</div>
   <% version_license = @page.version_license(@version) %>
   <%# This seemingly doubled verification exists because the article-sub-header
@@ -40,8 +40,6 @@
   </div>
 <% end %>
-<%= render :partial => 'shared/disabled_enterprise' %>
-
 <% if NOOSFERO_CONF['addthis_enabled'] %>
   <%= render :partial => 'addthis' %>
 <% end %>
@@ -1,25 +0,0 @@
-<%= _("Dear %s") % @person.name %>,
-
-<%= _("You have %d pending task(s).") % @tasks.size %>
-
-<%= @tasks.map{|i| " * #{i.description}"}.join("\n") %>
-
-<%= _("Click in address below to process task(s):") %>
-
-<%= @url_for_pending_tasks %>
-<% @organizations_with_pending_tasks.each do |organization| %>
-<% pending_tasks = @person.pending_tasks_for_organization(organization) %>
-<%= _("%s has %d pending task(s).") % [organization.name, pending_tasks.size] %>
-
-<%= pending_tasks.map{|i| " * #{i.information}"}.join("\n") %>
-
-<%= _("Click in address below to process task(s):") %>
-
-<%= url_for(:host => @default_hostname, :controller => 'tasks', :profile => organization.identifier) %>
-<% end %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -0,0 +1,25 @@
+<%= _("Dear %s") % @person.name %>,
+
+<%= _("You have %d pending task(s).") % @tasks.size %>
+
+<%= @tasks.map{|i| " * #{i.description}"}.join("\n") %>
+
+<%= _("Click in address below to process task(s):") %>
+
+<%= @url_for_pending_tasks %>
+<% @organizations_with_pending_tasks.each do |organization| %>
+<% pending_tasks = @person.pending_tasks_for_organization(organization) %>
+<%= _("%s has %d pending task(s).") % [organization.name, pending_tasks.size] %>
+
+<%= pending_tasks.map{|i| " * #{i.information}"}.join("\n") %>
+
+<%= _("Click in address below to process task(s):") %>
+
+<%= url_for(:host => @default_hostname, :controller => 'tasks', :profile => organization.identifier) %>
+<% end %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
-<%= render :partial => 'shared/disabled_enterprise' %>
-
 <h1><%= h profile.name %></h1>
 <% if @action %>
@@ -19,7 +17,7 @@
   <table class='profile'>
     <tr>
       <td colspan='2'>
-        <% plugins_tabs = @plugins.dispatch(:profile_tabs).map { |tab| {:title => tab[:title], :id => tab[:id], :content => instance_exec(&tab[:content]), :start => tab[:title]} }%>
+        <% plugins_tabs = @plugins.dispatch(:profile_tabs).map { |tab| {:title => tab[:title], :id => tab[:id], :content => instance_exec(&tab[:content]), :start => tab[:start]} }%>
         <% tabs = plugins_tabs.select { |tab| tab[:start] } %>
 <h1><%= _("%s: site map") % profile.name %></h1>
-<%= list_articles(available_articles(@articles, user), false) %>
+<%= list_contents :contents=>available_articles(@articles, user), :list_type=>:sitemap %>
@@ -24,7 +24,7 @@
   <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'profile_themes', :action => 'index') %>
-  <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
+  <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') if user.is_admin?(environment) || (!profile.enterprise? && !environment.enabled?('disable_header_and_footer'))  %>
   <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
@@ -1,16 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('%{sender} (%{sender_link}) has left the following scrap for you:') % { :sender => @sender, :sender_link => url_for(@sender_link) }) %>
-
--------------------------------------------------------------------------------
-<%= word_wrap(@scrap_content) %>
--------------------------------------------------------------------------------
-
-<%= _('View this scrap on the wall') %>:
-<%= url_for @wall_url %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
@@ -0,0 +1,16 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) has left the following scrap for you:') % { :sender => @sender, :sender_link => url_for(@sender_link) }) %>
+
+-------------------------------------------------------------------------------
+<%= word_wrap(@scrap_content) %>
+-------------------------------------------------------------------------------
+
+<%= _('View this scrap on the wall') %>:
+<%= url_for @wall_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
@@ -1,10 +0,0 @@
-<% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
-  <div id='profile-disabled'>
-    <%= environment.message_for_disabled_enterprise %>
-    <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
-      <div class='unlock-button'>
-        <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
 <div id=<%= "manage-#{kind}" %> class="manage-groups">
-  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % kind %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My %s') % kind %></strong></a>
+  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % _(kind) %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + title %></strong></a>
   <ul class="simplemenu-submenu">
     <% link.each do |link| %>
       <li class="simplemenu-item"><%= link %></li>
@@ -1,14 +0,0 @@
-<table>
-
-  <tr>
-    <th><%= _('Title') %></th>
-    <th><%= _('Last update') %></th>
-  </tr>
-  <% articles.each do |article| %>
-    <% if article.display_to?(user) %>
-      <%= display_article_in_listing(article, recursive, 0) %>
-    <% end %>
-  <% end %>
-</table>
-
-<p><%= pagination_links(articles, {:param_name => 'npage', :page_links => true}) %></p>
@@ -0,0 +1,13 @@
+<table class="<%= list_type %>-content">
+  <tr>
+    <th><%= _('Title') %></th>
+    <th><%= _('Last update') %></th>
+  </tr>
+  <% contents.each do |content| %>
+    <% if content.display_to?(user) %>
+      <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>
+    <% end %>
+  <% end %>
+</table>
+
+<p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>
@@ -1 +0,0 @@
-<%= @message %>
 \ No newline at end of file
@@ -0,0 +1 @@
+<%= @message %>
 \ No newline at end of file
@@ -1,10 +0,0 @@
-<%= _('Hello %s,') % @target %>
-
-<%= word_wrap(@message) %>
-
-<%= word_wrap(_('Access your list of tasks or your control panel to see this and other pending actions that need your attention.')) %>
-<%= @tasks_url %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -0,0 +1,10 @@
+<%= _('Hello %s,') % @target %>
+
+<%= word_wrap(@message) %>
+
+<%= word_wrap(_('Access your list of tasks or your control panel to see this and other pending actions that need your attention.')) %>
+<%= @tasks_url %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -0,0 +1 @@
+task_cancelled.text.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-task_cancelled.text.plain.html.erb
 \ No newline at end of file
@@ -0,0 +1,9 @@
+<%= _('Dear %s,') % @requestor %>
+
+<%= word_wrap(@message) %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -1,9 +0,0 @@
-<%= _('Dear %s,') % @requestor %>
-
-<%= word_wrap(@message) %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -0,0 +1 @@
+task_cancelled.text.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-task_cancelled.text.plain.html.erb
 \ No newline at end of file
@@ -0,0 +1 @@
+task_cancelled.text.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-task_cancelled.text.plain.html.erb
 \ No newline at end of file
@@ -1,9 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
@@ -0,0 +1,9 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
@@ -1,12 +0,0 @@
-<%= _('Hello %s,') % @name  %>
-
-<%= _('Your email %s was just activated.') % [@email] %>
-
-<%= _('You can access your e-mail from anywhere, using the following address:') %>
-<%= @webmail %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -0,0 +1,12 @@
+<%= _('Hello %s,') % @name  %>
+
+<%= _('Your email %s was just activated.') % [@email] %>
+
+<%= _('You can access your e-mail from anywhere, using the following address:') %>
+<%= @webmail %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -0,0 +1,3 @@
+Plugins in this directory are enabled by default, and cannot be disabled at the
+system level. Each environment admistrator can still disable it in the web UI,
+though.
@@ -0,0 +1 @@
+../plugins/people_block
 \ No newline at end of file
 # Load the rails application
 require File.expand_path('../application', __FILE__)
+#FIXME Necessary hack to avoid the need of downgrading rubygems on rails 2.3.5
+# http://stackoverflow.com/questions/5564251/uninitialized-constant-activesupportdependenciesmutex
+require 'thread'
+
 # Uncomment below to force Rails into production mode when 
 # you don't control web/app server and can't set it the proper way
 #ENV['RAILS_ENV'] ||= 'production'
 unless NOOSFERO_CONF['exception_recipients'].blank?
-  require 'noosfero.rb'
-  require 'exception_notification.rb'
-  ExceptionNotifier.sender_address = "noreply@#{Noosfero.default_hostname}"
-  ExceptionNotifier.email_prefix = "[Noosfero ERROR] "
-  ExceptionNotifier.exception_recipients = NOOSFERO_CONF['exception_recipients']
-  ActionController::Base.send :include, ExceptionNotifiable
+  Noosfero::Application.config.middleware.use ExceptionNotification::Rack,
+    :email => {
+      :sender_address => "noreply@#{Noosfero.default_hostname}",
+      :email_prefix => "[Noosfero ERROR] ",
+      :exception_recipients => NOOSFERO_CONF['exception_recipients']
+    }
 end
@@ -1 +0,0 @@
-../../plugins/people_block
 \ No newline at end of file
@@ -131,7 +131,7 @@ Noosfero::Application.routes.draw do
   match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format}/, :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}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
+  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff'
   # match requests for profiles that don't have a custom domain
@@ -0,0 +1,17 @@
+class IndexFilteredFieldsOnTask < ActiveRecord::Migration
+  def self.up
+    add_index :tasks, :requestor_id
+    add_index :tasks, :target_id
+    add_index :tasks, :target_type
+    add_index :tasks, [:target_id, :target_type]
+    add_index :tasks, :status
+  end
+
+  def self.down
+    remove_index :tasks, :requestor_id
+    remove_index :tasks, :target_id
+    remove_index :tasks, :target_type
+    remove_index :tasks, [:target_id, :target_type]
+    remove_index :tasks, :status
+  end
+end
@@ -0,0 +1,12 @@
+class AddSpamCommentsCounterCacheToArticles < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :spam_comments_count, :integer, :default => 0
+    add_column :article_versions, :spam_comments_count, :integer, :default => 0
+    execute "update articles set spam_comments_count = (select count(*) from comments where comments.source_id = articles.id and comments.source_type = 'Article' and comments.spam = 't');"
+  end
+
+  def self.down
+    remove_column :articles, :spam_comments_count
+    remove_column :article_versions, :spam_comments_count
+  end
+end
@@ -0,0 +1,14 @@
+class CreateRealRelationBetweenArticleAndAuthor < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :author_id, :integer
+    add_column :article_versions, :author_id, :integer
+
+    # Set article's author as the first version's last_changed_by_id.
+    execute "update articles set author_id = (select article_versions.last_changed_by_id from article_versions where article_versions.article_id = articles.id and article_versions.version = 1 limit 1)"
+  end
+
+  def self.down
+    remove_column :articles, :author_id
+    remove_column :article_versions, :author_id
+  end
+end
@@ -0,0 +1,30 @@
+class FixYamlEncoding < ActiveRecord::Migration
+  def self.up
+    fix_encoding(Block, 'settings')
+    fix_encoding(Product, 'data')
+    fix_encoding(Environment, 'settings')
+    fix_encoding(Profile, 'data')
+    fix_encoding(ActionTracker::Record, 'params')
+    fix_encoding(Article, 'setting')
+  end
+
+  def self.down
+    puts "Warning: cannot restore original encoding"
+  end
+
+  private
+
+  def self.fix_encoding(model, param)
+    result = model.find(:all, :conditions => "#{param} LIKE '%!binary%'")
+    puts "Fixing #{result.count} rows of #{model} (#{param})"
+    result.each {|r| r.update_column(param, deep_fix(r.send(param)).to_yaml)}
+  end
+
+  def self.deep_fix(hash)
+    hash.each do |value|
+      value.force_encoding('UTF-8') if value.is_a?(String) && !value.frozen? && value.encoding == Encoding::ASCII_8BIT
+      deep_fix(value) if value.respond_to?(:each)
+    end
+  end
+
+end
@@ -0,0 +1,11 @@
+class UpdateDefaultTaggingContext < ActiveRecord::Migration
+
+  def self.up
+    ActsAsTaggableOn::Tagging.where(:taggable_type => Article, :context => nil).update_all(:context => 'tags')
+  end
+
+  def self.down
+    ActsAsTaggableOn::Tagging.where(:taggable_type => Article, :context => 'tags').update_all(:context => nil)
+  end
+
+end
@@ -96,6 +96,8 @@ ActiveRecord::Schema.define(:version =&gt; 20140811141211) do
     t.integer  "image_id"
     t.integer  "position"
     t.integer  "created_by_id"
+    t.integer  "spam_comments_count",  :default => 0
+    t.integer  "author_id"
   end
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
@@ -142,6 +144,8 @@ ActiveRecord::Schema.define(:version =&gt; 20140811141211) do
     t.integer  "image_id"
     t.integer  "position"
     t.integer  "created_by_id"
+    t.integer  "spam_comments_count",  :default => 0
+    t.integer  "author_id"
   end
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
@@ -644,7 +648,12 @@ ActiveRecord::Schema.define(:version =&gt; 20140811141211) do
     t.boolean  "spam",                       :default => false
   end
+  add_index "tasks", ["requestor_id"], :name => "index_tasks_on_requestor_id"
   add_index "tasks", ["spam"], :name => "index_tasks_on_spam"
+  add_index "tasks", ["status"], :name => "index_tasks_on_status"
+  add_index "tasks", ["target_id", "target_type"], :name => "index_tasks_on_target_id_and_target_type"
+  add_index "tasks", ["target_id"], :name => "index_tasks_on_target_id"
+  add_index "tasks", ["target_type"], :name => "index_tasks_on_target_type"
   create_table "terms_forum_people", :id => false, :force => true do |t|
     t.integer "forum_id"
+noosfero (1.0~rc1) wheezy-test; urgency=low
+
+  * First 1.0 release candidate
+
+ -- Rodrigo Souto <vagrant@wheezy-base>  Fri, 15 Aug 2014 16:35:35 -0300
+
 noosfero (0.99.0~rc20140618202455) wheezy-test; urgency=low
   * Another rc with rails3
  -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 18 Jun 2014 20:25:01 +0000
+noosfero (0.47.3) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Fri, 20 Jun 2014 03:13:29 +0000
+
+noosfero (0.47.2) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Fri, 13 Jun 2014 15:19:28 +0000
+
 noosfero (0.47.1) unstable; urgency=low
   * Bugfix release
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+--ignore-dir=log
	2	+--ignore-dir=tmp
	3	+--ignore-dir=pkg
	@@ -1,250 +0,0 @@	@@ -1,250 +0,0 @@
1	-If you are not listed here, but should be, please write to the noosfero mailing
2	-list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
3	-(this list requires subscription to post, but since you are an author of
4	-noosfero, that's not a problem).
5	-
6	-Developers
7	-==========
8	-
9	-Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
10	-Alan Freihof Tygel <alantygel@gmail.com>
11	-alcampelo <alcampelo@alcampelo.(none)>
12	-Alessandro Palmeira <alessandro.palmeira@gmail.com>
13	-Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
14	-Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
15	-Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
16	-Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
17	-Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
18	-Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
19	-Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
20	-Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
21	-Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
22	-Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
23	-Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
24	-Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
25	-Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
26	-Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
27	-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
28	-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
29	-Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
30	-Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
31	-Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
32	-Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
33	-Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
34	-Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
35	-Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
36	-Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
37	-Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
38	-Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
39	-Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
40	-Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
41	-Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
42	-Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
43	-Ana Losnak <analosnak@gmail.com>
44	-Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
45	-Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
46	-Antonio Terceiro <terceiro@colivre.coop.br>
47	-Arthur Del Esposte <arthurmde@gmail.com>
48	-Arthur Del Esposte <arthurmde@yahoo.com.br>
49	-Aurelio A. Heckert <aurelio@colivre.coop.br>
50	-Braulio Bhavamitra <brauliobo@gmail.com>
51	-Bráulio Bhavamitra <brauliobo@gmail.com>
52	-Braulio Bhavamitra <braulio@eita.org.br>
53	-Caio <caio.csalgado@gmail.com>
54	-Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
55	-Caio Formiga <caio.formiga@gmail.com>
56	-Caio, Pedro <caio.csalgado@gmail.com>
57	-Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
58	-Caio Salgado <caio.csalgado@gmail.com>
59	-Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
60	-Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
61	-Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
62	-Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
63	-Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
64	-Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
65	-Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
66	-Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
67	-Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
68	-Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
69	-Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
70	-Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
71	-Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
72	-Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
73	-Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
74	-Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
75	-Caio SBA <caio@colivre.coop.br>
76	-Caio Tiago Oliveira <caiotiago@colivre.coop.br>
77	-Carlos Andre de Souza <carlos.andre.souza@msn.com>
78	-Carlos Morais <carlos88morais@gmail.com>
79	-Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
80	-Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
81	-Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
82	-Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
83	-Daniela Feitosa <dani@dohko.(none)>
84	-Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
85	-Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
86	-Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
87	-Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
88	-Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
89	-Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
90	-Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
91	-Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
92	-Daniel Bucher <daniel.bucher88@gmail.com>
93	-Daniel Cunha <daniel@colivre.coop.br>
94	-David Carlos <ddavidcarlos1392@gmail.com>
95	-diegoamc <diegoamc90@gmail.com>
96	-Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
97	-Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
98	-Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
99	-Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
100	-Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
101	-Diego Araújo <diegoamc90@gmail.com>
102	-Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
103	-Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
104	-Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
105	-Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
106	-Diego Araújo + João Machini <diegoamc90@gmail.com>
107	-Diego Araújo + João Machini <digoamc90@gmail.com>
108	-Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
109	-Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
110	-Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
111	-Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
112	-Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
113	-Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
114	-Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
115	-Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
116	-Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
117	-Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
118	-Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
119	-Diego + Jefferson <diegoamc90@gmail.com>
120	-Diego Martinez <diegoamc90@gmail.com>
121	-Diego Martinez <diego@diego-K55A.(none)>
122	-Diego + Renan <renanteruoc@gmail.com>
123	-Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
124	-Evandro Jr <evandrojr@gmail.com>
125	-Evandro Junior <evandrojr@gmail.com>
126	-Fabio Teixeira <fabio1079@gmail.com>
127	-Fernanda Lopes <nanda.listas+psl@gmail.com>
128	-Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
129	-Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
130	-Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
131	-Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
132	-Gabriela Navarro <navarro1703@gmail.com>
133	-Grazieno Pellegrino <grazieno@gmail.com>
134	-Gust <darksshades@hotmail.com>
135	-Hugo Melo <hugo@riseup.net>
136	-Isaac Canan <isaac@intelletto.com.br>
137	-Italo Valcy <italo@dcc.ufba.br>
138	-Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
139	-Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
140	-Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
141	-João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
142	-João da Silva <jaodsilv@linux.ime.usp.br>
143	-João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
144	-João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
145	-João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
146	-Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
147	-João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
148	-João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
149	-João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
150	-João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
151	-João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
152	-João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
153	-João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
154	-João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
155	-João M. M. da Silva <jaodsilv@linux.ime.usp.br>
156	-Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
157	-João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
158	-João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
159	-João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
160	-João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
161	-João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
162	-João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
163	-João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
164	-João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
165	-João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
166	-Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
167	-João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
168	-João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
169	-João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
170	-Joenio Costa <joenio@colivre.coop.br>
171	-Josef Spillner <josef.spillner@tu-dresden.de>
172	-Junior Silva <junior@bajor.localhost.localdomain>
173	-Junior Silva <juniorsilva1001@gmail.com>
174	-Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
175	-Junior Silva <juniorsilva@colivre.coop.br>
176	-juniorsilva <juniorsilva@QonoS.localhost.localdomain>
177	-Keilla Menezes <keilla@colivre.coop.br>
178	-Larissa Reis <larissa@colivre.coop.br>
179	-Larissa Reis <reiss.larissa@gmail.com>
180	-Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
181	-Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
182	-Leandro Nunes dos Santos <leandronunes@gmail.com>
183	-Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
184	-LinguÁgil 2010 <linguagil.bahia@gmail.com>
185	-Lucas Melo <lucas@colivre.coop.br>
186	-Lucas Melo <lucaspradomelo@gmail.com>
187	-Luciano <lucianopcbr@gmail.com>
188	-Luis David Aguilar Carlos <ludwig9003@gmail.com>
189	-Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
190	-Marcos Ramos <ms.ramos@outlook.com>
191	-Martín Olivera <molivera@solar.org.ar>
192	-Moises Machado <moises@colivre.coop.br>
193	-Naíla Alves <naila@colivre.coop.br>
194	-Nanda Lopes <nanda.listas+psl@gmail.com>
195	-Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
196	-Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
197	-Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
198	-Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
199	-Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
200	-Paulo Meirelles <paulo@softwarelivre.org>
201	-Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
202	-Rafael Gomes <rafaelgomes@techfree.com.br>
203	-Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
204	-Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
205	-Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
206	-Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
207	-Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
208	-Rafael Martins <rmmartins@gmail.com>
209	-Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
210	-Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
211	-Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
212	-Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
213	-Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
214	-Rafael Reggiani Manzo <rr.manzo@gmail.com>
215	-Raphaël Rousseau <raph@r4f.org>
216	-Raquel Lira <raquel.lira@gmail.com>
217	-Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
218	-Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
219	-Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
220	-Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
221	-Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
222	-Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
223	-Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
224	-Rodrigo Souto <diguliu@gmail.com>
225	-Rodrigo Souto <rodrigo@colivre.coop.br>
226	-Ronny Kursawe <kursawe.ronny@googlemail.com>
227	-root <root@debian.sdr.serpro>
228	-Samuel R. C. Vale <srcvale@holoscopio.com>
229	-Valessio Brito <contato@valessiobrito.com.br>
230	-Valessio Brito <contato@valessiobrito.info>
231	-Valessio Brito <valessio@gmail.com>
232	-vfcosta <vfcosta@gmail.com>
233	-Victor Carvalho <victorhugodf.ac@gmail.com>
234	-Victor Costa <vfcosta@gmail.com>
235	-Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
236	-Vinicius Cubas Brand <viniciuscb@gmail.com>
237	-Visita <visita@debian.(none)>
238	-Yann Lugrin <yann.lugrin@liquid-concept.ch>
239	-
240	-Ideas, specifications and incentive
241	-===================================
242	-Daniel Tygel <dtygel@fbes.org.br>
243	-Guilherme Rocha <guilherme@gf7.com.br>
244	-Raphael Rousseau <raph@r4f.org>
245	-Théo Bondolfi <move@cooperation.net>
246	-Vicente Aguiar <vicenteaguiar@colivre.coop.br>
247	-
248	-Arts
249	-===================================
250	-Nara Oliveira <narananet@gmail.com>
	@@ -62,7 +62,10 @@ GEM		@@ -62,7 +62,10 @@ GEM
62	database_cleaner (1.2.0)	62	database_cleaner (1.2.0)
63	diff-lcs (1.1.3)	63	diff-lcs (1.1.3)
64	erubis (2.7.0)	64	erubis (2.7.0)
65	- eventmachine (0.12.11)	65	+ eventmachine (0.12.10)
		66	+ exception_notification (4.0.1)
		67	+ actionmailer (>= 3.0.4)
		68	+ activesupport (>= 3.0.4)
66	fast_gettext (0.6.8)	69	fast_gettext (0.6.8)
67	ffi (1.0.11)	70	ffi (1.0.11)
68	gherkin (2.4.21)	71	gherkin (2.4.21)
	@@ -112,6 +115,8 @@ GEM		@@ -112,6 +115,8 @@ GEM
112	thor (>= 0.14.6, < 2.0)	115	thor (>= 0.14.6, < 2.0)
113	rake (0.9.2.2)	116	rake (0.9.2.2)
114	rdoc (3.9.4)	117	rdoc (3.9.4)
		118	+ rest-client (1.6.7)
		119	+ mime-types (>= 1.16)
115	rmagick (2.13.1)	120	rmagick (2.13.1)
116	rspec (2.10.0)	121	rspec (2.10.0)
117	rspec-core (~> 2.10.0)	122	rspec-core (~> 2.10.0)
	@@ -169,6 +174,7 @@ DEPENDENCIES		@@ -169,6 +174,7 @@ DEPENDENCIES
169	daemons	174	daemons
170	dalli	175	dalli
171	database_cleaner	176	database_cleaner
		177	+ exception_notification
172	fast_gettext	178	fast_gettext
173	hpricot	179	hpricot
174	mocha	180	mocha
	@@ -179,6 +185,7 @@ DEPENDENCIES		@@ -179,6 +185,7 @@ DEPENDENCIES
179	rails	185	rails
180	rails_autolink	186	rails_autolink
181	rake	187	rake
		188	+ rest-client
182	rmagick	189	rmagick
183	rspec	190	rspec
184	rspec-rails	191	rspec-rails
1	#!/usr/bin/env rake	1	#!/usr/bin/env rake
		2	+
2	# Add your own tasks in files placed in lib/tasks ending in .rake,	3	# Add your own tasks in files placed in lib/tasks ending in .rake,
3	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.	4	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4		5
	@@ -12,7 +12,7 @@ class FriendsController < MyProfileController		@@ -12,7 +12,7 @@ class FriendsController < MyProfileController
12	def remove	12	def remove
13	@friend = profile.friends.find(params[:id])	13	@friend = profile.friends.find(params[:id])
14	if request.post? && params[:confirmation]	14	if request.post? && params[:confirmation]
15	- profile.remove_friend(@friend)	15	+ Friendship.remove_friendship(profile, @friend)
16	redirect_to :action => 'index'	16	redirect_to :action => 'index'
17	end	17	end
18	end	18	end
	@@ -2,7 +2,7 @@ class AccountController < ApplicationController		@@ -2,7 +2,7 @@ class AccountController < ApplicationController
2		2
3	no_design_blocks	3	no_design_blocks
4		4
5	- before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]	5	+ before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise, :change_password]
6	before_filter :redirect_if_logged_in, :only => [:login, :signup]	6	before_filter :redirect_if_logged_in, :only => [:login, :signup]
7	before_filter :protect_from_bots, :only => :signup	7	before_filter :protect_from_bots, :only => :signup
8		8
	@@ -11,7 +11,7 @@ class CatalogController < PublicController		@@ -11,7 +11,7 @@ class CatalogController < PublicController
11	protected	11	protected
12		12
13	def check_enterprise_and_environment	13	def check_enterprise_and_environment
14	- unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')	14	+ unless profile.enterprise? && @profile.environment.enabled?('products_for_enterprises')
15	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'	15	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
16	end	16	end
17	end	17	end
	@@ -10,7 +10,7 @@ module ContentViewerHelper		@@ -10,7 +10,7 @@ module ContentViewerHelper
10	end	10	end
11		11
12	def number_of_comments(article)	12	def number_of_comments(article)
13	- display_number_of_comments(article.comments.without_spam.count)	13	+ display_number_of_comments(article.comments_count - article.spam_comments_count)
14	end	14	end
15		15
16	def article_title(article, args = {})	16	def article_title(article, args = {})
	@@ -26,7 +26,7 @@ module ContentViewerHelper		@@ -26,7 +26,7 @@ module ContentViewerHelper
26	end	26	end
27	title << content_tag('span',	27	title << content_tag('span',
28	content_tag('span', show_date(article.published_at), :class => 'date') +	28	content_tag('span', show_date(article.published_at), :class => 'date') +
29	- content_tag('span', _(", by %s") % link_to(article.author_name, article.author_url), :class => 'author') +	29	+ content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
30	content_tag('span', comments, :class => 'comments'),	30	content_tag('span', comments, :class => 'comments'),
31	:class => 'created-at'	31	:class => 'created-at'
32	)	32	)
	@@ -2,7 +2,7 @@ require 'noosfero/multi_tenancy'		@@ -2,7 +2,7 @@ require 'noosfero/multi_tenancy'
2		2
3	class Domain < ActiveRecord::Base	3	class Domain < ActiveRecord::Base
4		4
5	- attr_accessible :name, :owner	5	+ attr_accessible :name, :owner, :is_default
6		6
7	# relationships	7	# relationships
8	###############	8	###############
	@@ -288,7 +288,7 @@ class Environment < ActiveRecord::Base		@@ -288,7 +288,7 @@ class Environment < ActiveRecord::Base
288	www.youtube.com	288	www.youtube.com
289	] + ('a' .. 'z').map{\|i\| "#{i}.yimg.com"}	289	] + ('a' .. 'z').map{\|i\| "#{i}.yimg.com"}
290		290
291	- settings_items :enabled_plugins, :type => Array, :default => []	291	+ settings_items :enabled_plugins, :type => Array, :default => Noosfero::Plugin.available_plugin_names
292		292
293	settings_items :search_hints, :type => Hash, :default => {}	293	settings_items :search_hints, :type => Hash, :default => {}
294		294