Merge branches 'master' and 'AI3268_template_management' into AI3268_template_management

Leandro Santos
2 parents 953ad391 46080e93
Showing 1210 changed files with 89174 additions and 157212 deletions Show diff stats
.ackrc
AUTHORS
AUTHORS.md
DEVELOPMENT.md
Gemfile
Gemfile.lock
INSTALL.md
Rakefile
Vagrantfile
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/categories_controller.rb
app/controllers/admin/environment_design_controller.rb
app/controllers/admin/features_controller.rb
app/controllers/admin/plugin_admin_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/tasks_controller.rb
 --ignore-dir=log
 --ignore-dir=tmp
 --ignore-dir=pkg
+--ignore-dir=public/javascripts/cache
+--ignore-dir=public/stylesheets/cache
@@ -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,14 @@ 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>
+analosnak <analosnak@gmail.com>
+Ana Losnak <analosnak@gmail.com>
+Andre Bernardes <andrebsguedes@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,6 +75,8 @@ 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>
@@ -78,7 +90,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>
@@ -105,17 +119,27 @@ Diego Araújo + Renan Teruo &lt;diegoamc90@gmail.com&gt;
 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>
+Hebert Douglas <hebertdougl@gmail.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,21 +170,35 @@ 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>
+Michal Čihař <michal@cihar.com>
 Moises Machado <moises@colivre.coop.br>
 Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
+Parley Martins <parleypachecomartins@gmail.com>
 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
 Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
@@ -183,20 +221,28 @@ Rafael Reggiani Manzo + João M. M. da Silva &lt;rr.manzo@gmail.com&gt;
 Rafael Reggiani Manzo <rr.manzo@gmail.com>
 Raphaël Rousseau <raph@r4f.org>
 Raquel Lira <raquel.lira@gmail.com>
+Raquel <rcordioli@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 <diguliu@gmail.com>
+Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
+Tallys Martins <tallysmartins@gmail.com>
+tallys <tallys@tallys.(none)>
+Thiago Zoroastro <thiago.zoroastro@bol.com.br>
+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>
@@ -0,0 +1,124 @@
+# Noosfero Development Policy
+
+## Developer Roles
+
+* *Developers* are everyone that is contributing code to Noosfero.
+* *Committers* are the people with direct commit access to the Noosfero source
+  code. They are responsible for reviewing contributions from other developers
+  and integrating them in the Noosfero code base. They are the members of the
+  [Noosfero group on Gitlab](https://gitlab.com/groups/noosfero/members).
+* *Release managers* are the people that are managing the release of a new
+  Noosfero version and/or the maintainance work of an existing Noosfero stable
+  branch. See MAINTAINANCE.md for details on the maintaince policy.
+
+## Development process
+
+* Every new feature or non-trivial bugfix should be reviewed by at least one
+  committer. This must be the case even if the original author is a committer.
+
+  * In the case the original author is a committer, he/she should feel free to
+    commit directly if after 1 week nobody has provided any kind of feedback.
+
+  * Developers who are not committers should feel free to ping committers if
+    they do not get feedback on their contributions after 1 week.
+
+    * On GitLab, one can just add a comment to the merge request; one can also
+      @-mention specific committers or other developers who have expertise on
+      the area of the contribution.
+
+  * Committers should follow the activity of the project, and try to help
+    reviewing contributions from others as much as possible.
+
+    * On GitLab one can get emails for all activity on a project by setting the
+      [notification settings](https://gitlab.com/profile/notifications) to
+      "watch".
+
+  * Anyone can help by reviewing contributions. Committers are the only ones
+    who can give the final approval to a contribution, but everyone is welcome
+    to help with code review, testing, etc.
+
+    * See note above about setting up notification on GitLab.
+
+* Committers should feel free to push trivial (or urgent) changes directly.
+  There are no strict rule on what makes a change trivial or urgent; committers
+  are expected to exercise good judgement on a case by case basis.
+
+  * Usually changes to the database are not trivial.
+
+* In the case of unsolvable conflict between commiters regarding any change to
+  the code, the current release manager(s) will have the final say in the
+  matter.
+
+* Release managers are responsible for stablishing a release schedule, and
+  about deciding when and what to release.
+
+  * Release managers should announce release schedules to the project mailing
+    lists in advance.
+
+  * The release schedule may include a period of feature freeze, during which
+    no new features or any other changes that are not pre-approved by the
+    release manager must be committed to the repository.
+
+  * Committers must respect the release schedule and feature freezes.
+
+## Maintainance process
+
+### Not all feature releases will be maintained as a stable release
+
+We will be choosing specific release series to be maintained as stable
+releases.
+
+This means that a given release is not guaranteed to be maintained as a stable
+release, but does *not* mean it won't be. Any committer (or anyone, really) can
+decide to maintain a given release as stable and seek help from others to do
+so.
+
+### No merges from stable branches to master
+
+*All* changes must be submitted against the master branch first, and when
+applicable, backported to the desired stable releases. Exceptions to this rules
+are bug fixes that only apply to a given stable branch and not to master.
+
+In the past we had non-trivial changes accepted into stable releases while
+master was way ahead (e.g. during the rails3 migration period), that made the
+merge back into master very painful.  By eliminating the need to do these
+merges, we save time for the people responsible for the release, and eliminate
+the possibility of human errors or oversights causing changes to be accepted
+into stable that will be a problem to merge back into master.
+
+By getting all fixes in master first, we improve the chances that  a future
+release will not present regressions against bugs that should already be fixed,
+but the fixes got lost in a big, complicated merge (and those won't exist
+anymore, at least not from stable branches to master).
+
+After a fix gets into master, backporting changes into a stable release branch
+is the responsibility of whoever is maintaing that branch, and those interested
+in it. The stable branch release manager(s) are entitled the final say on any
+matters related to that branch.
+
+## Apendix A: how to become a committer
+
+Every developer that wants to be a committer should create [an issue on
+Gitlab](https://gitlab.com/noosfero/noosfero/issues) requesting to be added as
+a committer. This request must include information about the requestor's
+previous contributions to the project.
+
+If 2 or more commiters consider second the request, the requestor is accepted
+as new commiter and added to the Noosfero group.
+
+The existing committers are free to choose whatever criteria they want to
+second the request, but they must be sure that the new committer is a
+responsible developer and knows what she/he is doing. They must be aware that
+seconding these requests means seconding the actions of the new committer: if
+the new committer screw up, her/his seconds screwed up.
+
+## Apendix B: how to become a release manager
+
+A new release manager for the development version of Noosfero (i.e. the one
+that includes new features, a.k.a. the master branch) is apointed by the
+current release manager, and must be a committer first.
+
+Release managers for stable branches are self-appointed, i.e. whoever takes the
+work takes the role. In case of a conflict (e.g. 2+ different people want to do
+the work but can't agree on working together), the development release manager
+decides.
 source "https://rubygems.org"
-gem 'rails'
-gem 'fast_gettext'
-gem 'acts-as-taggable-on'
-gem 'prototype-rails'
-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
-gem 'rails_autolink'
-gem 'pg'
-gem 'rmagick'
-gem 'RedCloth'
-gem 'will_paginate'
-gem 'ruby-feedparser'
-gem 'daemons'
-gem 'thin'
-gem 'hpricot'
-gem 'nokogiri'
+gem 'rails',                    '~> 3.2.19'
+gem 'fast_gettext',             '~> 0.6.8'
+gem 'acts-as-taggable-on',      '~> 3.0.2'
+gem 'prototype-rails',          '~> 3.2.1'
+gem 'prototype_legacy_helper',  '0.0.0', :path => 'vendor/prototype_legacy_helper'
+gem 'rails_autolink',           '~> 1.1.5'
+gem 'pg',                       '~> 0.13.2'
+gem 'rmagick',                  '~> 2.13.1'
+gem 'RedCloth',                 '~> 4.2.9'
+gem 'will_paginate',            '~> 3.0.3'
+gem 'ruby-feedparser',          '~> 0.7'
+gem 'daemons',                  '~> 1.1.5'
+gem 'thin',                     '~> 1.3.1'
+gem 'hpricot',                  '~> 0.8.6'
+gem 'nokogiri',                 '~> 1.5.5'
 gem 'rake', :require => false
-gem 'rest-client'
-gem 'exception_notification'
+gem 'rest-client',              '~> 1.6.7'
+gem 'exception_notification',   '~> 4.0.1'
+gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
+gem 'locale',                   '~> 2.0.5'
  
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
  
 group :production do
-  gem 'dalli'
+  gem 'dalli', '~> 2.7.0'
 end
  
 group :test do
-  gem 'rspec'
-  gem 'rspec-rails'
-  gem 'mocha', :require => false
+  gem 'rspec',                  '~> 2.10.0'
+  gem 'rspec-rails',            '~> 2.10.1'
+  gem 'mocha',                  '~> 1.1.0', :require => false
 end
  
 group :cucumber do
-  gem 'rake'
-  gem 'cucumber-rails', :require => false
-  gem 'capybara'
-  gem 'cucumber'
-  gem 'database_cleaner'
-  gem 'selenium-webdriver'
+  gem 'cucumber-rails',         '~> 1.0.6', :require => false
+  gem 'capybara',               '~> 2.1.0'
+  gem 'cucumber',               '~> 1.0.6'
+  gem 'database_cleaner',       '~> 1.2.0'
+  gem 'selenium-webdriver',     '~> 2.39.0'
 end
  
-# include plugin gemfiles
-Dir.glob(File.join('config', 'plugins', '*')).each do |plugin|
-  plugin_gemfile = File.join(plugin, 'Gemfile')
-  eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile)
+# include gemfiles from enabled plugins
+# plugins in baseplugins/ are not included on purpose. They should not have any
+# dependencies.
+Dir.glob('config/plugins/*/Gemfile').each do |gemfile|
+  eval File.read(gemfile)
 end
@@ -1,191 +0,0 @@
-PATH
-  remote: vendor/prototype_legacy_helper
-  specs:
-    prototype_legacy_helper (0.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    actionmailer (3.2.6)
-      actionpack (= 3.2.6)
-      mail (~> 2.4.4)
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    acts-as-taggable-on (3.0.2)
-      rails (>= 3, < 5)
-    arel (3.0.2)
-    builder (3.0.0)
-    capybara (2.1.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.3.3)
-      ffi (~> 1.0.6)
-    cucumber (1.0.6)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.0.6)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.0.6)
-      nokogiri (>= 1.5.0)
-    daemons (1.1.5)
-    dalli (2.7.0)
-    database_cleaner (1.2.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    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)
-      json (>= 1.4.6)
-    hike (1.2.1)
-    hpricot (0.8.6)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.3)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.11.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
-    pg (0.13.2)
-    polyglot (0.3.3)
-    prototype-rails (3.2.1)
-      rails (~> 3.2)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.6)
-      actionmailer (= 3.2.6)
-      actionpack (= 3.2.6)
-      activerecord (= 3.2.6)
-      activeresource (= 3.2.6)
-      activesupport (= 3.2.6)
-      bundler (~> 1.0)
-      railties (= 3.2.6)
-    rails_autolink (1.1.5)
-      rails (> 3.1)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      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)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.10.0)
-    ruby-feedparser (0.7)
-    rubyzip (1.1.2)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.7)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.15.3)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    websocket (1.0.7)
-    will_paginate (3.0.3)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  acts-as-taggable-on
-  capybara
-  cucumber
-  cucumber-rails
-  daemons
-  dalli
-  database_cleaner
-  exception_notification
-  fast_gettext
-  hpricot
-  mocha
-  nokogiri
-  pg
-  prototype-rails
-  prototype_legacy_helper (= 0.0.0)!
-  rails
-  rails_autolink
-  rake
-  rest-client
-  rmagick
-  rspec
-  rspec-rails
-  ruby-feedparser
-  selenium-webdriver
-  thin
-  will_paginate
@@ -186,8 +186,8 @@ Apache instalation
  
     # apt-get install apache2
  
-Apache configuration
---------------------
+Configuration - noosfero at /
+-----------------------------
  
 First you have to enable the following some apache modules:
  
@@ -257,6 +257,62 @@ Now restart your apache server (as root):
  
     # invoke-rc.d apache2 restart
  
+Configuration - noosfero at a /subdirectory
+-------------------------------------------
+
+This section describes how to configure noosfero at a subdirectory, what is
+specially useful when you want Noosfero to share a domain name with other
+applications. For example you can host noosfero at yourdomain.com/social, a
+webmail application at yourdomain.com/webmail, and have a static HTML website
+at yourdomain.com/.
+
+**NOTE:** Some plugins might not work well with this setting. Before deploying
+this setting, make sure you test that everything  you need works properly with
+it.
+
+The configuration is similar to the main configuration instructions, except for
+the following points. In the description below, replace '/subdirectory' with
+the actual subdirectory you want.
+
+1) add a `prefix: /subdirectory` line to your thin configuration file (thin.yml).
+
+1.1) remember to restart the noosfero application server whenever you make
+changes to that configuration file.
+
+    # service noosfero restart
+
+2) add a line saying `export RAILS_RELATIVE_URL_ROOT=/subdirectory` to
+/etc/default/noosfero (you can create it with just this line if it does not
+exist already).
+
+3) You should add the following apache configuration to an existing virtual
+host (plus the `<Proxy balancer://noosfero>` section as displayed above):
+
+```
+Alias /subdirectory /path/to/noosfero/public
+<Directory "/path/to/noosfero/public">
+  Options FollowSymLinks
+  AllowOverride None
+  Order Allow,Deny
+  Allow from all
+
+  Include /path/to/noosfero/etc/noosfero/apache/cache.conf
+
+  RewriteEngine On
+  RewriteBase /subdirectory
+  # Rewrite index to check for static index.html
+  RewriteRule ^$ index.html [QSA]
+  # Rewrite to check for Rails cached page
+  RewriteRule ^([^.]+)$ $1.html [QSA]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteRule ^(.*)$ http://localhost:3000%{REQUEST_URI} [P,QSA,L]
+</Directory>
+```
+
+3.1) remember to reload the apache server whenever any apache configuration
+file changes.
+
+    # sudo service apache2 reload
  
 Enabling exception notifications
 ================================
 #!/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.
  
 require File.expand_path('../config/application', __FILE__)
  
 Noosfero::Application.load_tasks
+
+[
+  "baseplugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+  "config/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+  "config/plugins/*/vendor/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+].map do |pattern|
+  Dir.glob(pattern).sort
+end.flatten.each do |taskfile|
+  load taskfile
+end
@@ -3,7 +3,7 @@
  
 VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "debian-wheezy"
+  config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
   config.vm.network :forwarded_port, host: 3000, guest: 3000
   config.vm.provision :shell do |shell|
     shell.inline = 'su vagrant -c /vagrant/script/vagrant'
@@ -71,4 +71,22 @@ class AdminPanelController &lt; AdminController
       end
     end
   end
+
+  def manage_organizations_status
+    scope = environment.organizations
+    @filter = params[:filter] || 'any'
+    @title = "Organization profiles"
+    @title = @title+" - "+@filter if @filter != 'any'
+
+    if @filter == 'enabled'
+      scope = scope.visible
+    elsif @filter == 'disabled'
+      scope = scope.disabled
+    end
+
+    scope = scope.order('name ASC')
+
+    @q = params[:q]
+    @collection = find_by_contents(:organizations, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
+  end
 end
@@ -45,9 +45,11 @@ class CategoriesController &lt; AdminController
       if request.post?
         @category.update_attributes!(params[:category])
         @saved = true
+        session[:notice] = _("Category %s saved." % @category.name)
         redirect_to :action => 'index'
       end
     rescue Exception => e
+      session[:notice] = _('Could not save category.')
       render :action => 'edit'
     end
   end
@@ -3,9 +3,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
  
   def available_blocks
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
  
@@ -51,4 +51,10 @@ class FeaturesController &lt; AdminController
     redirect_to :action => 'manage_fields'
   end
  
+  def search_members
+    arg = params[:q].downcase
+    result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%"])
+    render :text => prepare_to_token_input(result).to_json
+  end
+
 end
@@ -0,0 +1,5 @@
+class PluginAdminController < AdminController
+
+  protect 'edit_environment_features', :environment
+
+end
@@ -7,6 +7,12 @@ class ApplicationController &lt; ActionController::Base
   before_filter :detect_stuff_by_domain
   before_filter :init_noosfero_plugins
   before_filter :allow_cross_domain_access
+  before_filter :login_required, :if => :private_environment?
+  before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
+
+  def verify_members_whitelist
+    render_access_denied unless user.is_admin? || environment.in_whitelist?(user)
+  end
  
   after_filter :set_csrf_cookie
  
@@ -34,7 +40,7 @@ class ApplicationController &lt; ActionController::Base
  
     theme_layout = theme_option(:layout)
     if theme_layout
-      theme_view_file('layouts/'+theme_layout) || theme_layout
+      (theme_view_file('layouts/'+theme_layout) || theme_layout).to_s
     else
      'application'
     end
@@ -187,4 +193,8 @@ class ApplicationController &lt; ActionController::Base
     {:results => scope.paginate(paginate_options)}
   end
  
+  def private_environment?
+    @environment.enabled?(:restrict_to_members)
+  end
+
 end
@@ -4,6 +4,12 @@ class CmsController &lt; MyProfileController
  
   include ArticleHelper
  
+  def search_tags
+    arg = params[:term].downcase
+    result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
+  end
+
   def self.protect_if(*args)
     before_filter(*args) do |c|
       user, profile = c.send(:user), c.send(:profile)
@@ -143,6 +149,7 @@ class CmsController &lt; MyProfileController
     end
  
     @article.profile = profile
+    @article.author = user
     @article.last_changed_by = user
     @article.created_by = user
  
@@ -195,7 +202,7 @@ class CmsController &lt; MyProfileController
               :profile => profile,
               :parent => @parent,
               :last_changed_by => user,
-              :created_by => user,
+              :author => user,
             },
             :without_protection => true
           )
@@ -220,7 +227,7 @@ class CmsController &lt; MyProfileController
     @article = profile.articles.find(params[:id])
     if request.post?
       @article.destroy
-      session[:notice] = _("\"#{@article.name}\" was removed.")
+      session[:notice] = _("\"%s\" was removed." % @article.name)
       referer = Rails.application.routes.recognize_path URI.parse(request.referer).path rescue nil
       if referer and referer[:controller] == 'cms' and referer[:action] != 'edit'
         redirect_to referer
@@ -20,7 +20,7 @@ class FriendsController &lt; MyProfileController
  
   class << self
     def per_page
-      10
+      12
     end
   end
   def per_page
@@ -21,6 +21,9 @@ class MembershipsController &lt; MyProfileController
     @back_to = params[:back_to] || url_for(:action => 'index')
     if request.post? && @community.valid?
       @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment}))
+      if @community.new_record?
+        session[:notice] = _('Your new community creation request will be evaluated by an administrator. You will be notified.')
+      end
       redirect_to @back_to
       return
     end
@@ -16,14 +16,16 @@ class ProfileEditorController &lt; MyProfileController
     if request.post?
       params[:profile_data][:fields_privacy] ||= {} if profile.person? && params[:profile_data].is_a?(Hash)
       Profile.transaction do
-      Image.transaction do
-        if @profile_data.update_attributes(params[:profile_data])
-          redirect_to :action => 'index', :profile => profile.identifier
-        else
-          profile.identifier = params[:profile] if profile.identifier.blank?
+        Image.transaction do
+          begin
+            @plugins.dispatch(:profile_editor_transaction_extras)
+            @profile_data.update_attributes!(params[:profile_data])
+            redirect_to :action => 'index', :profile => profile.identifier
+          rescue Exception => ex
+            profile.identifier = params[:profile] if profile.identifier.blank?
+          end
         end
       end
-      end
     end
   end
  
@@ -72,10 +74,51 @@ class ProfileEditorController &lt; MyProfileController
     if request.post?
       if @profile.destroy
         session[:notice] = _('The profile was deleted.')
-        redirect_to :controller => 'home'
+        if(params[:return_to])
+          redirect_to params[:return_to]
+        else
+          redirect_to :controller => 'home'
+        end
       else
         session[:notice] = _('Could not delete profile')
       end
     end
   end
+
+  def deactivate_profile
+    if environment.admins.include?(current_person)
+      profile = environment.profiles.find(params[:id])
+      if profile.disable
+        profile.save
+        session[:notice] = _("The profile '#{profile.name}' was deactivated.")
+      else
+        session[:notice] = _('Could not deactivate profile.')
+      end
+    end
+
+    redirect_to_previous_location
+  end
+
+  def activate_profile
+    if environment.admins.include?(current_person)
+      profile = environment.profiles.find(params[:id])
+
+      if profile.enable
+        session[:notice] = _("The profile '#{profile.name}' was activated.")
+      else
+        session[:notice] = _('Could not activate the profile.')
+      end
+    end
+
+    redirect_to_previous_location
+  end
+
+  protected
+
+  def redirect_to_previous_location
+    back = request.referer
+    back = "/" if back.nil?
+
+    redirect_to back
+  end
 end
@@ -4,6 +4,7 @@ class TasksController &lt; MyProfileController
  
   def index
     @filter = params[:filter_type].blank? ? nil : params[:filter_type]
+    @task_types = Task.pending_types_for(profile)
     @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
     @failed = params ? params[:failed] : {}
   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
  
@@ -15,11 +15,23 @@ class AccountController &lt; ApplicationController
  
   def activate
     @user = User.find_by_activation_code(params[:activation_code]) if params[:activation_code]
-    if @user and @user.activate
-      @message = _("Your account has been activated, now you can log in!")
-      check_redirection
-      session[:join] = params[:join] unless params[:join].blank?
-      render :action => 'login', :userlogin => @user.login
+    if @user
+      unless @user.environment.enabled?('admin_must_approve_new_users') 
+        if @user.activate
+          @message = _("Your account has been activated, now you can log in!")
+          check_redirection
+          session[:join] = params[:join] unless params[:join].blank?
+          render :action => 'login', :userlogin => @user.login
+        end
+      else
+        if @user.create_moderate_task
+          session[:notice] = _('Thanks for registering. The administrators were notified.')
+          @register_pending = true
+          @user.activation_code = nil
+          @user.save!
+          redirect_to :controller => :home
+        end      
+      end
     else
       session[:notice] = _("It looks like you're trying to activate an account. Perhaps have already activated this account?")
       redirect_to :controller => :home
@@ -85,6 +97,7 @@ class AccountController &lt; ApplicationController
       @user.return_to = session[:return_to]
       @person = Person.new(params[:profile_data])
       @person.environment = @user.environment
+
       if request.post?
         if may_be_a_bot
           set_signup_start_time_for_now
@@ -103,11 +116,20 @@ class AccountController &lt; ApplicationController
             invitation.update_attributes!({:friend => @user.person})
             invitation.finish
           end
+
+          unless params[:file].nil?
+            image = Image::new :uploaded_data=> params[:file][:image]
+
+            @user.person.image = image
+            @user.person.save
+          end
+
           if @user.activated?
             self.current_user = @user
             check_join_in_community(@user)
             go_to_signup_initial_page
           else
+            session[:notice] = _('Thanks for registering!')
             @register_pending = true
           end
         end
@@ -171,7 +193,7 @@ class AccountController &lt; ApplicationController
         else
           @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
         end
-      rescue ActiveRecord::RecordInvald
+      rescue ActiveRecord::RecordInvalid
         @change_password.errors[:base] << _('Could not perform password recovery for the user.')
       end
     end
@@ -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
@@ -19,9 +19,13 @@ class ChatController &lt; PublicController
   def avatar
     profile = environment.profiles.find_by_identifier(params[:id])
     filename, mimetype = profile_icon(profile, :minor, true)
-    data = File.read(File.join(Rails.root, 'public', filename))
-    render :text => data, :layout => false, :content_type => mimetype
-    expires_in 24.hours
+    if filename =~ /^(https?:)?\/\//
+      redirect_to filename
+    else
+      data = File.read(File.join(Rails.root, 'public', filename))
+      render :text => data, :layout => false, :content_type => mimetype
+      expires_in 24.hours
+    end
   end
  
   def index
@@ -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
@@ -126,7 +126,7 @@ class ContentViewerController &lt; ApplicationController
     elsif !@page.display_to?(user)
       if !profile.public?
         private_profile_partial_parameters
-        render :template => 'profile/_private_profile', :status => 403
+        render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
         allowed = false
       else #if !profile.visible?
         render_access_denied
@@ -17,7 +17,11 @@ class ProfileController &lt; PublicController
     end
     @tags = profile.article_tags
     unless profile.display_info_to?(user)
-      profile.visible? ? private_profile : invisible_profile
+      if profile.visible?
+        private_profile
+      else
+        invisible_profile
+      end
     end
   end
  
@@ -61,13 +65,13 @@ class ProfileController &lt; PublicController
  
   def friends
     if is_cache_expired?(profile.friends_cache_key(params))
-      @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
+      @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.friends.count)
     end
   end
  
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
+      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
     end
   end
  
@@ -315,7 +319,7 @@ class ProfileController &lt; PublicController
         abuse_report = AbuseReport.new(params[:abuse_report])
         if !params[:content_type].blank?
           article = params[:content_type].constantize.find(params[:content_id])
-          abuse_report.content = instance_eval(&article.reported_version)
+          abuse_report.content = article_reported_version(article)
         end
  
         user.register_report(abuse_report, profile)
@@ -394,6 +398,7 @@ class ProfileController &lt; PublicController
  
   def private_profile
     private_profile_partial_parameters
+    render :action => 'index', :status => 403
   end
  
   def invisible_profile
@@ -90,10 +90,14 @@ class SearchController &lt; PublicController
   end
  
   def events
-    year = (params[:year] ? params[:year].to_i : Date.today.year)
-    month = (params[:month] ? params[:month].to_i : Date.today.month)
-    day = (params[:day] ? params[:day].to_i : Date.today.day)
-    @date = build_date(year, month, day)
+    if params[:year].blank? && params[:year].blank? && params[:day].blank?
+      @date = Date.today
+    else
+      year = (params[:year] ? params[:year].to_i : Date.today.year)
+      month = (params[:month] ? params[:month].to_i : Date.today.month)
+      day = (params[:day] ? params[:day].to_i : 1)
+      @date = build_date(year, month, day)
+    end
     date_range = (@date - 1.month).at_beginning_of_month..(@date + 1.month).at_end_of_month
  
     @events = []
@@ -304,7 +304,7 @@ module ApplicationHelper
   def partial_for_class(klass, prefix=nil, suffix=nil)
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
     name = klass.name.underscore
-    controller.view_paths.reverse_each do |view_path|
+    controller.view_paths.each do |view_path|
       partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
       return partial if partial
     end
@@ -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
@@ -433,19 +433,19 @@ module ApplicationHelper
   end
  
   def theme_site_title
-    theme_include('site_title')
+    @theme_site_title ||= theme_include 'site_title'
   end
  
   def theme_header
-    theme_include('header')
+    @theme_header ||= theme_include 'header'
   end
  
   def theme_footer
-    theme_include('footer')
+    @theme_footer ||= theme_include 'footer'
   end
  
   def theme_extra_navigation
-    theme_include('navigation')
+    @theme_extra_navigation ||= theme_include 'navigation'
   end
  
   def is_testing_theme
@@ -482,7 +482,12 @@ module ApplicationHelper
             '/images/icons-app/enterprise-'+ size.to_s() +'.png'
           end
         else
-          '/images/icons-app/person-'+ size.to_s() +'.png'
+          pixels = Image.attachment_options[:thumbnails][size].split('x').first
+          gravatar_profile_image_url(
+            profile.email,
+            :size => pixels,
+            :d => gravatar_default
+          )
         end
       filename = default_or_themed_icon(icon)
     end
@@ -602,7 +607,7 @@ module ApplicationHelper
   end
  
   def gravatar_default
-    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar']
+    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar'] || 'mm'
   end
  
   attr_reader :environment
@@ -669,13 +674,14 @@ module ApplicationHelper
     html.join "\n"
   end
  
+  def theme_javascript_src
+    script = File.join theme_path, 'theme.js'
+    script if File.exists? File.join(Rails.root, 'public', script)
+  end
+
   def theme_javascript_ng
-    script = File.join(theme_path, 'theme.js')
-    if File.exists?(File.join(Rails.root, 'public', script))
-      javascript_include_tag script
-    else
-      nil
-    end
+    script = theme_javascript_src
+    javascript_include_tag script if script
   end
  
   def file_field_or_thumbnail(label, image, i)
@@ -902,13 +908,15 @@ module ApplicationHelper
   end
  
   def page_title
-    (@page ? @page.title + ' - ' : '') +
-    (@topic ? @topic.title + ' - ' : '') +
-    (@section ? @section.title + ' - ' : '') +
-    (@toc ? _('Online Manual') + ' - ' : '') +
-    (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
-    (profile ? profile.short_name : environment.name) +
-    (@category ? " - #{@category.full_name}" : '')
+    CGI.escapeHTML(
+      (@page ? @page.title + ' - ' : '') +
+      (@topic ? @topic.title + ' - ' : '') +
+      (@section ? @section.title + ' - ' : '') +
+      (@toc ? _('Online Manual') + ' - ' : '') +
+      (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
+      (profile ? profile.short_name : environment.name) +
+      (@category ? " - #{@category.full_name}" : '')
+    )
   end
  
   # DEPRECATED. Do not use this.
@@ -1095,7 +1103,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 +1116,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
@@ -1225,20 +1233,7 @@ module ApplicationHelper
   def add_zoom_to_images
     stylesheet_link_tag('jquery.fancybox') +
     javascript_include_tag('jquery.fancybox.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'))
+    javascript_tag("apply_zoom_to_images(#{_('Zoom in').to_json})")
   end
  
   def render_dialog_error_messages(instance_name)
@@ -1293,11 +1288,13 @@ module ApplicationHelper
   end
  
   def delete_article_message(article)
-    if article.folder?
-      _("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")
-    else
-      _("Are you sure that you want to remove the item \"#{article.name}\"?")
-    end
+    CGI.escapeHTML(
+      if article.folder?
+        _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
+      else
+        _("Are you sure that you want to remove the item \"%s\"?") % article.name
+      end
+    )
   end
  
   def expirable_link_to(expired, content, url, options = {})
@@ -1371,7 +1368,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
@@ -1383,7 +1380,7 @@ module ApplicationHelper
       #     are old things that do not support it we are keeping this hot spot.
       html = @plugins.pipeline(:parse_content, html, source).first
     end
-    html
+    html && html.html_safe
   end
  
   def convert_macro(html, source)
@@ -1413,4 +1410,14 @@ module ApplicationHelper
     content_tag('ul', article.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:version => v.version))})
   end
  
+  def labelled_colorpicker_field(human_name, object_name, method, options = {})
+    options[:id] ||= 'text-field-' + FormsHelper.next_id_number
+    content_tag('label', human_name, :for => options[:id], :class => 'formlabel') +
+    colorpicker_field(object_name, method, options.merge(:class => 'colorpicker_field'))
+  end
+
+  def colorpicker_field(object_name, method, options = {})
+    text_field(object_name, method, options.merge(:class => 'colorpicker_field'))
+  end
+
 end
@@ -3,6 +3,12 @@ module ArticleHelper
   include PrototypeHelper
   include TokenHelper
  
+  def article_reported_version(article)
+    search_path = Rails.root.join('app', 'views', 'shared', 'reported_versions')
+    partial_path = File.join('shared', 'reported_versions', 'profile', partial_for_class_in_view_path(article.class, search_path))
+    render_to_string(:partial => partial_path, :locals => {:article => article})
+  end
+
   def custom_options_for_article(article, tokenized_children)
     @article = article
  
@@ -83,6 +89,10 @@ module ArticleHelper
     array.map { |object| {:id => object.id, :name => object.name} }
   end
  
+  def prepare_to_token_input_by_label(array)
+    array.map { |object| {:label => object.name, :value => object.name} }
+  end
+
   def cms_label_for_new_children
     _('New article')
   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)
 module CategoriesHelper
  
-
-  COLORS = [
-    [ N_('Do not display at the menu'), nil ],
-    [ N_('Orange'), 1],
-    [ N_('Green'), 2],
-    [ N_('Purple'), 3],
-    [ N_('Red'), 4],
-    [ N_('Dark Green'), 5],
-    [ N_('Blue Oil'), 6],
-    [ N_('Blue'), 7],
-    [ N_('Brown'), 8],
-    [ N_('Light Green'), 9],
-    [ N_('Light Blue'), 10],
-    [ N_('Dark Blue'), 11],
-    [ N_('Blue Pool'), 12],
-    [ N_('Beige'), 13],
-    [ N_('Yellow'), 14],
-    [ N_('Light Brown'), 15]
-  ]
-
   TYPES = [
     [ _('General Category'), Category.to_s ],
     [ _('Product Category'), ProductCategory.to_s ],
     [ _('Region'), Region.to_s ],
   ]
  
-  def select_color_for_category
-    if @category.top_level?
-      labelled_form_field(_('Display at the menu?'), select('category', 'display_color', CategoriesHelper::COLORS.map {|item| [gettext(item[0]), item[1]] }))
-    else
-      ""
-    end
-  end
-
-  def display_color_for_category(category)
-    color = category.display_color
-    if color.nil?
-      ""
-    else
-      "[" + gettext(CategoriesHelper::COLORS.find {|item| item[1] == color}.first) + "]"
-    end
-  end
-
   def select_category_type(field)
     value = params[field]
     labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
   end
  
+  def category_color_style(category)
+    return '' if category.nil? or category.display_color.blank?
+    'background-color: #'+category.display_color+';'
+  end
+
   #FIXME make this test
   def selected_category_link(cat)
     js_remove = "jQuery('#selected-category-#{cat.id}').remove();"
@@ -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.to_i)
   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
@@ -17,6 +17,8 @@ module LayoutHelper
     unless plugins_javascripts.empty?
       output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
     end
+    output += theme_javascript_ng.to_s
+
     output
   end
  
@@ -27,6 +29,7 @@ module LayoutHelper
       'thickbox',
       'lightbox',
       'colorbox',
+      'inputosaurus',
       pngfix_stylesheet_path,
     ] + tokeninput_stylesheets
     plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
@@ -83,6 +86,10 @@ module LayoutHelper
     theme_path + '/style.css'
   end
  
+  def layout_template
+    if profile then profile.layout_template else environment.layout_template end
+  end
+
   def addthis_javascript
     if NOOSFERO_CONF['addthis_enabled']
       '<script src="https://s7.addthis.com/js/152/addthis_widget.js"></script>'
@@ -90,7 +97,7 @@ module LayoutHelper
   end
  
   def meta_description_tag(article=nil)
-    article ? truncate(strip_tags(article.body.to_s), :length => 200) : environment.name
+    article ? CGI.escapeHTML(truncate(strip_tags(article.body.to_s), :length => 200)) : environment.name
   end
 end
  
 module ProfileHelper
  
-  def display_field(title, profile, field, force = false)
+  COMMON_CATEGORIES = ActiveSupport::OrderedHash.new
+  COMMON_CATEGORIES[:content] = [:blogs, :image_galleries, :events, :article_tags]
+  COMMON_CATEGORIES[:interests] = [:interests]
+  COMMON_CATEGORIES[:general] = nil
+
+  PERSON_CATEGORIES = ActiveSupport::OrderedHash.new
+  PERSON_CATEGORIES[:basic_information] = [:nickname, :sex, :birth_date, :location, :privacy_setting, :created_at]
+  PERSON_CATEGORIES[:contact] = [:contact_phone, :cell_phone, :comercial_phone, :contact_information, :email, :personal_website, :jabber_id]
+  PERSON_CATEGORIES[:location] = [:address, :address_reference, :zip_code, :city, :state, :district, :country, :nationality]
+  PERSON_CATEGORIES[:work] = [:organization, :organization_website, :professional_activity]
+  PERSON_CATEGORIES[:study] = [:schooling, :formation, :area_of_study]
+  PERSON_CATEGORIES[:network] = [:friends, :communities, :enterprises]
+  PERSON_CATEGORIES.merge!(COMMON_CATEGORIES)
+
+  ORGANIZATION_CATEGORIES = ActiveSupport::OrderedHash.new
+  ORGANIZATION_CATEGORIES[:basic_information] = [:display_name, :created_at, :foundation_year, :type, :language, :members_count, :location, :address_reference, :historic_and_current_context, :admins]
+  ORGANIZATION_CATEGORIES[:contact] = [:contact_person, :contact_phone, :contact_email, :organization_website, :jabber_id]
+  ORGANIZATION_CATEGORIES[:economic] = [:business_name, :acronym, :economic_activity, :legal_form, :products, :activities_short_description, :management_information]
+  ORGANIZATION_CATEGORIES.merge!(COMMON_CATEGORIES)
+
+  CATEGORY_MAP = ActiveSupport::OrderedHash.new
+  CATEGORY_MAP[:person] = PERSON_CATEGORIES
+  CATEGORY_MAP[:organization] = ORGANIZATION_CATEGORIES
+
+  FORCE = {
+    :person => [:privacy_setting],
+    :organization => [:privacy_setting, :location],
+  }
+
+  MULTIPLE = {
+    :person => [:blogs, :image_galleries, :interests],
+    :organization => [:blogs, :image_galleries, :interests],
+  }
+
+  CUSTOM_LABELS = {
+    :zip_code => _('ZIP code'),
+    :email => _('e-Mail'),
+    :jabber_id => _('Jabber'),
+    :birth_date => _('Date of birth'),
+    :created_at => _('Profile created at'),
+    :members_count => _('Members'),
+    :privacy_setting => _('Privacy setting'),
+    :article_tags => _('Tags')
+  }
+
+  EXCEPTION = {
+    :person => [:image, :preferred_domain, :description, :tag_list],
+    :organization => [:image, :preferred_domain, :description, :tag_list, :address, :zip_code, :city, :state, :country, :district]
+  }
+
+  def general_fields
+    categorized_fields = CATEGORY_MAP[kind].values.flatten
+    profile.class.fields.map(&:to_sym) - categorized_fields - EXCEPTION[kind]
+  end
+
+  def kind
+    if profile.kind_of?(Person)
+      :person
+    else
+      :organization
+    end
+  end
+
+  def title(field, entry = nil)
+    return self.send("#{field}_custom_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
+    CUSTOM_LABELS[field.to_sym] || _(field.to_s.humanize)
+  end
+
+  def display_field(field)
+    force = FORCE[kind].include?(field)
+    multiple = MULTIPLE[kind].include?(field)
     unless force || profile.may_display_field_to?(field, user)
       return ''
     end
-    value = profile.send(field)
-    if !value.blank?
-      if block_given?
-        value = yield(value)
-      end
-      content_tag('tr', content_tag('td', title, :class => 'field-name') + content_tag('td', value))
+    value = begin profile.send(field) rescue nil end
+    return '' if value.blank?
+    if value.kind_of?(Hash)
+      content = self.send("treat_#{field}", value)
+      content_tag('tr', content_tag('td', title(field), :class => 'field-name') + content_tag('td', content))
     else
-      ''
+      entries = multiple ? value : [] << value
+      entries.map do |entry|
+        content = self.send("treat_#{field}", entry)
+        unless content.blank?
+          content_tag('tr', content_tag('td', title(field, entry), :class => 'field-name') + content_tag('td', content))
+        end
+      end.join("\n")
     end
   end
  
-  def display_contact(profile)
-    fields = []
-    fields << display_field(_('Address:'), profile, :address).html_safe
-    fields << display_field(_('ZIP code:'), profile, :zip_code).html_safe
-    fields << display_field(_('Contact phone:'), profile, :contact_phone).html_safe
-    fields << display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) }.html_safe
-    fields << display_field(_('Personal website:'), profile, :personal_website).html_safe
-    fields << display_field(_('Jabber:'), profile, :jabber_id).html_safe
-    if fields.reject!(&:blank?).empty?
-      ''
-    else
-      content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + fields.join.html_safe
+  def treat_email(email)
+    link_to_email(email)
+  end
+
+  def treat_organization_website(url)
+    link_to(url, url)
+  end
+
+  def treat_sex(gender)
+    { 'male' => _('Male'), 'female' => _('Female') }[gender]
+  end
+
+  def treat_date(date)
+    show_date(date.to_date)
+  end
+  alias :treat_birth_date :treat_date
+  alias :treat_created_at :treat_date
+
+  def treat_friends(friends)
+     link_to friends.count, :controller => 'profile', :action => 'friends'
+  end
+
+  def treat_communities(communities)
+    link_to communities.count, :controller => "profile", :action => 'communities'
+  end
+
+  def treat_enterprises(enterprises)
+    if environment.disabled?('disable_asset_enterprises')
+      link_to enterprises.count, :controller => "profile", :action => 'enterprises'
+    end
+  end
+
+  def treat_members_count(count)
+    link_to count, :controller => 'profile', :action => 'members'
+  end
+
+  def treat_products(products)
+    if profile.kind_of?(Enterprise) && profile.environment.enabled?('products_for_enterprises')
+      link_to _('Products/Services'), :controller => 'catalog', :action => 'index'
     end
   end
  
-  def display_work_info(profile)
-    organization = display_field(_('Organization:'), profile, :organization)
-    organization_site = display_field(_('Organization website:'), profile, :organization_website) { |url| link_to(url, url) }
-    if organization.blank? && organization_site.blank?
-      ''
+  def treat_admins(admins)
+    profile.admins.map { |admin| link_to(admin.short_name, admin.url)}.join(', ')
+  end
+
+  def treat_blogs(blog)
+    link_to(n_('One post', '%{num} posts', blog.posts.published.count) % { :num => blog.posts.published.count }, blog.url)
+  end
+
+  def treat_image_galleries(gallery)
+    link_to(n_('One picture', '%{num} pictures', gallery.images.published.count) % { :num => gallery.images.published.count }, gallery.url)
+  end
+
+  def treat_events(events)
+    link_to events.published.count, :controller => 'events', :action => 'events'
+  end
+
+  def treat_article_tags(tags)
+    tag_cloud @tags, :id, { :action => 'tags' }, :max_size => 18, :min_size => 10
+  end
+
+  def treat_interests(interest)
+    link_to interest.name, :controller => 'search', :action => 'category_index', :category_path => interest.explode_path
+  end
+
+  def article_custom_title(article)
+    article.name
+  end
+  alias :blogs_custom_title :article_custom_title
+  alias :image_galleries_custom_title :article_custom_title
+
+  def interests_custom_title(interest)
+    ''
+  end
+
+  def method_missing(method, *args, &block)
+    if method.to_s =~ /^treat_(.+)$/
+      args[0]
+    elsif method.to_s =~ /^display_(.+)$/ && CATEGORY_MAP[kind].has_key?($1.to_sym)
+      category = $1.to_sym
+      fields = category == :general ? general_fields : CATEGORY_MAP[kind][category]
+      contents = []
+
+      fields.each do |field|
+        contents << display_field(field).html_safe
+      end
+
+      contents = contents.delete_if(&:blank?)
+
+      unless contents.empty?
+        content_tag('tr', content_tag('th', title(category), { :colspan => 2 })) + contents.join.html_safe
+      else
+        ''
+      end
     else
-      content_tag('tr', content_tag('th', _('Work'), { :colspan => 2 })) + organization + organization_site
+      super
     end
   end
  
 module RoleHelper
+
+  def role_available_permissions(role)
+    role.kind == "Environment" ? ['Environment', 'Profile'] : [role.kind]
+  end
+
 end
@@ -56,12 +56,12 @@ module SweeperHelper
     if profile
       profile.blocks.each {|block|
         conditions = block.class.expire_on
-        blocks_to_expire << block unless (conditions[:profile] & causes).empty?
+        blocks_to_expire << block unless (conditions[:profile] & causes).blank?
       }
     end
     environment.blocks.each {|block|
       conditions = block.class.expire_on
-      blocks_to_expire << block unless (conditions[:environment] & causes).empty?
+      blocks_to_expire << block unless (conditions[:environment] & causes).blank?
     }
  
     blocks_to_expire.uniq!
@@ -0,0 +1,51 @@
+module TinymceHelper
+  include MacrosHelper
+
+  def tinymce_js
+    output = ''
+    output += javascript_include_tag 'tinymce/js/tinymce/tinymce.min.js'
+    output += javascript_include_tag 'tinymce/js/tinymce/jquery.tinymce.min.js'
+    output += javascript_include_tag 'tinymce.js'
+    output += include_macro_js_files.to_s
+    output
+  end
+
+  def tinymce_init_js options = {}
+    options.merge! :document_base_url => environment.top_url,
+      :content_css => "/stylesheets/tinymce.css,#{macro_css_files}",
+      :plugins => %w[compat3x advlist autolink lists link image charmap print preview hr anchor pagebreak
+        searchreplace wordcount visualblocks visualchars code fullscreen
+        insertdatetime media nonbreaking save table contextmenu directionality
+        emoticons template paste textcolor colorpicker textpattern],
+      :language => tinymce_language
+
+    options[:toolbar1] = "insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
+    if options[:mode] == 'simple'
+      options[:menubar] = false
+    else
+      options[:menubar] = 'edit insert view tools'
+      options[:toolbar2] = 'print preview code media | table'
+
+      options[:toolbar2] += ' | macros'
+      macros_with_buttons.each do |macro|
+        options[:toolbar2] += " #{macro.identifier}"
+      end
+    end
+
+    options[:macros_setup] = macros_with_buttons.map do |macro|
+      <<-EOS
+        ed.addButton('#{macro.identifier}', {
+          title: #{macro_title(macro).to_json},
+          onclick: #{generate_macro_config_dialog macro},
+          image : '#{macro.configuration[:icon_path]}'
+        });
+      EOS
+    end
+
+    #cleanup non tinymce options
+    options = options.except :mode
+
+    "noosfero.tinymce.init(#{options.to_json})"
+  end
+
+end
@@ -18,6 +18,7 @@ module TokenHelper
     options[:on_add] ||= 'null'
     options[:on_delete] ||= 'null'
     options[:on_ready] ||= 'null'
+    options[:query_param] ||= 'q'
  
     result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
     result += javascript_tag("jQuery('##{element_id}')
@@ -30,7 +31,7 @@ module TokenHelper
         searchDelay: #{options[:search_delay].to_json},
         preventDuplicates: #{options[:prevent_duplicates].to_json},
         backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
-        queryParam: #{name.to_json},
+        queryParam: #{options[:query_param].to_json},
         tokenLimit: #{options[:token_limit].to_json},
         onResult: #{options[:on_result]},
         onAdd: #{options[:on_add]},
@@ -48,4 +49,4 @@ module TokenHelper
     result
   end
  
-end
 \ No newline at end of file
+end
@@ -40,6 +40,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? }
@@ -48,6 +54,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'
  
@@ -150,14 +157,17 @@ class Article &lt; ActiveRecord::Base
     self.profile
   end
  
-  def self.human_attribute_name(attrib, options = {})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
     when :name
       _('Title')
     else
-      _(self.superclass.human_attribute_name(attrib))
+      _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   def css_class_list
     [self.class.name.to_css_class]
@@ -275,13 +285,6 @@ class Article &lt; ActiveRecord::Base
     end
   end
  
-  def reported_version(options = {})
-    article = self
-    search_path = Rails.root.join('app', 'views', 'shared', 'reported_versions')
-    partial_path = File.join('shared', 'reported_versions', partial_for_class_in_view_path(article.class, search_path))
-    lambda { render_to_string(:partial => partial_path, :locals => {:article => article}) }
-  end
-
   # returns the data of the article. Must be overriden in each subclass to
   # provide the correct content for the article.
   def data
@@ -456,10 +459,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 :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
   scope :with_types, lambda { |types| { :conditions => [ 'articles.type IN (?)', types ] } }
@@ -469,7 +472,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
@@ -496,6 +499,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
  
@@ -515,9 +519,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
@@ -632,35 +641,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
@@ -75,7 +75,7 @@ class Block &lt; ActiveRecord::Base
     if context[:article]
       return context[:article] == owner.home_page
     else
-      return context[:request_path] == '/'
+      return home_page_path?(context[:request_path])
     end
   end
  
@@ -83,7 +83,7 @@ class Block &lt; ActiveRecord::Base
     if context[:article]
       return context[:article] != owner.home_page
     else
-      return context[:request_path] != '/' + (owner.kind_of?(Profile) ? owner.identifier : '')
+      return !home_page_path?(context[:request_path])
     end
   end
  
@@ -114,7 +114,7 @@ class Block &lt; ActiveRecord::Base
   # blocks to choose one to include in the design.
   #
   # Must be redefined in subclasses to match the description of each block
-  # type. 
+  # type.
   def self.description
     '(dummy)'
   end
@@ -124,13 +124,13 @@ class Block &lt; ActiveRecord::Base
   # This method can return several types of objects:
   #
   # * <tt>String</tt>: if the string starts with <tt>http://</tt> or <tt>https://</tt>, then it is assumed to be address of an IFRAME. Otherwise it's is used as regular HTML.
-  # * <tt>Hash</tt>: the hash is used to build an URL that is used as the address for a IFRAME. 
+  # * <tt>Hash</tt>: the hash is used to build an URL that is used as the address for a IFRAME.
   # * <tt>Proc</tt>: the Proc is evaluated in the scope of BoxesHelper. The
   # block can then use <tt>render</tt>, <tt>link_to</tt>, etc.
   #
   # The method can also return <tt>nil</tt>, which means "no content".
   #
-  # See BoxesHelper#extract_block_content for implementation details. 
+  # See BoxesHelper#extract_block_content for implementation details.
   def content(args={})
     "This is block number %d" % self.id
   end
@@ -192,7 +192,7 @@ class Block &lt; ActiveRecord::Base
  
   # Override in your subclasses.
   # Define which events and context should cause the block cache to expire
-  # Possible events are: :article, :profile, :friendship, :category
+  # Possible events are: :article, :profile, :friendship, :category, :role_assignment
   # Possible contexts are: :profile, :environment
   def self.expire_on
     {
@@ -234,4 +234,26 @@ class Block &lt; ActiveRecord::Base
     duplicated_block
   end
  
+  def copy_from(block)
+    self.settings = block.settings
+    self.position = block.position
+  end
+
+  private
+
+  def home_page_path
+    home_page_url = Noosfero.root('/')
+
+    if owner.kind_of?(Profile)
+      home_page_url += "profile/" if owner.home_page.nil?
+      home_page_url += owner.identifier
+    end
+
+    return home_page_url
+  end
+
+  def home_page_path? path
+    return path == home_page_path || path == (home_page_path + '/')
+  end
+
 end
@@ -28,9 +28,6 @@ class Box &lt; ActiveRecord::Base
       CategoriesBlock,
       CommunitiesBlock,
       EnterprisesBlock,
-      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-      #      the Noosfero core soon, see ActionItem3045
-      EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
       FeedReaderBlock,
@@ -53,9 +50,6 @@ class Box &lt; ActiveRecord::Base
       CommunitiesBlock,
       DisabledEnterpriseMessageBlock,
       EnterprisesBlock,
-      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-      #      the Noosfero core soon, see ActionItem3045
-      EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
       FeaturedProductsBlock,
@@ -14,9 +14,6 @@ class Category &lt; ActiveRecord::Base
   validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('{fn} is already being used by another category.').fix_i18n
   belongs_to :environment
  
-  validates_inclusion_of :display_color, :in => 1..15, :allow_nil => true
-  validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('{fn} was already assigned to another category.').fix_i18n
-
   # Finds all top level categories for a given environment. 
   scope :top_level_for, lambda { |environment|
     {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
@@ -42,6 +39,13 @@ class Category &lt; ActiveRecord::Base
  
   acts_as_having_image
  
+  before_save :normalize_display_color
+
+  def normalize_display_color
+    display_color.gsub!('#', '') if display_color
+    display_color = nil if display_color.blank?
+  end
+
   scope :from_types, lambda { |types|
     types.select{ |t| t.blank? }.empty? ?
       { :conditions => { :type => types } } :
@@ -101,4 +105,12 @@ class Category &lt; ActiveRecord::Base
     self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
   end
  
+  def with_color
+    if display_color.blank?
+      parent.nil? ? nil : parent.with_color
+    else
+      self
+    end
+  end
+
 end
@@ -2,16 +2,19 @@ class ChangePassword &lt; Task
  
   attr_accessor :password, :password_confirmation
  
-  def self.human_attribute_name(attrib, options = {})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
     when :password
       _('Password')
     when :password_confirmation
       _('Password Confirmation')
     else
-      _(self.superclass.human_attribute_name(attrib))
+      _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   validates_presence_of :requestor
  
@@ -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
@@ -50,16 +50,6 @@ class Community &lt; Organization
     super + FIELDS
   end
  
-  validate :presence_of_required_fieds
-
-  def presence_of_required_fieds
-    self.required_fields.each do |field|
-      if self.send(field).blank?
-        self.errors.add_on_blank(field)
-      end
-    end
-  end
-
   def active_fields
     environment ? environment.active_community_fields : []
   end
@@ -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
   ###############
@@ -25,7 +25,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
@@ -56,16 +59,6 @@ class Enterprise &lt; Organization
     super + FIELDS
   end
  
-  validate :presence_of_required_fieds
-
-  def presence_of_required_fieds
-    self.required_fields.each do |field|
-      if self.send(field).blank?
-        self.errors.add_on_blank(field)
-      end
-    end
-  end
-
   def active_fields
     environment ? environment.active_enterprise_fields : []
   end
@@ -104,7 +97,12 @@ class Enterprise &lt; Organization
     self.tasks.where(:type => 'EnterpriseActivation').first
   end
  
-  def enable(owner)
+  def enable(owner = nil)
+    if owner.nil?
+      self.visible = true
+      return self.save
+    end
+
     return if enabled
     # must be set first for the following to work
     self.enabled = true
@@ -3,7 +3,7 @@
 # domains.
 class Environment < ActiveRecord::Base
  
-  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body
+  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist
  
   has_many :users
  
@@ -124,6 +124,7 @@ class Environment &lt; ActiveRecord::Base
       'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
       'enable_organization_url_change' => _("Allow organizations to change their URL"),
       'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
+      'admin_must_approve_new_users' => _("Admin must approve registration of new users"),
       'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
       'xmpp_chat' => _('XMPP/Jabber based chat'),
       'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
@@ -132,7 +133,8 @@ class Environment &lt; ActiveRecord::Base
       'send_welcome_email_to_new_users' => _('Send welcome e-mail to new users'),
       'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login'),
       'display_my_communities_on_user_menu' => _('Display on menu the list of communities the user can manage'),
-      'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage')
+      'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage'),
+      'restrict_to_members' => _('Show content only to members')
     }
   end
  
@@ -175,9 +177,6 @@ class Environment &lt; ActiveRecord::Base
  
     # "left" area
     env.boxes[1].blocks << LoginBlock.new
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    env.boxes[1].blocks << EnvironmentStatisticsBlock.new
     env.boxes[1].blocks << RecentDocumentsBlock.new
  
     # "right" area
@@ -303,6 +302,17 @@ class Environment &lt; ActiveRecord::Base
     settings[:signup_welcome_screen_body].present?
   end
  
+  settings_items :members_whitelist_enabled, :type => :boolean, :default => false
+  settings_items :members_whitelist, :type => Array, :default => []
+
+  def in_whitelist?(person)
+    !members_whitelist_enabled || members_whitelist.include?(person.id)
+  end
+
+  def members_whitelist=(members)
+    settings[:members_whitelist] = members.split(',').map(&:to_i)
+  end
+
   def news_amount_by_folder=(amount)
     settings[:news_amount_by_folder] = amount.to_i
   end
@@ -650,6 +660,7 @@ class Environment &lt; ActiveRecord::Base
     url = 'http://'
     url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
     url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port)
+    url << Noosfero.root('')
     url
   end
  
@@ -813,7 +824,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def notification_emails
-    [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
+    [contact_email].select(&:present?) + admins.map(&:email)
   end
  
   after_create :create_templates
@@ -1,33 +0,0 @@
-# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-#      the Noosfero core soon, see ActionItem3045
-
-class EnvironmentStatisticsBlock < Block
-
-  def self.description
-    _('Environment stastistics (DEPRECATED)')
-  end
-
-  def default_title
-    _('Statistics for %s') % owner.name
-  end
-
-  def help
-    _('This block presents some statistics about your environment.')
-  end
-
-  def content(args={})
-    users = owner.people.visible.count
-    enterprises = owner.enterprises.visible.count
-    communities = owner.communities.visible.count
-
-    info = []
-    info << (n_('One user', '%{num} users', users) % { :num => users })
-    unless owner.enabled?('disable_asset_enterprises')
-      info << (n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
-    end
-    info << (n_('One community', '%{num} communities', communities) % { :num => communities })
-
-    block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
-  end
-
-end
@@ -13,6 +13,7 @@ class ExternalFeed &lt; ActiveRecord::Base
   attr_accessible :address, :enabled
  
   def add_item(title, link, date, content)
+    return if content.blank?
     doc = Hpricot(content)
     doc.search('*').each do |p|
       if p.instance_of? Hpricot::Elem
@@ -30,6 +31,7 @@ class ExternalFeed &lt; ActiveRecord::Base
     article.source = link 
     article.profile = blog.profile 
     article.parent = blog
+    article.author_name = self.feed_title
     unless blog.children.exists?(:slug => article.slug)
       article.save!
       article.delay.create_activity
 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
@@ -85,8 +85,4 @@ class FeedReaderBlock &lt; Block
     block_title(title) + formatted_feed_content
   end
  
-  def editable?
-    true
-  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
@@ -78,16 +78,17 @@ class LinkListBlock &lt; Block
       address
     end
     if add !~ /^[a-z]+:\/\// && add !~ /^\//
-      'http://' + add
+      '//' + add
     else
+      if root = Noosfero.root
+        if !add.starts_with?(root)
+          add = root + add
+        end
+      end
       add
     end
   end
  
-  def editable?
-    true
-  end
-
   def icons_options
     ICONS.map do |i|
       "<span title=\"#{i[1]}\" class=\"icon-#{i[0]}\" onclick=\"changeIcon(this, '#{i[0]}')\"></span>".html_safe
@@ -100,4 +101,5 @@ class LinkListBlock &lt; Block
     sanitizer = HTML::WhiteListSanitizer.new
     sanitizer.sanitize(text)
   end
+
 end
 class LocationBlock < Block
  
+  attr_accessible :zoom, :map_type
+
   settings_items :zoom, :type => :integer, :default => 4
   settings_items :map_type, :type => :string, :default => 'roadmap'
  
@@ -16,10 +16,6 @@ class MainBlock &lt; Block
     true
   end
  
-  def editable?
-    true
-  end
-
   def cacheable?
     false
   end
@@ -0,0 +1,59 @@
+class ModerateUserRegistration < Task
+
+  settings_items :user_id, :type => String
+  settings_items :name, :type => String
+  settings_items :author_name, :type => String
+  settings_items :email, :type => String
+
+  after_create :schedule_spam_checking
+
+  alias :environment :target
+  alias :environment= :target=
+
+  def schedule_spam_checking
+    self.delay.check_for_spam
+  end
+
+  include Noosfero::Plugin::HotSpot
+
+  def sender
+    "#{name} (#{email})"
+  end
+
+  def perform
+    user=environment.users.find_by_id(user_id)
+    user.activate
+  end
+
+  def title
+    _("New user")
+  end
+
+  def subject
+    name
+  end
+
+  def information
+    { :message => _('%{sender} wants to register.'),
+      :variables => {:sender => sender} }
+  end
+
+  def icon
+    result = {:type => :defined_image, :src => '/images/icons-app/person-minor.png', :name => name}
+  end
+
+  def target_notification_description
+    _('%{sender} tried to register.') %
+    {:sender => sender}
+  end
+
+  def target_notification_message
+    target_notification_description + "\n\n" +
+    _('You need to login on %{system} in order to approve or reject this user.') % {  :environment => self.environment }
+  end
+
+  def target_notification_message
+    _("User \"%{user}\" just requested to register. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :user => self.name }
+  end
+
+end
 \ No newline at end of file
@@ -30,6 +30,16 @@ class Organization &lt; Profile
  
   scope :more_popular, :order => 'members_count DESC'
  
+  validate :presence_of_required_fieds, :unless => :is_template
+
+  def presence_of_required_fieds
+    self.required_fields.each do |field|
+      if self.send(field).blank?
+        self.errors.add_on_blank(field)
+      end
+    end
+  end
+
   def validation_methodology
     self.validation_info ? self.validation_info.validation_methodology : nil
   end
@@ -135,7 +145,11 @@ class Organization &lt; Profile
   end
  
   def notification_emails
-    [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
+    emails = [contact_email].select(&:present?) + admins.map(&:email)
+    if emails.empty?
+      emails << environment.contact_email
+    end
+    emails
   end
  
   def already_request_membership?(person)
@@ -21,6 +21,12 @@ class Person &lt; Profile
     { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }
   }
  
+  scope :by_role, lambda { |roles|
+    roles = [roles] unless roles.kind_of?(Array)
+    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.role_id IN (?)',
+roles] }
+  }
+
   def has_permission_with_plugins?(permission, profile)
     permissions = [has_permission_without_plugins?(permission, profile)]
     permissions += plugins.map do |plugin|
@@ -161,7 +167,7 @@ class Person &lt; Profile
     FIELDS
   end
  
-  validate :presence_of_required_fields
+  validate :presence_of_required_fields, :unless => :is_template
  
   def presence_of_required_fields
     self.required_fields.each do |field|
@@ -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
@@ -97,7 +97,7 @@ class Profile &lt; ActiveRecord::Base
   end
  
   def members_by_name
-    members.order(:name)
+    members.order('profiles.name')
   end
  
   class << self
@@ -108,8 +108,8 @@ class Profile &lt; ActiveRecord::Base
     alias_method_chain :count, :distinct
   end
  
-  def members_by_role(role)
-    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', role.id])
+  def members_by_role(roles)
+    Person.members_of(self).by_role(roles)
   end
  
   acts_as_having_boxes
@@ -121,6 +121,7 @@ class Profile &lt; ActiveRecord::Base
   end
  
   scope :visible, :conditions => { :visible => true }
+  scope :disabled, :conditions => { :visible => false }
   scope :public, :conditions => { :visible => true, :public_profile => true }
  
   # Subclasses must override this method
@@ -346,16 +347,17 @@ class Profile &lt; ActiveRecord::Base
   end
  
   def copy_blocks_from(profile)
+    template_boxes = profile.boxes.select{|box| box.position}
     self.boxes.destroy_all
-    profile.boxes.each do |box|
-      new_box = Box.new
+    self.boxes = template_boxes.size.times.map { Box.new }
+
+    template_boxes.each_with_index do |box, i|
+      new_box = self.boxes[i]
       new_box.position = box.position
-      self.boxes << new_box
       box.blocks.each do |block|
         new_block = block.class.new(:title => block[:title])
-        new_block.settings = block.settings
-        new_block.position = block.position
-        self.boxes[-1].blocks << new_block
+        new_block.copy_from(block)
+        new_box.blocks << new_block
       end
     end
   end
@@ -774,7 +776,7 @@ private :generate_url, :url_options
   end
  
   include Noosfero::Plugin::HotSpot
-  
+
   def folder_types
     types = Article.folder_types
     plugins.dispatch(:content_types).each {|type|
@@ -898,6 +900,13 @@ private :generate_url, :url_options
   end
  
   def disable
+    self.visible = false
+    self.save
+  end
+
+  def enable
+    self.visible = true
+    self.save
   end
  
   def control_panel_settings_button
@@ -23,10 +23,6 @@ class ProfileImageBlock &lt; Block
     end
   end
  
-  def editable?
-    true
-  end
-
   def cacheable?
     false
   end
@@ -15,10 +15,6 @@ class ProfileInfoBlock &lt; Block
     end
   end
  
-  def editable?
-    false
-  end
-
   def cacheable?
     false
   end
@@ -11,8 +11,4 @@ class ProfileSearchBlock &lt; Block
     end
   end
  
-  def editable?
-    true
-  end
-
 end
 class RssFeed < Article
  
-  attr_accessible :limit, :enabled, :language, :include
+  attr_accessible :limit, :enabled, :language, :include, :feed_item_description
  
   def self.type_name
     _('RssFeed')
@@ -73,10 +73,6 @@ class Task &lt; ActiveRecord::Base
     end
   end
  
-  def self.all_types
-    %w[Invitation EnterpriseActivation AddMember Ticket SuggestArticle  AddFriend CreateCommunity AbuseComplaint ApproveComment ApproveArticle CreateEnterprise ChangePassword EmailActivation InviteFriend InviteMember]
-  end
-
   # this method finished the task. It calls #perform, which must be overriden
   # by subclasses. At the end a message (as returned by #finish_message) is
   # sent to the requestor with #notify_requestor.
@@ -254,6 +250,10 @@ class Task &lt; ActiveRecord::Base
     { :conditions => [environment_condition, profile_condition].compact.join(' OR ') }
   }
  
+  def self.pending_types_for(profile)
+    Task.to(profile).pending.select('distinct type').map { |t| [t.class.name, t.title] }
+  end
+
   def opened?
     status == Task::Status::ACTIVE || status == Task::Status::HIDDEN
   end
@@ -285,8 +285,9 @@ class Task &lt; ActiveRecord::Base
   # If
   def send_notification(action)
     if sends_email?
-      if self.requestor
-         TaskMailer.generic_message("task_#{action}", self)
+      if self.requestor && !self.requestor.notification_emails.empty?
+        message = TaskMailer.generic_message("task_#{action}", self)
+        message.deliver if message
       end
     end
   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')
@@ -16,15 +16,18 @@ class User &lt; ActiveRecord::Base
   end
  
   # FIXME ugly workaround
-  def self.human_attribute_name(attrib, options={})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
       when :login
         return [_('Username'), _('Email')].join(' / ')
       when :email
         return _('e-Mail')
-      else _(self.superclass.human_attribute_name(attrib))
+      else _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   before_create do |user|
     if user.environment.nil?
@@ -47,8 +50,12 @@ class User &lt; ActiveRecord::Base
  
       user.person = p
     end
-    if user.environment.enabled?('skip_new_user_email_confirmation')
-      user.activate
+    if user.environment.enabled?('skip_new_user_email_confirmation') 
+      if user.environment.enabled?('admin_must_approve_new_users')
+        create_moderate_task
+      else
+        user.activate
+      end
     end
   end
   after_create :deliver_activation_code
@@ -137,6 +144,15 @@ class User &lt; ActiveRecord::Base
     end
   end
  
+  def create_moderate_task
+    @task = ModerateUserRegistration.new
+    @task.user_id = self.id
+    @task.name = self.name
+    @task.email = self.email
+    @task.target = self.environment
+    @task.save
+  end
+
   def activated?
     self.activation_code.nil? && !self.activated_at.nil?
   end
@@ -185,6 +201,10 @@ class User &lt; ActiveRecord::Base
     Digest::MD5.hexdigest(password)
   end
  
+  add_encryption_method :salted_md5 do |password, salt|
+    Digest::MD5.hexdigest(password+salt)
+  end
+
   add_encryption_method :clear do |password, salt|
     password
   end
@@ -334,6 +354,7 @@ class User &lt; ActiveRecord::Base
     end
  
     def delay_activation_check
+      return if person.is_template?
       Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})
     end
 end
@@ -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
@@ -8,9 +8,6 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
   end
  
   def after_create(profile)
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    expire_statistics_block_cache(profile)
   end
  
 protected
@@ -31,13 +28,6 @@ protected
     expire_blogs(profile) if profile.organization?
   end
  
-  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-  #      the Noosfero core soon, see ActionItem3045
-  def expire_statistics_block_cache(profile)
-    blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
-    BlockSweeper.expire_blocks(blocks)
-  end
-
   def expire_blogs(profile)
     profile.blogs.select{|b| !b.empty?}.each do |blog|
       pages = blog.posts.count / blog.posts_per_page + 1
@@ -13,20 +13,22 @@ class RoleAssignmentSweeper &lt; ActiveRecord::Observer
 protected
  
   def expire_caches(role_assignment)
-    expire_cache(role_assignment.accessor)
-    expire_cache(role_assignment.resource) if role_assignment.resource.respond_to?(:cache_keys)
+    expire_cache(role_assignment.accessor) if role_assignment.accessor.kind_of?(Profile)
+    expire_cache(role_assignment.resource) if role_assignment.resource.kind_of?(Profile)
   end
  
   def expire_cache(profile)
     per_page = Noosfero::Constants::PROFILE_PER_PAGE
-    profile.cache_keys(:per_page => per_page).each { |ck|
-      expire_timeout_fragment(ck)
-    }
+
+    profile.cache_keys(:per_page => per_page).each { |ck| expire_timeout_fragment(ck) }
+    expire_timeout_fragment(profile.members_cache_key(:per_page => per_page))
  
     profile.blocks_to_expire_cache.each { |block|
       blocks = profile.blocks.select{|b| b.kind_of?(block)}
       BlockSweeper.expire_blocks(blocks)
     }
+
+    expire_blocks_cache(profile, [:role_assignment])
   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() == '') {
@@ -2,18 +2,36 @@
   <div id='thanks-for-signing'>
     <% if environment.has_custom_welcome_screen? %>
       <%= environment.settings[:signup_welcome_screen_body].html_safe %>
-    <% else %>
-        <h1><%= _("Welcome to %s!") % environment.name %></h1>
-        <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
-        <p><%= _("Firstly, some tips for getting started:") %></p>
-        <h4><%= _("Confirm your account!") %></h4>
+    <% elsif environment.enabled?('admin_must_approve_new_users')%>
+      <h1><%= _("Welcome to %s!") % environment.name %></h1>
+      <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
+      <p><%= _("Firstly, some tips for getting started:") %></p>
+      <% unless environment.enabled?('skip_new_user_email_confirmation') %>
+        <h4><%= _("Confirm your account and wait for admin approvement!") %></h4>
         <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
-        <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
-        <h4><%= _("What to do next?") %></h4>
-        <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
-        <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
-        <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
-        <p><%= _("Start exploring and have fun!") %></p>
+        <p><%= _("You won't appear as %s until your account is confirmed and approved.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+      <% else %>
+        <h4><%= _("Wait for admin approvement!") %></h4>
+        <p><%= _("The administrators will evaluate your signup request for approvement.") %></p>
+        <p><%= _("You won't appear as %s until your account is approved.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+      <% end %> 
+      <h4><%= _("What to do next?") %></h4>
+      <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
+      <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
+      <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
+      <p><%= _("Start exploring and have fun!") %></p>
+    <% else %>
+      <h1><%= _("Welcome to %s!") % environment.name %></h1>
+      <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
+      <p><%= _("Firstly, some tips for getting started:") %></p>
+      <h4><%= _("Confirm your account!") %></h4>
+      <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
+      <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+      <h4><%= _("What to do next?") %></h4>
+      <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
+      <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
+      <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
+      <p><%= _("Start exploring and have fun!") %></p>
     <% end %>
   </div>
 <% else %>
@@ -20,6 +20,7 @@
   <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
   <tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
   <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
+  <tr><td><%= link_to _('Manage organizations status'), :action => 'manage_organizations_status' %></td></tr>
 </table>
  
  
@@ -0,0 +1,69 @@
+<h1><%= _('Manage organizations') %></h1>
+
+<%= form_tag( { :action => 'manage_organizations_status' }, :method => 'get', :class => 'users-search' ) do %>
+
+  <div class="search-field">
+    <span class="formfield">
+      <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
+    </span>
+
+    <%= submit_button(:search, _('Search')) %>
+  </div>
+
+  <div class="environment-users-results-header">
+    <div id='environment-users-filter-title'><%= @title %></div>
+
+    <div id="environment-users-filter-filter">
+      <strong><%= _("Filter by: ") %></strong>
+
+      <select id="profile_filter_select">
+        <%= options_for_select([['Any', 'any'],["Disabled profiles", "disabled"], ["Enabled profiles", "enabled"]], @filter) %>
+      </select>
+    </div>
+    <div style="clear: both"></div>
+  </div>
+
+  <table>
+    <colgroup>
+      <col width="80%">
+      <col width="20%">
+    </colgroup>
+
+    <tr>
+      <th><%= _('Member') %></th>
+      <th><%= _('Actions') %></th>
+    </tr>
+
+    <% @collection.each do |p| %>
+      <tr title="<%= p.name %>">
+        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
+
+        <td class='actions'>
+          <div class="members-buttons-cell">
+            <% if p.visible %>
+              <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller => "profile_editor", :action => 'deactivate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
+            <% else %>
+              <%= button_without_text :'activate-user', _('Activate'), {:controller => "profile_editor", :action => 'activate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to activate this profile ?") %>
+            <% end %>
+              <%= button_without_text :'delete', _('Remove'), {:controller => "profile_editor", :action => 'destroy_profile', :profile => p.identifier, :id => p.id, :return_to => "/admin/admin_panel/manage_organizations_status"}, :method => :post, :confirm => _("Do you want to deactivate this profile ?") %>
+         </div>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+
+<% end %>
+
+<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
+
+<% button_bar do %>
+  <%= button :back, _('Back'), :controller => 'admin_panel' %>
+<% end %>
+
+<script type="text/javascript">
+  jQuery(document).ready(function(){
+    jQuery("#profile_filter_select").change(function(){
+      document.location.href = '/admin/admin_panel/manage_organizations_status?filter='+this.value;
+    });
+  });
+</script>
 \ No newline at end of file
 <%= 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]}) %>
  
@@ -14,8 +14,8 @@
  
 <ul id="product-list">
   <% @products.each do |product| %>
-    <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_eval(&content) } %>
-    <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_eval(&content) } %>
+    <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_exec(&content) } %>
+    <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_exec(&content) } %>
  
     <% status = [] %>
     <% status << 'not-available' if !product.available %>
 <li>
 <div class='treeitem'>
-  <%= display_color_for_category(category) %>
-  <%= category.name %>
+  <% unless category_color_style(category).empty? %>
+    <span class="color_marker" style="<%= category_color_style(category) %>" ></span>
+  <% end %>
+  <span><%= category.name %></span>
+
   <% if category.children.count > 0 %>
     <div class='button' id="category-loading-<%= category.id %>" style="position: relative;">
       <a href="#" id="show-button-<%= category.id %>" class="show-button" onclick="return false;" data-category="<%= category.id %>"><%= _('Show') %></a>
+<%= stylesheet_link_tag 'spectrum.css' %>
+<%= javascript_include_tag "spectrum.js" %>
+<%= javascript_include_tag "colorpicker-noosfero.js" %>
+
 <%= error_messages_for 'category' %>
  
 <%= labelled_form_for 'category', :html => { :multipart => true} do |f| %>
@@ -13,12 +17,13 @@
     <% end %>
   <% end %>
  
-  <%= select_color_for_category if !environment.enabled?('disable_categories_menu') %>
-
   <%= required f.text_field('name') %>
  
   <%= labelled_check_box(_('Display in the menu'), 'category[display_in_menu]', '1', @category.display_in_menu) %>
  
+  <%= labelled_colorpicker_field(_('Pick a color'), :category, 'display_color' ) unless environment.enabled?('disable_categories_menu')%>
+  <span id="color_preview" class = "color_marker" style="<%= category_color_style(@category) %>" ></span>
+
   <%= f.fields_for :image_builder, @category.image do |i| %>
     <%= file_field_or_thumbnail(_('Image:'), @category.image, i) %>
   <% end %>
@@ -31,9 +31,18 @@
  
   <%= select_categories(:article, _('Categorize your article')) %>
  
+  <br />
+
   <%= f.text_field('tag_list', :size => 64) %>
   <%= content_tag( 'small', _('Separate tags with commas') ) %>
  
+  <script>
+    jQuery('#article_tag_list').inputosaurus({
+      autoCompleteSource: <%= "'/myprofile/#{profile.identifier}/cms/search_tags'," %>
+      activateFinalResult : true
+    })
+  </script>
+
   <div id='edit-article-options'>
     <%= options_for_article(@article, @tokenized_children) %>
   </div>
@@ -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();
 <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 %>
@@ -13,8 +13,8 @@
                 date.day,
                 :url => {:action => 'events_by_day', :year => date.year, :month => date.month, :day => date.day, :category_id => @category_id},
                 :update => 'events-of-the-day',
-                :loading => '$("events-of-the-day").addClassName("loading")',
-                :complete => '$("events-of-the-day").removeClassName("loading")'
+                :loading => "$('events-of-the-day').addClassName('loading')",
+                :complete => "$('events-of-the-day').removeClassName('loading')"
               ) :
               date.day
             %>
@@ -37,6 +37,18 @@ Check all the features you want to enable for your environment, uncheck all the 
   <%= select_organization_approval_method('environment', 'organization_approval_method') %>
 <hr/>
  
+<h3><%= _('Members Whitelist') %></h3>
+  <div class="option">
+    <%= check_box :environment, :members_whitelist_enabled %>
+    <label><%= _('Enable whitelist') %></label>
+  </div>
+  <div class="input">
+    <div class="info"><%= _('Allow these people to access this environment:') %></div>
+    <% tokenized_members = prepare_to_token_input(environment.people.find(:all, :conditions => {:id => environment.members_whitelist})) %>
+    <%= token_input_field_tag('environment[members_whitelist]', 'search-members', {:action => 'search_members'}, {:focus => false, :hint_text => _('Type in a search term for a user'), :pre_populate => tokenized_members}) %>
+  </div>
+<hr/>
+
 <div>
   <% button_bar do %>
     <%= submit_button('save', _('Save changes')) %>
1	1	--ignore-dir=log
2	2	--ignore-dir=tmp
3	3	--ignore-dir=pkg
	4	+--ignore-dir=public/javascripts/cache
	5	+--ignore-dir=public/stylesheets/cache
...	...
...	...	@@ -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>
1		-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).
	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).
2	5
3	6	Developers
4	7	==========
5	8
	9	+Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
6	10	Alan Freihof Tygel <alantygel@gmail.com>
	11	+alcampelo <alcampelo@alcampelo.(none)>
7	12	Alessandro Palmeira <alessandro.palmeira@gmail.com>
8	13	Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
9	14	Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
...	...	@@ -35,9 +40,14 @@ Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
35	40	Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
36	41	Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
37	42	Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
	43	+analosnak <analosnak@gmail.com>
	44	+Ana Losnak <analosnak@gmail.com>
	45	+Andre Bernardes <andrebsguedes@gmail.com>
38	46	Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
39	47	Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
40	48	Antonio Terceiro <terceiro@colivre.coop.br>
	49	+Arthur Del Esposte <arthurmde@gmail.com>
	50	+Arthur Del Esposte <arthurmde@yahoo.com.br>
41	51	Aurelio A. Heckert <aurelio@colivre.coop.br>
42	52	Braulio Bhavamitra <brauliobo@gmail.com>
43	53	Bráulio Bhavamitra <brauliobo@gmail.com>
...	...	@@ -65,6 +75,8 @@ Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
65	75	Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
66	76	Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
67	77	Caio SBA <caio@colivre.coop.br>
	78	+Caio Tiago Oliveira <caiotiago@colivre.coop.br>
	79	+Carlos Andre de Souza <carlos.andre.souza@msn.com>
68	80	Carlos Morais <carlos88morais@gmail.com>
69	81	Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
70	82	Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
...	...	@@ -78,7 +90,9 @@ Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
78	90	Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
79	91	Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
80	92	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
	93	+Daniel Bucher <daniel.bucher88@gmail.com>
81	94	Daniel Cunha <daniel@colivre.coop.br>
	95	+David Carlos <ddavidcarlos1392@gmail.com>
82	96	diegoamc <diegoamc90@gmail.com>
83	97	Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
84	98	Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
...	...	@@ -105,17 +119,27 @@ Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
105	119	Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
106	120	Diego + Jefferson <diegoamc90@gmail.com>
107	121	Diego Martinez <diegoamc90@gmail.com>
108		-Diego Martinez <diego@diego-K55A.(none)>
109	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>
110	127	Fernanda Lopes <nanda.listas+psl@gmail.com>
111	128	Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
112	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>
113	133	Grazieno Pellegrino <grazieno@gmail.com>
	134	+Gust <darksshades@hotmail.com>
	135	+Hebert Douglas <hebertdougl@gmail.com>
	136	+Hugo Melo <hugo@riseup.net>
114	137	Isaac Canan <isaac@intelletto.com.br>
115	138	Italo Valcy <italo@dcc.ufba.br>
116	139	Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
117	140	Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
118	141	Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
	142	+João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
119	143	João da Silva <jaodsilv@linux.ime.usp.br>
120	144	João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
121	145	João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
...	...	@@ -146,21 +170,35 @@ João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
146	170	João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
147	171	Joenio Costa <joenio@colivre.coop.br>
148	172	Josef Spillner <josef.spillner@tu-dresden.de>
	173	+Jose Pedro <1jpsneto@gmail.com>
	174	+Junior Silva <junior@bajor.localhost.localdomain>
	175	+Junior Silva <junior@sedeantigo.colivre.coop.br>
149	176	Junior Silva <juniorsilva1001@gmail.com>
150	177	Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
	178	+Junior Silva <juniorsilva@colivre.coop.br>
	179	+juniorsilva <juniorsilva@QonoS.localhost.localdomain>
151	180	Keilla Menezes <keilla@colivre.coop.br>
152	181	Larissa Reis <larissa@colivre.coop.br>
153	182	Larissa Reis <reiss.larissa@gmail.com>
	183	+Leandro Alves <leandrosustenido@gmail.com>
	184	+Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
	185	+Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
154	186	Leandro Nunes dos Santos <leandronunes@gmail.com>
155	187	Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
156	188	LinguÁgil 2010 <linguagil.bahia@gmail.com>
157	189	Lucas Melo <lucas@colivre.coop.br>
158	190	Lucas Melo <lucaspradomelo@gmail.com>
	191	+Luciano <lucianopcbr@gmail.com>
	192	+Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
159	193	Luis David Aguilar Carlos <ludwig9003@gmail.com>
	194	+Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
	195	+Marcos Ramos <ms.ramos@outlook.com>
160	196	Martín Olivera <molivera@solar.org.ar>
	197	+Michal Čihař <michal@cihar.com>
161	198	Moises Machado <moises@colivre.coop.br>
162	199	Naíla Alves <naila@colivre.coop.br>
163	200	Nanda Lopes <nanda.listas+psl@gmail.com>
	201	+Parley Martins <parleypachecomartins@gmail.com>
164	202	Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
165	203	Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
166	204	Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
...	...	@@ -183,20 +221,28 @@ Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
183	221	Rafael Reggiani Manzo <rr.manzo@gmail.com>
184	222	Raphaël Rousseau <raph@r4f.org>
185	223	Raquel Lira <raquel.lira@gmail.com>
	224	+Raquel <rcordioli@gmail.com>
186	225	Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
187	226	Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
188	227	Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
189	228	Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
190	229	Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
191	230	Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
192		-Rodrigo Souto <diguliu@gmail.com>
	231	+Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
193	232	Rodrigo Souto <rodrigo@colivre.coop.br>
194	233	Ronny Kursawe <kursawe.ronny@googlemail.com>
195	234	root <root@debian.sdr.serpro>
196	235	Samuel R. C. Vale <srcvale@holoscopio.com>
	236	+Tallys Martins <tallysmartins@gmail.com>
	237	+tallys <tallys@tallys.(none)>
	238	+Thiago Zoroastro <thiago.zoroastro@bol.com.br>
	239	+Valessio Brito <contato@valessiobrito.com.br>
	240	+Valessio Brito <contato@valessiobrito.info>
197	241	Valessio Brito <valessio@gmail.com>
198	242	vfcosta <vfcosta@gmail.com>
	243	+Victor Carvalho <victorhugodf.ac@gmail.com>
199	244	Victor Costa <vfcosta@gmail.com>
	245	+Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
200	246	Vinicius Cubas Brand <viniciuscb@gmail.com>
201	247	Visita <visita@debian.(none)>
202	248	Yann Lugrin <yann.lugrin@liquid-concept.ch>
...	...
...	...	@@ -0,0 +1,124 @@
	1	+# Noosfero Development Policy
	2	+
	3	+## Developer Roles
	4	+
	5	+* Developers are everyone that is contributing code to Noosfero.
	6	+* Committers are the people with direct commit access to the Noosfero source
	7	+ code. They are responsible for reviewing contributions from other developers
	8	+ and integrating them in the Noosfero code base. They are the members of the
	9	+ [Noosfero group on Gitlab](https://gitlab.com/groups/noosfero/members).
	10	+* Release managers are the people that are managing the release of a new
	11	+ Noosfero version and/or the maintainance work of an existing Noosfero stable
	12	+ branch. See MAINTAINANCE.md for details on the maintaince policy.
	13	+
	14	+## Development process
	15	+
	16	+* Every new feature or non-trivial bugfix should be reviewed by at least one
	17	+ committer. This must be the case even if the original author is a committer.
	18	+
	19	+ * In the case the original author is a committer, he/she should feel free to
	20	+ commit directly if after 1 week nobody has provided any kind of feedback.
	21	+
	22	+ * Developers who are not committers should feel free to ping committers if
	23	+ they do not get feedback on their contributions after 1 week.
	24	+
	25	+ * On GitLab, one can just add a comment to the merge request; one can also
	26	+ @-mention specific committers or other developers who have expertise on
	27	+ the area of the contribution.
	28	+
	29	+ * Committers should follow the activity of the project, and try to help
	30	+ reviewing contributions from others as much as possible.
	31	+
	32	+ * On GitLab one can get emails for all activity on a project by setting the
	33	+ [notification settings](https://gitlab.com/profile/notifications) to
	34	+ "watch".
	35	+
	36	+ * Anyone can help by reviewing contributions. Committers are the only ones
	37	+ who can give the final approval to a contribution, but everyone is welcome
	38	+ to help with code review, testing, etc.
	39	+
	40	+ * See note above about setting up notification on GitLab.
	41	+
	42	+* Committers should feel free to push trivial (or urgent) changes directly.
	43	+ There are no strict rule on what makes a change trivial or urgent; committers
	44	+ are expected to exercise good judgement on a case by case basis.
	45	+
	46	+ * Usually changes to the database are not trivial.
	47	+
	48	+* In the case of unsolvable conflict between commiters regarding any change to
	49	+ the code, the current release manager(s) will have the final say in the
	50	+ matter.
	51	+
	52	+* Release managers are responsible for stablishing a release schedule, and
	53	+ about deciding when and what to release.
	54	+
	55	+ * Release managers should announce release schedules to the project mailing
	56	+ lists in advance.
	57	+
	58	+ * The release schedule may include a period of feature freeze, during which
	59	+ no new features or any other changes that are not pre-approved by the
	60	+ release manager must be committed to the repository.
	61	+
	62	+ * Committers must respect the release schedule and feature freezes.
	63	+
	64	+## Maintainance process
	65	+
	66	+### Not all feature releases will be maintained as a stable release
	67	+
	68	+We will be choosing specific release series to be maintained as stable
	69	+releases.
	70	+
	71	+This means that a given release is not guaranteed to be maintained as a stable
	72	+release, but does not mean it won't be. Any committer (or anyone, really) can
	73	+decide to maintain a given release as stable and seek help from others to do
	74	+so.
	75	+
	76	+### No merges from stable branches to master
	77	+
	78	+All changes must be submitted against the master branch first, and when
	79	+applicable, backported to the desired stable releases. Exceptions to this rules
	80	+are bug fixes that only apply to a given stable branch and not to master.
	81	+
	82	+In the past we had non-trivial changes accepted into stable releases while
	83	+master was way ahead (e.g. during the rails3 migration period), that made the
	84	+merge back into master very painful. By eliminating the need to do these
	85	+merges, we save time for the people responsible for the release, and eliminate
	86	+the possibility of human errors or oversights causing changes to be accepted
	87	+into stable that will be a problem to merge back into master.
	88	+
	89	+By getting all fixes in master first, we improve the chances that a future
	90	+release will not present regressions against bugs that should already be fixed,
	91	+but the fixes got lost in a big, complicated merge (and those won't exist
	92	+anymore, at least not from stable branches to master).
	93	+
	94	+After a fix gets into master, backporting changes into a stable release branch
	95	+is the responsibility of whoever is maintaing that branch, and those interested
	96	+in it. The stable branch release manager(s) are entitled the final say on any
	97	+matters related to that branch.
	98	+
	99	+## Apendix A: how to become a committer
	100	+
	101	+Every developer that wants to be a committer should create [an issue on
	102	+Gitlab](https://gitlab.com/noosfero/noosfero/issues) requesting to be added as
	103	+a committer. This request must include information about the requestor's
	104	+previous contributions to the project.
	105	+
	106	+If 2 or more commiters consider second the request, the requestor is accepted
	107	+as new commiter and added to the Noosfero group.
	108	+
	109	+The existing committers are free to choose whatever criteria they want to
	110	+second the request, but they must be sure that the new committer is a
	111	+responsible developer and knows what she/he is doing. They must be aware that
	112	+seconding these requests means seconding the actions of the new committer: if
	113	+the new committer screw up, her/his seconds screwed up.
	114	+
	115	+## Apendix B: how to become a release manager
	116	+
	117	+A new release manager for the development version of Noosfero (i.e. the one
	118	+that includes new features, a.k.a. the master branch) is apointed by the
	119	+current release manager, and must be a committer first.
	120	+
	121	+Release managers for stable branches are self-appointed, i.e. whoever takes the
	122	+work takes the role. In case of a conflict (e.g. 2+ different people want to do
	123	+the work but can't agree on working together), the development release manager
	124	+decides.
...	...
1	1	source "https://rubygems.org"
2		-gem 'rails'
3		-gem 'fast_gettext'
4		-gem 'acts-as-taggable-on'
5		-gem 'prototype-rails'
6		-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
7		-gem 'rails_autolink'
8		-gem 'pg'
9		-gem 'rmagick'
10		-gem 'RedCloth'
11		-gem 'will_paginate'
12		-gem 'ruby-feedparser'
13		-gem 'daemons'
14		-gem 'thin'
15		-gem 'hpricot'
16		-gem 'nokogiri'
	2	+gem 'rails', '~> 3.2.19'
	3	+gem 'fast_gettext', '~> 0.6.8'
	4	+gem 'acts-as-taggable-on', '~> 3.0.2'
	5	+gem 'prototype-rails', '~> 3.2.1'
	6	+gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
	7	+gem 'rails_autolink', '~> 1.1.5'
	8	+gem 'pg', '~> 0.13.2'
	9	+gem 'rmagick', '~> 2.13.1'
	10	+gem 'RedCloth', '~> 4.2.9'
	11	+gem 'will_paginate', '~> 3.0.3'
	12	+gem 'ruby-feedparser', '~> 0.7'
	13	+gem 'daemons', '~> 1.1.5'
	14	+gem 'thin', '~> 1.3.1'
	15	+gem 'hpricot', '~> 0.8.6'
	16	+gem 'nokogiri', '~> 1.5.5'
17	17	gem 'rake', :require => false
18		-gem 'rest-client'
19		-gem 'exception_notification'
	18	+gem 'rest-client', '~> 1.6.7'
	19	+gem 'exception_notification', '~> 4.0.1'
	20	+gem 'gettext', '~> 2.2.1', :require => false, :group => :development
	21	+gem 'locale', '~> 2.0.5'
20	22
21	23	# FIXME list here all actual dependencies (i.e. the ones in debian/control),
22	24	# with their GEM names (not the Debian package names)
23	25
24	26	group :production do
25		- gem 'dalli'
	27	+ gem 'dalli', '~> 2.7.0'
26	28	end
27	29
28	30	group :test do
29		- gem 'rspec'
30		- gem 'rspec-rails'
31		- gem 'mocha', :require => false
	31	+ gem 'rspec', '~> 2.10.0'
	32	+ gem 'rspec-rails', '~> 2.10.1'
	33	+ gem 'mocha', '~> 1.1.0', :require => false
32	34	end
33	35
34	36	group :cucumber do
35		- gem 'rake'
36		- gem 'cucumber-rails', :require => false
37		- gem 'capybara'
38		- gem 'cucumber'
39		- gem 'database_cleaner'
40		- gem 'selenium-webdriver'
	37	+ gem 'cucumber-rails', '~> 1.0.6', :require => false
	38	+ gem 'capybara', '~> 2.1.0'
	39	+ gem 'cucumber', '~> 1.0.6'
	40	+ gem 'database_cleaner', '~> 1.2.0'
	41	+ gem 'selenium-webdriver', '~> 2.39.0'
41	42	end
42	43
43		-# include plugin gemfiles
44		-Dir.glob(File.join('config', 'plugins', '*')).each do \|plugin\|
45		- plugin_gemfile = File.join(plugin, 'Gemfile')
46		- eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile)
	44	+# include gemfiles from enabled plugins
	45	+# plugins in baseplugins/ are not included on purpose. They should not have any
	46	+# dependencies.
	47	+Dir.glob('config/plugins/*/Gemfile').each do \|gemfile\|
	48	+ eval File.read(gemfile)
47	49	end
...	...
...	...	@@ -1,191 +0,0 @@
1		-PATH
2		- remote: vendor/prototype_legacy_helper
3		- specs:
4		- prototype_legacy_helper (0.0.0)
5		-
6		-GEM
7		- remote: https://rubygems.org/
8		- specs:
9		- RedCloth (4.2.9)
10		- actionmailer (3.2.6)
11		- actionpack (= 3.2.6)
12		- mail (~> 2.4.4)
13		- actionpack (3.2.6)
14		- activemodel (= 3.2.6)
15		- activesupport (= 3.2.6)
16		- builder (~> 3.0.0)
17		- erubis (~> 2.7.0)
18		- journey (~> 1.0.1)
19		- rack (~> 1.4.0)
20		- rack-cache (~> 1.2)
21		- rack-test (~> 0.6.1)
22		- sprockets (~> 2.1.3)
23		- activemodel (3.2.6)
24		- activesupport (= 3.2.6)
25		- builder (~> 3.0.0)
26		- activerecord (3.2.6)
27		- activemodel (= 3.2.6)
28		- activesupport (= 3.2.6)
29		- arel (~> 3.0.2)
30		- tzinfo (~> 0.3.29)
31		- activeresource (3.2.6)
32		- activemodel (= 3.2.6)
33		- activesupport (= 3.2.6)
34		- activesupport (3.2.6)
35		- i18n (~> 0.6)
36		- multi_json (~> 1.0)
37		- acts-as-taggable-on (3.0.2)
38		- rails (>= 3, < 5)
39		- arel (3.0.2)
40		- builder (3.0.0)
41		- capybara (2.1.0)
42		- mime-types (>= 1.16)
43		- nokogiri (>= 1.3.3)
44		- rack (>= 1.0.0)
45		- rack-test (>= 0.5.4)
46		- xpath (~> 2.0)
47		- childprocess (0.3.3)
48		- ffi (~> 1.0.6)
49		- cucumber (1.0.6)
50		- builder (>= 2.1.2)
51		- diff-lcs (>= 1.1.2)
52		- gherkin (~> 2.4.18)
53		- json (>= 1.4.6)
54		- term-ansicolor (>= 1.0.6)
55		- cucumber-rails (1.0.6)
56		- capybara (>= 1.1.1)
57		- cucumber (>= 1.0.6)
58		- nokogiri (>= 1.5.0)
59		- daemons (1.1.5)
60		- dalli (2.7.0)
61		- database_cleaner (1.2.0)
62		- diff-lcs (1.1.3)
63		- erubis (2.7.0)
64		- eventmachine (0.12.10)
65		- exception_notification (4.0.1)
66		- actionmailer (>= 3.0.4)
67		- activesupport (>= 3.0.4)
68		- fast_gettext (0.6.8)
69		- ffi (1.0.11)
70		- gherkin (2.4.21)
71		- json (>= 1.4.6)
72		- hike (1.2.1)
73		- hpricot (0.8.6)
74		- i18n (0.6.0)
75		- journey (1.0.3)
76		- json (1.7.3)
77		- mail (2.4.4)
78		- i18n (>= 0.4.0)
79		- mime-types (~> 1.16)
80		- treetop (~> 1.4.8)
81		- metaclass (0.0.1)
82		- mime-types (1.19)
83		- mocha (0.11.3)
84		- metaclass (~> 0.0.1)
85		- multi_json (1.3.6)
86		- nokogiri (1.5.5)
87		- pg (0.13.2)
88		- polyglot (0.3.3)
89		- prototype-rails (3.2.1)
90		- rails (~> 3.2)
91		- rack (1.4.1)
92		- rack-cache (1.2)
93		- rack (>= 0.4)
94		- rack-ssl (1.3.2)
95		- rack
96		- rack-test (0.6.1)
97		- rack (>= 1.0)
98		- rails (3.2.6)
99		- actionmailer (= 3.2.6)
100		- actionpack (= 3.2.6)
101		- activerecord (= 3.2.6)
102		- activeresource (= 3.2.6)
103		- activesupport (= 3.2.6)
104		- bundler (~> 1.0)
105		- railties (= 3.2.6)
106		- rails_autolink (1.1.5)
107		- rails (> 3.1)
108		- railties (3.2.6)
109		- actionpack (= 3.2.6)
110		- activesupport (= 3.2.6)
111		- rack-ssl (~> 1.3.2)
112		- rake (>= 0.8.7)
113		- rdoc (~> 3.4)
114		- thor (>= 0.14.6, < 2.0)
115		- rake (0.9.2.2)
116		- rdoc (3.9.4)
117		- rest-client (1.6.7)
118		- mime-types (>= 1.16)
119		- rmagick (2.13.1)
120		- rspec (2.10.0)
121		- rspec-core (~> 2.10.0)
122		- rspec-expectations (~> 2.10.0)
123		- rspec-mocks (~> 2.10.0)
124		- rspec-core (2.10.1)
125		- rspec-expectations (2.10.0)
126		- diff-lcs (~> 1.1.3)
127		- rspec-mocks (2.10.1)
128		- rspec-rails (2.10.1)
129		- actionpack (>= 3.0)
130		- activesupport (>= 3.0)
131		- railties (>= 3.0)
132		- rspec (~> 2.10.0)
133		- ruby-feedparser (0.7)
134		- rubyzip (1.1.2)
135		- selenium-webdriver (2.39.0)
136		- childprocess (>= 0.2.5)
137		- multi_json (~> 1.0)
138		- rubyzip (~> 1.0)
139		- websocket (~> 1.0.4)
140		- sprockets (2.1.3)
141		- hike (~> 1.2)
142		- multi_json (~> 1.0)
143		- rack (~> 1.0)
144		- tilt (~> 1.1, != 1.3.0)
145		- term-ansicolor (1.0.7)
146		- thin (1.3.1)
147		- daemons (>= 1.0.9)
148		- eventmachine (>= 0.12.6)
149		- rack (>= 1.0.0)
150		- thor (0.15.3)
151		- tilt (1.3.3)
152		- treetop (1.4.10)
153		- polyglot
154		- polyglot (>= 0.3.1)
155		- tzinfo (0.3.33)
156		- websocket (1.0.7)
157		- will_paginate (3.0.3)
158		- xpath (2.0.0)
159		- nokogiri (~> 1.3)
160		-
161		-PLATFORMS
162		- ruby
163		-
164		-DEPENDENCIES
165		- RedCloth
166		- acts-as-taggable-on
167		- capybara
168		- cucumber
169		- cucumber-rails
170		- daemons
171		- dalli
172		- database_cleaner
173		- exception_notification
174		- fast_gettext
175		- hpricot
176		- mocha
177		- nokogiri
178		- pg
179		- prototype-rails
180		- prototype_legacy_helper (= 0.0.0)!
181		- rails
182		- rails_autolink
183		- rake
184		- rest-client
185		- rmagick
186		- rspec
187		- rspec-rails
188		- ruby-feedparser
189		- selenium-webdriver
190		- thin
191		- will_paginate
...	...	@@ -186,8 +186,8 @@ Apache instalation
186	186
187	187	# apt-get install apache2
188	188
189		-Apache configuration
190		---------------------
	189	+Configuration - noosfero at /
	190	+-----------------------------
191	191
192	192	First you have to enable the following some apache modules:
193	193
...	...	@@ -257,6 +257,62 @@ Now restart your apache server (as root):
257	257
258	258	# invoke-rc.d apache2 restart
259	259
	260	+Configuration - noosfero at a /subdirectory
	261	+-------------------------------------------
	262	+
	263	+This section describes how to configure noosfero at a subdirectory, what is
	264	+specially useful when you want Noosfero to share a domain name with other
	265	+applications. For example you can host noosfero at yourdomain.com/social, a
	266	+webmail application at yourdomain.com/webmail, and have a static HTML website
	267	+at yourdomain.com/.
	268	+
	269	+NOTE: Some plugins might not work well with this setting. Before deploying
	270	+this setting, make sure you test that everything you need works properly with
	271	+it.
	272	+
	273	+The configuration is similar to the main configuration instructions, except for
	274	+the following points. In the description below, replace '/subdirectory' with
	275	+the actual subdirectory you want.
	276	+
	277	+1) add a `prefix: /subdirectory` line to your thin configuration file (thin.yml).
	278	+
	279	+1.1) remember to restart the noosfero application server whenever you make
	280	+changes to that configuration file.
	281	+
	282	+ # service noosfero restart
	283	+
	284	+2) add a line saying `export RAILS_RELATIVE_URL_ROOT=/subdirectory` to
	285	+/etc/default/noosfero (you can create it with just this line if it does not
	286	+exist already).
	287	+
	288	+3) You should add the following apache configuration to an existing virtual
	289	+host (plus the `<Proxy balancer://noosfero>` section as displayed above):
	290	+
	291	+```
	292	+Alias /subdirectory /path/to/noosfero/public
	293	+<Directory "/path/to/noosfero/public">
	294	+ Options FollowSymLinks
	295	+ AllowOverride None
	296	+ Order Allow,Deny
	297	+ Allow from all
	298	+
	299	+ Include /path/to/noosfero/etc/noosfero/apache/cache.conf
	300	+
	301	+ RewriteEngine On
	302	+ RewriteBase /subdirectory
	303	+ # Rewrite index to check for static index.html
	304	+ RewriteRule ^$ index.html [QSA]
	305	+ # Rewrite to check for Rails cached page
	306	+ RewriteRule ^([^.]+)$ $1.html [QSA]
	307	+ RewriteCond %{REQUEST_FILENAME} !-f
	308	+ RewriteRule ^(.*)$ http://localhost:3000%{REQUEST_URI} [P,QSA,L]
	309	+</Directory>
	310	+```
	311	+
	312	+3.1) remember to reload the apache server whenever any apache configuration
	313	+file changes.
	314	+
	315	+ # sudo service apache2 reload
260	316
261	317	Enabling exception notifications
262	318	================================
...	...
1	1	#!/usr/bin/env rake
	2	+
2	3	# Add your own tasks in files placed in lib/tasks ending in .rake,
3	4	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4	5
5	6	require File.expand_path('../config/application', __FILE__)
6	7
7	8	Noosfero::Application.load_tasks
	9	+
	10	+[
	11	+ "baseplugins//{tasks,lib/tasks,rails/tasks}//.rake",
	12	+ "config/plugins//{tasks,lib/tasks,rails/tasks}//.rake",
	13	+ "config/plugins//vendor/plugins//{tasks,lib/tasks,rails/tasks}/*/.rake",
	14	+].map do \|pattern\|
	15	+ Dir.glob(pattern).sort
	16	+end.flatten.each do \|taskfile\|
	17	+ load taskfile
	18	+end
...	...
...	...	@@ -3,7 +3,7 @@
3	3
4	4	VAGRANTFILE_API_VERSION = "2"
5	5	Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|
6		- config.vm.box = "debian-wheezy"
	6	+ config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
7	7	config.vm.network :forwarded_port, host: 3000, guest: 3000
8	8	config.vm.provision :shell do \|shell\|
9	9	shell.inline = 'su vagrant -c /vagrant/script/vagrant'
...	...
...	...	@@ -71,4 +71,22 @@ class AdminPanelController < AdminController
71	71	end
72	72	end
73	73	end
	74	+
	75	+ def manage_organizations_status
	76	+ scope = environment.organizations
	77	+ @filter = params[:filter] \|\| 'any'
	78	+ @title = "Organization profiles"
	79	+ @title = @title+" - "+@filter if @filter != 'any'
	80	+
	81	+ if @filter == 'enabled'
	82	+ scope = scope.visible
	83	+ elsif @filter == 'disabled'
	84	+ scope = scope.disabled
	85	+ end
	86	+
	87	+ scope = scope.order('name ASC')
	88	+
	89	+ @q = params[:q]
	90	+ @collection = find_by_contents(:organizations, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
	91	+ end
74	92	end
...	...