Merge branch 'master' into AI3280-tagging

Joenio Costa
2 parents bc6b356a f9358611
Showing 182 changed files with 10801 additions and 6311 deletions Show diff stats
AUTHORS
AUTHORS.md
Gemfile
Gemfile.lock
Rakefile
app/controllers/admin/categories_controller.rb
app/controllers/admin/features_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/catalog_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/block_helper.rb
app/helpers/blog_helper.rb
app/helpers/categories_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/folder_helper.rb
@@ -1,250 +0,0 @@
-If you are not listed here, but should be, please write to the noosfero mailing
-list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
-(this list requires subscription to post, but since you are an author of
-noosfero, that's not a problem).
-
-Developers
-==========
-
-Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
-Alan Freihof Tygel <alantygel@gmail.com>
-alcampelo <alcampelo@alcampelo.(none)>
-Alessandro Palmeira <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
-Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
-Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
-Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
-Ana Losnak <analosnak@gmail.com>
-Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
-Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
-Antonio Terceiro <terceiro@colivre.coop.br>
-Arthur Del Esposte <arthurmde@gmail.com>
-Arthur Del Esposte <arthurmde@yahoo.com.br>
-Aurelio A. Heckert <aurelio@colivre.coop.br>
-Braulio Bhavamitra <brauliobo@gmail.com>
-Bráulio Bhavamitra <brauliobo@gmail.com>
-Braulio Bhavamitra <braulio@eita.org.br>
-Caio <caio.csalgado@gmail.com>
-Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
-Caio Formiga <caio.formiga@gmail.com>
-Caio, Pedro <caio.csalgado@gmail.com>
-Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
-Caio Salgado <caio.csalgado@gmail.com>
-Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
-Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
-Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
-Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
-Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
-Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
-Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
-Caio SBA <caio@colivre.coop.br>
-Caio Tiago Oliveira <caiotiago@colivre.coop.br>
-Carlos Andre de Souza <carlos.andre.souza@msn.com>
-Carlos Morais <carlos88morais@gmail.com>
-Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
-Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
-Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
-Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
-Daniela Feitosa <dani@dohko.(none)>
-Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
-Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
-Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
-Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
-Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
-Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
-Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
-Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
-Daniel Bucher <daniel.bucher88@gmail.com>
-Daniel Cunha <daniel@colivre.coop.br>
-David Carlos <ddavidcarlos1392@gmail.com>
-diegoamc <diegoamc90@gmail.com>
-Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
-Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
-Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
-Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
-Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
-Diego Araújo <diegoamc90@gmail.com>
-Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
-Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
-Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
-Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Diego Araújo + João Machini <diegoamc90@gmail.com>
-Diego Araújo + João Machini <digoamc90@gmail.com>
-Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
-Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
-Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
-Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
-Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
-Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
-Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
-Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
-Diego + Jefferson <diegoamc90@gmail.com>
-Diego Martinez <diegoamc90@gmail.com>
-Diego Martinez <diego@diego-K55A.(none)>
-Diego + Renan <renanteruoc@gmail.com>
-Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
-Evandro Jr <evandrojr@gmail.com>
-Evandro Junior <evandrojr@gmail.com>
-Fabio Teixeira <fabio1079@gmail.com>
-Fernanda Lopes <nanda.listas+psl@gmail.com>
-Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
-Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
-Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
-Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
-Gabriela Navarro <navarro1703@gmail.com>
-Grazieno Pellegrino <grazieno@gmail.com>
-Gust <darksshades@hotmail.com>
-Hugo Melo <hugo@riseup.net>
-Isaac Canan <isaac@intelletto.com.br>
-Italo Valcy <italo@dcc.ufba.br>
-Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
-Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
-Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
-João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
-João da Silva <jaodsilv@linux.ime.usp.br>
-João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
-Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
-João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva <jaodsilv@linux.ime.usp.br>
-Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
-Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
-Joenio Costa <joenio@colivre.coop.br>
-Josef Spillner <josef.spillner@tu-dresden.de>
-Junior Silva <junior@bajor.localhost.localdomain>
-Junior Silva <juniorsilva1001@gmail.com>
-Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
-Junior Silva <juniorsilva@colivre.coop.br>
-juniorsilva <juniorsilva@QonoS.localhost.localdomain>
-Keilla Menezes <keilla@colivre.coop.br>
-Larissa Reis <larissa@colivre.coop.br>
-Larissa Reis <reiss.larissa@gmail.com>
-Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
-Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
-Leandro Nunes dos Santos <leandronunes@gmail.com>
-Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
-LinguÁgil 2010 <linguagil.bahia@gmail.com>
-Lucas Melo <lucas@colivre.coop.br>
-Lucas Melo <lucaspradomelo@gmail.com>
-Luciano <lucianopcbr@gmail.com>
-Luis David Aguilar Carlos <ludwig9003@gmail.com>
-Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
-Marcos Ramos <ms.ramos@outlook.com>
-Martín Olivera <molivera@solar.org.ar>
-Moises Machado <moises@colivre.coop.br>
-Naíla Alves <naila@colivre.coop.br>
-Nanda Lopes <nanda.listas+psl@gmail.com>
-Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
-Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
-Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
-Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
-Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
-Paulo Meirelles <paulo@softwarelivre.org>
-Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
-Rafael Gomes <rafaelgomes@techfree.com.br>
-Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
-Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
-Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
-Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
-Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
-Rafael Martins <rmmartins@gmail.com>
-Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
-Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
-Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
-Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
-Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
-Rafael Reggiani Manzo <rr.manzo@gmail.com>
-Raphaël Rousseau <raph@r4f.org>
-Raquel Lira <raquel.lira@gmail.com>
-Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
-Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
-Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
-Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
-Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
-Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
-Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
-Rodrigo Souto <diguliu@gmail.com>
-Rodrigo Souto <rodrigo@colivre.coop.br>
-Ronny Kursawe <kursawe.ronny@googlemail.com>
-root <root@debian.sdr.serpro>
-Samuel R. C. Vale <srcvale@holoscopio.com>
-Valessio Brito <contato@valessiobrito.com.br>
-Valessio Brito <contato@valessiobrito.info>
-Valessio Brito <valessio@gmail.com>
-vfcosta <vfcosta@gmail.com>
-Victor Carvalho <victorhugodf.ac@gmail.com>
-Victor Costa <vfcosta@gmail.com>
-Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
-Vinicius Cubas Brand <viniciuscb@gmail.com>
-Visita <visita@debian.(none)>
-Yann Lugrin <yann.lugrin@liquid-concept.ch>
-
-Ideas, specifications and incentive
-===================================
-Daniel Tygel <dtygel@fbes.org.br>
-Guilherme Rocha <guilherme@gf7.com.br>
-Raphael Rousseau <raph@r4f.org>
-Théo Bondolfi <move@cooperation.net>
-Vicente Aguiar <vicenteaguiar@colivre.coop.br>
-
-Arts
-===================================
-Nara Oliveira <narananet@gmail.com>
-If you are not listed here, but should be, please write to the noosfero mailing list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev (this list requires subscription to post, but since you are an author of noosfero, that's not a problem).
+If you are not listed here, but should be, please write to the noosfero mailing
+list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
+(this list requires subscription to post, but since you are an author of
+noosfero, that's not a problem).
 Developers
 ==========
+Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
 Alan Freihof Tygel <alantygel@gmail.com>
+alcampelo <alcampelo@alcampelo.(none)>
 Alessandro Palmeira <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
@@ -35,9 +40,12 @@ Alessandro Palmeira + João M. M. Silva &lt;alessandro.palmeira@gmail.com&gt;
 Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
+Ana Losnak <analosnak@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
+Arthur Del Esposte <arthurmde@gmail.com>
+Arthur Del Esposte <arthurmde@yahoo.com.br>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
@@ -65,11 +73,14 @@ Caio Salgado + Renan Teruo &lt;caio.salgado@gmail.com&gt;
 Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
 Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
 Caio SBA <caio@colivre.coop.br>
+Caio Tiago Oliveira <caiotiago@colivre.coop.br>
+Carlos Andre de Souza <carlos.andre.souza@msn.com>
 Carlos Morais <carlos88morais@gmail.com>
 Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
 Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
 Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
+Daniela Feitosa <dani@dohko.(none)>
 Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
 Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
 Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
@@ -78,7 +89,9 @@ Daniel Alves + Diego Araújo + Guilherme Rojas &lt;guilhermehrojas@gmail.com&gt;
 Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
 Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
+Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
+David Carlos <ddavidcarlos1392@gmail.com>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
@@ -107,15 +120,25 @@ Diego + Jefferson &lt;diegoamc90@gmail.com&gt;
 Diego Martinez <diegoamc90@gmail.com>
 Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@gmail.com>
+Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
+Evandro Jr <evandrojr@gmail.com>
+Evandro Junior <evandrojr@gmail.com>
+Fabio Teixeira <fabio1079@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
+Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
+Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
+Gabriela Navarro <navarro1703@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
+Gust <darksshades@hotmail.com>
+Hugo Melo <hugo@riseup.net>
 Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
 Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
+João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
 João da Silva <jaodsilv@linux.ime.usp.br>
 João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
@@ -146,17 +169,29 @@ João M. M. Silva + Rafael Manzo &lt;jaodsilv@linux.ime.usp.br&gt;
 João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
+Jose Pedro <1jpsneto@gmail.com>
+Junior Silva <junior@bajor.localhost.localdomain>
+Junior Silva <junior@sedeantigo.colivre.coop.br>
 Junior Silva <juniorsilva1001@gmail.com>
 Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
+Junior Silva <juniorsilva@colivre.coop.br>
+juniorsilva <juniorsilva@QonoS.localhost.localdomain>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
 Larissa Reis <reiss.larissa@gmail.com>
+Leandro Alves <leandrosustenido@gmail.com>
+Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
+Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
 Leandro Nunes dos Santos <leandronunes@gmail.com>
 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
 Lucas Melo <lucas@colivre.coop.br>
 Lucas Melo <lucaspradomelo@gmail.com>
+Luciano <lucianopcbr@gmail.com>
+Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
+Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
+Marcos Ramos <ms.ramos@outlook.com>
 Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
 Naíla Alves <naila@colivre.coop.br>
@@ -189,14 +224,19 @@ Renan Teruo + Diego Araujo &lt;renanteruoc@gmail.com&gt;
 Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
 Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
 Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
+Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
 Rodrigo Souto <diguliu@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
+Valessio Brito <contato@valessiobrito.com.br>
+Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
 vfcosta <vfcosta@gmail.com>
+Victor Carvalho <victorhugodf.ac@gmail.com>
 Victor Costa <vfcosta@gmail.com>
+Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
 Vinicius Cubas Brand <viniciuscb@gmail.com>
 Visita <visita@debian.(none)>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
@@ -16,6 +16,8 @@ gem &#39;hpricot&#39;
 gem 'nokogiri'
 gem 'rake', :require => false
 gem 'rest-client'
+gem 'exception_notification'
+gem 'gettext_rails'
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
@@ -31,7 +33,6 @@ group :test do
 end
 group :cucumber do
-  gem 'rake'
   gem 'cucumber-rails', :require => false
   gem 'capybara'
   gem 'cucumber'
@@ -61,9 +61,21 @@ GEM
     database_cleaner (1.2.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (0.12.11)
+    eventmachine (0.12.10)
+    exception_notification (4.0.1)
+      actionmailer (>= 3.0.4)
+      activesupport (>= 3.0.4)
     fast_gettext (0.6.8)
     ffi (1.0.11)
+    gettext (2.2.1)
+      locale
+    gettext_activerecord (2.1.0)
+      activerecord (>= 2.3.2)
+      gettext (>= 2.1.0)
+    gettext_rails (2.1.0)
+      gettext_activerecord (>= 2.1.0)
+      locale_rails (>= 2.0.5)
+      rails (>= 2.3.2)
     gherkin (2.4.21)
       json (>= 1.4.6)
     hike (1.2.1)
@@ -71,6 +83,9 @@ GEM
     i18n (0.6.0)
     journey (1.0.3)
     json (1.7.3)
+    locale (2.0.5)
+    locale_rails (2.0.5)
+      locale (>= 2.0.5)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -167,7 +182,9 @@ DEPENDENCIES
   daemons
   dalli
   database_cleaner
+  exception_notification
   fast_gettext
+  gettext_rails
   hpricot
   mocha
   nokogiri
 #!/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.
@@ -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
@@ -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
@@ -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 => :user
+
+  def verify_members_whitelist
+    render_access_denied unless user.is_admin? || environment.in_whitelist?(user)
+  end
   after_filter :set_csrf_cookie
@@ -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
@@ -149,6 +149,7 @@ class CmsController &lt; MyProfileController
     end
     @article.profile = profile
+    @article.author = user
     @article.last_changed_by = user
     @article.created_by = user
@@ -201,7 +202,7 @@ class CmsController &lt; MyProfileController
               :profile => profile,
               :parent => @parent,
               :last_changed_by => user,
-              :created_by => user,
+              :author => user,
             },
             :without_protection => true
           )
@@ -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
@@ -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
@@ -108,6 +120,7 @@ class AccountController &lt; ApplicationController
             check_join_in_community(@user)
             go_to_signup_initial_page
           else
+            session[:notice] = _('Thanks for registering!')
             @register_pending = true
           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
@@ -74,7 +74,7 @@ class ContentViewerController &lt; ApplicationController
   end
   def versions_diff
-    path = params[:page].join('/')
+    path = params[:page]
     @page = profile.articles.find_by_path(path)
     @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
   end
@@ -216,6 +216,8 @@ class ContentViewerController &lt; ApplicationController
     if @page.has_posts?
       posts = get_posts(params[:year], params[:month])
+      posts = posts.includes(:parent, {:profile => [:domains, :environment]}, :author)
+
       #FIXME Need to run this before the pagination because this version of
       #      will_paginate returns a will_paginate collection instead of a
       #      relation.
@@ -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
@@ -1095,7 +1095,7 @@ module ApplicationHelper
     result
   end
-  def manage_link(list, kind)
+  def manage_link(list, kind, title)
     if list.present?
       link_to_all = nil
       if list.count > 5
@@ -1108,19 +1108,19 @@ module ApplicationHelper
       if link_to_all
         link << link_to_all
       end
-      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s}
+      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s, :title => title}
     end
   end
   def manage_enterprises
     return '' unless user && user.environment.enabled?(:display_my_enterprises_on_user_menu)
-    manage_link(user.enterprises, :enterprises).to_s
+    manage_link(user.enterprises, :enterprises, _('My enterprises')).to_s
   end
   def manage_communities
     return '' unless user && user.environment.enabled?(:display_my_communities_on_user_menu)
     administered_communities = user.communities.more_popular.select {|c| c.admins.include? user}
-    manage_link(administered_communities, :communities).to_s
+    manage_link(administered_communities, :communities, _('My communities')).to_s
   end
   def admin_link
@@ -1225,20 +1225,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)
@@ -1373,7 +1360,7 @@ module ApplicationHelper
       @message = _("The content here is available to %s's friends only.") % profile.short_name
     else
       @action = :join
-      @message = _('The contents in this community is available to members only.')
+      @message = _('The contents in this profile is available to members only.')
     end
     @no_design_blocks = true
   end
@@ -1415,4 +1402,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
@@ -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)
   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
@@ -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'
@@ -456,10 +463,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 +476,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 +503,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 +523,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 +645,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
@@ -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
@@ -109,14 +109,17 @@ class Comment &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
   include Spammable
+  include CacheCounterHelper
   def after_spam!
     SpammerLogger.log(ip_address, self)
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
+    update_cache_counter(:spam_comments_count, source, 1) if source.kind_of?(Article)
   end
   def after_ham!
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
+    update_cache_counter(:spam_comments_count, source, -1) if source.kind_of?(Article)
   end
   def verify_and_notify
@@ -2,7 +2,7 @@ require &#39;noosfero/multi_tenancy&#39;
 class Domain < ActiveRecord::Base
-  attr_accessible :name, :owner
+  attr_accessible :name, :owner, :is_default
   # relationships
   ###############
@@ -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
@@ -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
@@ -303,6 +305,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
 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
 class HighlightsBlock < Block
-  attr_accessible :images
+  attr_accessible :images, :interval, :shuffle, :navigation
   settings_items :images, :type => Array, :default => []
   settings_items :interval, :type => 'integer', :default => 4
 class LocationBlock < Block
+  attr_accessible :zoom, :map_type
+
   settings_items :zoom, :type => :integer, :default => 4
   settings_items :map_type, :type => :string, :default => 'roadmap'
@@ -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
@@ -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
 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
@@ -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')
@@ -47,8 +47,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 +141,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
@@ -11,4 +11,9 @@ class FilePresenter::Image &lt; FilePresenter
   def short_description
     _('Image (%s)') % content_type.split('/')[1].upcase
   end
+
+  #Overwriting method from FilePresenter to allow download of images
+  def download?(view = nil)
+    view.blank? || view == 'false'
+  end
 end
@@ -136,8 +136,6 @@
 <script type="text/javascript">
 jQuery(function($) {
-  $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());
-
   $('#signup-form input[type=text], #signup-form textarea').each(function() {
     $(this).bind('blur', function() {
       if ($(this).val() == '') {
@@ -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 %>
 <%= 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]}) %>
 <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,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 %>
@@ -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')) %>
-<%= render :partial => 'shared/disabled_enterprise' %>
-
 <h1><%= h profile.name %></h1>
 <% if @action %>
 <h1><%= _("%s: site map") % profile.name %></h1>
-<%= list_articles(available_articles(@articles, user), false) %>
+<%= list_contents :contents=>available_articles(@articles, user), :list_type=>:sitemap %>
@@ -24,7 +24,7 @@
   <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'profile_themes', :action => 'index') %>
-  <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
+  <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') if user.is_admin?(environment) || (!profile.enterprise? && !environment.enabled?('disable_header_and_footer'))  %>
   <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
@@ -1,10 +0,0 @@
-<% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
-  <div id='profile-disabled'>
-    <%= environment.message_for_disabled_enterprise %>
-    <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
-      <div class='unlock-button'>
-        <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
 <div id=<%= "manage-#{kind}" %> class="manage-groups">
-  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % kind %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My %s') % kind %></strong></a>
+  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % _(kind) %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + title %></strong></a>
   <ul class="simplemenu-submenu">
     <% link.each do |link| %>
       <li class="simplemenu-item"><%= link %></li>
@@ -1,14 +0,0 @@
-<table>
-
-  <tr>
-    <th><%= _('Title') %></th>
-    <th><%= _('Last update') %></th>
-  </tr>
-  <% articles.each do |article| %>
-    <% if article.display_to?(user) %>
-      <%= display_article_in_listing(article, recursive, 0) %>
-    <% end %>
-  <% end %>
-</table>
-
-<p><%= pagination_links(articles, {:param_name => 'npage', :page_links => true}) %></p>
@@ -0,0 +1,13 @@
+<table class="<%= list_type %>-content">
+  <tr>
+    <th><%= _('Title') %></th>
+    <th><%= _('Last update') %></th>
+  </tr>
+  <% contents.each do |content| %>
+    <% if content.display_to?(user) %>
+      <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>
+    <% end %>
+  <% end %>
+</table>
+
+<p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>
@@ -3,10 +3,9 @@
 <h1><%= _("%s's pending tasks") % profile.name %></h1>
 <p>
-<% type_collection = [[nil, _('All')]] %>
-<% type_collection += Task.all_types.sort_by {|klass| klass.constantize.new.title}.map{|s| [s, s.constantize.new.title] } %>
-
-
+<%
+  type_collection = [[nil, _('All')]] + @task_types
+%>
 <% if !@failed.blank? %>
   <div id="errorExplanation">
@@ -39,7 +38,7 @@
     <ul class='task-list'>
       <p>
-        <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :onchange => 'document.location.href = "?filter_type="+this.value')%>
+        <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :onchange => "document.location.href = '?filter_type='+this.value") %>
       </p>
       <p>
       <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "up-set-all-tasks-to") %>
 # Load the rails application
 require File.expand_path('../application', __FILE__)
+#FIXME Necessary hack to avoid the need of downgrading rubygems on rails 2.3.5
+# http://stackoverflow.com/questions/5564251/uninitialized-constant-activesupportdependenciesmutex
+require 'thread'
+
 # Uncomment below to force Rails into production mode when 
 # you don't control web/app server and can't set it the proper way
 #ENV['RAILS_ENV'] ||= 'production'
 unless NOOSFERO_CONF['exception_recipients'].blank?
-  require 'noosfero.rb'
-  require 'exception_notification.rb'
-  ExceptionNotifier.sender_address = "noreply@#{Noosfero.default_hostname}"
-  ExceptionNotifier.email_prefix = "[Noosfero ERROR] "
-  ExceptionNotifier.exception_recipients = NOOSFERO_CONF['exception_recipients']
-  ActionController::Base.send :include, ExceptionNotifiable
+  Noosfero::Application.config.middleware.use ExceptionNotification::Rack,
+    :email => {
+      :sender_address => "noreply@#{Noosfero.default_hostname}",
+      :email_prefix => "[Noosfero ERROR] ",
+      :exception_recipients => NOOSFERO_CONF['exception_recipients']
+    }
 end
@@ -0,0 +1,9 @@
+if defined? PhusionPassenger
+
+  # from http://russbrooks.com/2010/10/20/rails-cache-memcache-on-passenger-with-smart-spawning
+  PhusionPassenger.on_event :starting_worker_process do |forked|
+    if forked
+      Rails.cache.instance_variable_get(:@data).reset if Rails.cache.class == ActiveSupport::Cache::MemCacheStore
+    end
+  end
+end
@@ -131,7 +131,7 @@ Noosfero::Application.routes.draw do
   match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions', :controller => 'content_viewer', :action => 'article_versions'
-  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
+  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff'
   # match requests for profiles that don't have a custom domain
@@ -0,0 +1,17 @@
+class IndexFilteredFieldsOnTask < ActiveRecord::Migration
+  def self.up
+    add_index :tasks, :requestor_id
+    add_index :tasks, :target_id
+    add_index :tasks, :target_type
+    add_index :tasks, [:target_id, :target_type]
+    add_index :tasks, :status
+  end
+
+  def self.down
+    remove_index :tasks, :requestor_id
+    remove_index :tasks, :target_id
+    remove_index :tasks, :target_type
+    remove_index :tasks, [:target_id, :target_type]
+    remove_index :tasks, :status
+  end
+end
@@ -0,0 +1,12 @@
+class AddSpamCommentsCounterCacheToArticles < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :spam_comments_count, :integer, :default => 0
+    add_column :article_versions, :spam_comments_count, :integer, :default => 0
+    execute "update articles set spam_comments_count = (select count(*) from comments where comments.source_id = articles.id and comments.source_type = 'Article' and comments.spam = 't');"
+  end
+
+  def self.down
+    remove_column :articles, :spam_comments_count
+    remove_column :article_versions, :spam_comments_count
+  end
+end
@@ -0,0 +1,14 @@
+class CreateRealRelationBetweenArticleAndAuthor < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :author_id, :integer
+    add_column :article_versions, :author_id, :integer
+
+    # Set article's author as the first version's last_changed_by_id.
+    execute "update articles set author_id = (select article_versions.last_changed_by_id from article_versions where article_versions.article_id = articles.id and article_versions.version = 1 limit 1)"
+  end
+
+  def self.down
+    remove_column :articles, :author_id
+    remove_column :article_versions, :author_id
+  end
+end
@@ -6,6 +6,7 @@ class FixYamlEncoding &lt; ActiveRecord::Migration
     fix_encoding(Profile, 'data')
     fix_encoding(ActionTracker::Record, 'params')
     fix_encoding(Article, 'setting')
+    fix_encoding(Task, 'data')
   end
   def self.down
@@ -0,0 +1,36 @@
+class ChangeCategoryDisplayColorToString < ActiveRecord::Migration
+
+  COLORS = ['ffa500', '00FF00', 'a020f0', 'ff0000', '006400', '191970', '0000ff', 'a52a2a', '32cd32', 'add8e6', '483d8b', 'b8e9ee', 'f5f5dc', 'ffff00', 'f4a460']
+
+  def self.up
+    change_table :categories do |t|
+      t.string :display_color_tmp, :limit => 6
+    end
+
+    COLORS.each_with_index do |color, i|
+      Category.update_all({:display_color_tmp => color}, {:display_color => i+1})
+    end
+
+    change_table :categories do |t|
+      t.remove :display_color
+      t.rename :display_color_tmp, :display_color
+    end
+  end
+
+  def self.down
+    puts "WARNING: only old defined colors will be reverted"
+
+    change_table :categories do |t|
+      t.integer :display_color_tmp
+    end
+
+    COLORS.each_with_index do |color, i|
+      Category.update_all({:display_color_tmp => i+1}, {:display_color => color})
+    end
+
+    change_table :categories do |t|
+      t.remove :display_color
+      t.rename :display_color_tmp, :display_color
+    end
+  end
+end
@@ -0,0 +1,11 @@
+class UpdateDefaultTaggingContext < ActiveRecord::Migration
+
+  def self.up
+    ActsAsTaggableOn::Tagging.where(:taggable_type => Article, :context => nil).update_all(:context => 'tags')
+  end
+
+  def self.down
+    ActsAsTaggableOn::Tagging.where(:taggable_type => Article, :context => 'tags').update_all(:context => nil)
+  end
+
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20140724134601) do
+ActiveRecord::Schema.define(:version => 20140808185510) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -96,6 +96,8 @@ ActiveRecord::Schema.define(:version =&gt; 20140724134601) do
     t.integer  "image_id"
     t.integer  "position"
     t.integer  "created_by_id"
+    t.integer  "spam_comments_count",  :default => 0
+    t.integer  "author_id"
   end
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
@@ -142,6 +144,8 @@ ActiveRecord::Schema.define(:version =&gt; 20140724134601) do
     t.integer  "image_id"
     t.integer  "position"
     t.integer  "created_by_id"
+    t.integer  "spam_comments_count",  :default => 0
+    t.integer  "author_id"
   end
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
@@ -190,19 +194,19 @@ ActiveRecord::Schema.define(:version =&gt; 20140724134601) do
   create_table "categories", :force => true do |t|
     t.string  "name"
     t.string  "slug"
-    t.text    "path",            :default => ""
-    t.integer "display_color"
+    t.text    "path",                         :default => ""
     t.integer "environment_id"
     t.integer "parent_id"
     t.string  "type"
     t.float   "lat"
     t.float   "lng"
-    t.boolean "display_in_menu", :default => false
-    t.integer "children_count",  :default => 0
-    t.boolean "accept_products", :default => true
+    t.boolean "display_in_menu",              :default => false
+    t.integer "children_count",               :default => 0
+    t.boolean "accept_products",              :default => true
     t.integer "image_id"
     t.string  "acronym"
     t.string  "abbreviation"
+    t.string  "display_color",   :limit => 6
   end
   create_table "categories_profiles", :id => false, :force => true do |t|
@@ -597,7 +601,12 @@ ActiveRecord::Schema.define(:version =&gt; 20140724134601) do
     t.boolean  "spam",                       :default => false
   end
+  add_index "tasks", ["requestor_id"], :name => "index_tasks_on_requestor_id"
   add_index "tasks", ["spam"], :name => "index_tasks_on_spam"
+  add_index "tasks", ["status"], :name => "index_tasks_on_status"
+  add_index "tasks", ["target_id", "target_type"], :name => "index_tasks_on_target_id_and_target_type"
+  add_index "tasks", ["target_id"], :name => "index_tasks_on_target_id"
+  add_index "tasks", ["target_type"], :name => "index_tasks_on_target_type"
   create_table "terms_forum_people", :id => false, :force => true do |t|
     t.integer "forum_id"
+noosfero (1.0~rc1) wheezy-test; urgency=low
+
+  * First 1.0 release candidate
+
+ -- Rodrigo Souto <vagrant@wheezy-base>  Fri, 15 Aug 2014 16:35:35 -0300
+
 noosfero (0.99.0~rc20140618202455) wheezy-test; urgency=low
   * Another rc with rails3
  -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 18 Jun 2014 20:25:01 +0000
+noosfero (0.47.3) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Fri, 20 Jun 2014 03:13:29 +0000
+
+noosfero (0.47.2) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Fri, 13 Jun 2014 15:19:28 +0000
+
 noosfero (0.47.1) unstable; urgency=low
   * Bugfix release
@@ -7,6 +7,7 @@ Build-Depends:
  debhelper (>= 7.0.50~),
  po4a,
  ruby-gettext,
+ ruby-gettext-rails,
  ruby-sqlite3,
  rake,
  rails3 (>= 3.2.6-1~),
@@ -32,10 +33,10 @@ Package: noosfero
 Architecture: all
 Depends:
  rails3 (>= 3.2.6-1~),
- ruby,
- ruby1.9.3,
+ ruby (>= 1:1.9.3),
  rake,
  ruby-dalli,
+ ruby-exception-notification,
  ruby-fast-gettext,
  ruby-pg,
  ruby-rmagick,
-AUTHORS
+AUTHORS.md
+INSTALL.awstats.md
+INSTALL.chat.md
+INSTALL.email.md
+INSTALL.https.md
+INSTALL.multitenancy.md
+INSTALL.varnish.md
@@ -29,4 +29,4 @@ override_dh_clean:
 override_dh_auto_build:
 	dh_auto_build
-	rake noosfero:translations:compile
+	rake noosfero:translations:compile > /dev/null
@@ -0,0 +1,44 @@
+Feature: Edit Highlight Block
+  As a user
+  I want to edit the highlight block
+
+  Background:
+    Given I am on the homepage
+    And the following users
+      | login       | name         |
+      | jose        | Jose Silva   |
+    And I am logged in as "jose"
+
+  @selenium
+  Scenario: Add new highlight
+    Given I follow "Control panel"
+    And I follow "Edit sideboxes"
+    And I follow "Add a block"
+    And I choose "Highlights"
+    And I press "Add"
+    And I follow "Edit" within ".highlights-block"#Need to hover the mouse on the box
+    And I follow "New highlight"
+    And I fill in "block_images__address" with "/"
+    And I fill in "block_images__position" with "0"
+    And I fill in "block_images__title" with "test highlights"
+    And I press "Save"
+    And I follow "Edit" within ".highlights-block"
+    Then I should see "Title"
+
+  @selenium-fixme
+  Scenario: Remove one saved highlight
+    Given I follow "Control panel"
+    And I follow "Edit sideboxes"
+    And I follow "Add a block"
+    And I choose "Highlights"
+    And I press "Add"
+    And I follow "Edit" within ".highlights-block"
+    And I follow "New highlight"
+    And I fill in "block_images__address" with "/"
+    And I fill in "block_images__position" with "0"
+    And I fill in "block_images__title" with "test highlights"#Need to hover the mouse on the box
+    And I press "Save"
+    And I follow "Edit" within ".highlights-block"
+    And I follow "" within ".delete-highlight"
+    And I confirm the browser dialog
+    Then I should not see "Title"
 \ No newline at end of file
@@ -298,3 +298,55 @@ Feature: signup
     And wait for the captcha signup time
     And I press "Create my account"
     Then "José da Silva" should be a member of "Free Software"
+
+  @selenium
+  Scenario: user registration is moderated by admin
+    Given feature "admin_must_approve_new_users" is enabled on environment
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I go to /account/signup
+    And I fill in "Username" with "teste"
+    And I fill in "Password" with "123456"
+    And I fill in "Password confirmation" with "123456"
+    And I fill in "e-Mail" with "teste@teste.com"
+    And I fill in "Full name" with "Teste da Silva"
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to teste's confirmation URL
+    And I am logged in as admin
+    And I follow "Control panel"
+    And I follow "Tasks"
+    And I choose "Accept"
+    And I press "Apply!"
+    And I follow "Logout"
+    And Teste da Silva's account is activated
+    And I follow "Login"
+    And I fill in "Username / Email" with "teste"
+    And I fill in "Password" with "123456"
+    And I press "Log in"
+    Then I should see "teste"
+
+
+  @selenium
+  Scenario: user registration is not accepted by the admin
+    Given feature "admin_must_approve_new_users" is enabled on environment
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I go to /account/signup
+    And I fill in "Username" with "teste"
+    And I fill in "Password" with "123456"
+    And I fill in "Password confirmation" with "123456"
+    And I fill in "e-Mail" with "teste@teste.com"
+    And I fill in "Full name" with "Teste da Silva"
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to teste's confirmation URL
+    And I am logged in as admin
+    And I follow "Control panel"
+    And I follow "Tasks"
+    And I choose "Reject"
+    And I press "Apply!"
+    And I follow "Logout"
+    And I follow "Login"
+    And I fill in "Username / Email" with "teste"
+    And I fill in "Password" with "123456"
+    And I press "Log in"
+    Then I should not see "teste"
 \ No newline at end of file
@@ -11,8 +11,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), &quot;..&quot;, &quot;support&quot;, &quot;pat
 module WithinHelpers
   def with_scope(locator)
-    locator = locator ? first(locator) : locator
-    locator ? within(locator) { yield } : yield
+    if locator
+      locator = first(locator) || locator
+      within(locator) do
+        yield
+      end
+    else
+      yield
+    end
   end
 end
 World(WithinHelpers)
@@ -6,7 +6,9 @@ class FilePresenter
   # one accepts it. That behave allow to give any model to this class,
   # like a Article and have no trouble with that.
   def self.for(f)
-    return f if f.is_a? FilePresenter
+    #FIXME This check after the || is redundant but increases the blog_page
+    #      speed considerably.
+    return f if f.is_a?(FilePresenter ) || (!f.kind_of?(UploadedFile) && !f.kind_of?(Image))
     klass = FilePresenter.subclasses.sort_by {|class_instance|
       class_instance.accepts?(f) || 0
     }.last
@@ -2,8 +2,6 @@
 require 'fast_gettext'
 module Noosfero
-  PROJECT = 'noosfero'
-  VERSION = '0.99.0~rc20140618202455'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -95,5 +93,6 @@ module Noosfero
 end
+require 'noosfero/version'
 require 'noosfero/constants'
 require 'noosfero/core_ext'
-plugins_root = Rails.env.test? ? 'plugins' : File.join('config', 'plugins')
+plugins_root = Rails.env.test? ? 'plugins' : '{baseplugins,config/plugins}'
 Dir.glob(Rails.root.join(plugins_root, '*', 'controllers')) do |controllers_dir|
   prefixes_by_folder = {'public' => 'plugin',
@@ -0,0 +1,4 @@
+module Noosfero
+  PROJECT = 'noosfero'
+  VERSION = '1.0~rc1'
+end
@@ -137,7 +137,6 @@ namespace :noosfero do
     desc "Translates Noosfero online documentation (does not touch PO files)"
     task :translate => [:link_plugins_textiles, :do_translation]
     task :do_translation => english_xhtml do
-      require_dependency 'noosfero'
       languages = Noosfero.locales.keys - ['en']
       languages.each do |lang|
         po = "po/#{lang}/noosfero-doc.po"
@@ -7,7 +7,11 @@ namespace :noosfero do
     plugin_migration_dirs = Dir.glob(Rails.root.join('{baseplugins,config/plugins}', '*', 'db', 'migrate'))
     task :load_config do
-      dirs = Dir.glob("{baseplugins,config/plugins}/*/db/migrate")
+      dirs = Dir.glob("{baseplugins,config/plugins}/*").uniq do |dir|
+        File.basename(dir)
+      end.map do |dir|
+        File.join(dir, 'db/migrate')
+      end
       dirs.each do |dir|
         ActiveRecord::Migrator.migrations_paths << dir
       end
 # encoding: UTF-8
+require 'noosfero/version'
+$version = Noosfero::VERSION
+
 namespace :noosfero do
   def pendencies_on_authors
-    sh "git status | grep 'AUTHORS' > /dev/null" do |ok, res| 
+    sh "git status | grep 'AUTHORS.md' > /dev/null" do |ok, res|
       return {:ok => !ok, :res => res}
     end
   end
   def pendencies_on_repo
-    sh "git status | grep 'nothing.*commit' > /dev/null" do |ok, res| 
+    sh "git status | grep 'nothing.*commit' > /dev/null" do |ok, res|
       return {:ok => ok, :res => res}
     end
   end
   def pendencies_on_public_errors
-    sh "git status | grep -e '500.html' -e '503.html' > /dev/null" do |ok, res| 
+    sh "git status | grep -e '500.html' -e '503.html' > /dev/null" do |ok, res|
       return {:ok => !ok, :res => res}
     end
   end
@@ -40,32 +43,16 @@ namespace :noosfero do
     end
   end
-  def version
-    require 'noosfero'
-    Noosfero::VERSION
-  end
-
   desc 'checks if there is already a tag for the current version'
   task :check_tag do
-    sh "git tag | grep '^#{version}$' >/dev/null" do |ok, res|
+    sh "git tag | grep '^#{$version}$' >/dev/null" do |ok, res|
       if ok
-        raise "******** There is already a tag for version #{version}, cannot continue"
+        raise "******** There is already a tag for version #{$version}, cannot continue"
       end
     end
-    puts "Not found tag for version #{version}, we can go on."
+    puts "Not found tag for version #{$version}, we can go on."
   end
-  desc 'checks the version of the Debian package'
-  task :check_debian_package do
-    debian_version = `dpkg-parsechangelog | grep Version: | cut -d ' ' -f 2`.strip
-    unless debian_version =~ /^#{version}/
-      puts "Version mismatch: Debian version = #{debian_version}, Noosfero upstream version = #{version}"
-      puts "Run `dch -v #{version}` to add a new changelog entry that upgrades the Debian version"
-      raise "Version mismatch between noosfero version and debian package version"
-    end
-  end
-
-
   AUTHORS_HEADER = <<EOF
 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
@@ -91,15 +78,15 @@ Arts
 Nara Oliveira <narananet@gmail.com>
 EOF
-  desc 'updates the AUTHORS file'
+  desc 'updates the authors file'
   task :authors do
     begin
-      File.open("AUTHORS", 'w') do |output|
+      File.open("AUTHORS.md", 'w') do |output|
         output.puts AUTHORS_HEADER
         output.puts `git log --pretty=format:'%aN <%aE>' | sort | uniq`
         output.puts AUTHORS_FOOTER
       end
-      commit_changes(['AUTHORS'], 'Updating AUTHORS file') if !pendencies_on_authors[:ok]
+      commit_changes(['AUTHORS.md'], 'Updating authors file') if !pendencies_on_authors[:ok]
     rescue Exception => e
       rm_f 'AUTHORS'
       raise e
@@ -131,100 +118,113 @@ EOF
   end
   desc "uploads the packages to the repository"
-  task :upload_packages, :release_kind do |t, args|
-    release_kind = args[:release_kind] || 'stable'
-    sh "dput --unchecked #{release_kind} #{Dir['pkg/*.changes'].first}"
+  task :upload_packages, :target do |t, args|
+    target = args[:target] || 'stable'
+    sh "dput --unchecked noosfero-#{target} #{Dir['pkg/*.changes'].first}"
   end
   desc 'sets the new version on apropriate files'
-  task :set_version, :release_kind do |t, args|
+  task :set_version, :target do |t, args|
     next if File.exist?("tmp/pending-release")
-    release_kind = args[:release_kind] || 'stable'
-
-    if release_kind =~ /test/
-      version_question = "Release candidate of which version: "
-      if release_kind == 'squeeze-test'
-        distribution = 'squeeze-test'
-      elsif release_kind == 'wheezy-test'
-        distribution = 'wheezy-test'
+    target = args[:target]
+
+    new_version = $version.dup
+
+    if target =~ /-test$/
+      if new_version =~ /~rc\d\+/
+        new_version.sub!(/\~rc([0-9]+)/) { "~rc#{$1.to_i + 1}" }
+      else
+        new_version += '~rc1'
       end
     else
-      version_question = "Version that is being released: "
-      distribution = 'unstable'
+      new_version.sub!(/~rc[0-9]+/, '')
     end
-    version_name = new_version = ask(version_question)
-
-    if release_kind =~ /test/
-      timestamp = Time.now.strftime('%Y%m%d%H%M%S')
-      version_name += "~rc#{timestamp}"
-    end
+    puts "Current version: #{$version}"
+    ask("Version to release" % new_version, new_version)
     release_message = ask("Release message")
-    sh 'git checkout debian/changelog lib/noosfero.rb'
-    sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{version_name}'/\" lib/noosfero.rb"
-    sh "dch --newversion #{version_name} --distribution #{distribution} --force-distribution '#{release_message}'"
+    sh 'git checkout debian/changelog lib/noosfero/version.rb'
+    sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{new_version}'/\" lib/noosfero/version.rb"
+    sh "dch --newversion #{new_version} --distribution #{target} --force-distribution '#{release_message}'"
-    sh 'git diff debian/changelog lib/noosfero.rb'
-    if confirm("Commit version bump to #{version_name} on #{distribution} distribution")
-      sh 'git add debian/changelog lib/noosfero.rb'
-      sh "git commit -m 'Bumping version #{version_name}'"
+    sh 'git diff debian/changelog lib/noosfero/version.rb'
+    if confirm("Commit version bump to #{new_version} on #{target} distribution")
+      sh 'git add debian/changelog lib/noosfero/version.rb'
+      sh "git commit -m 'Bumping version #{new_version}'"
       sh "touch tmp/pending-release"
     else
-      sh 'git checkout debian/changelog lib/noosfero.rb'
+      sh 'git checkout debian/changelog lib/noosfero/version.rb'
       abort 'Version update not confirmed. Reverting changes and exiting...'
     end
+
+    $version = new_version
+  end
+
+  task :check_release_deps do
+    missing = false
+    {
+      dput: :dput,
+      dch: :devscripts,
+    }.each do |program, package|
+      if ! system("which #{program} >/dev/null 2>&1")
+        puts "Program #{program} missing, install the package #{package}"
+        missing = true
+      end
+    end
+    abort if missing
   end
   desc 'prepares a release tarball'
-  task :release, :release_kind do |t, args|
-    release_kind = args[:release_kind] || 'stable'
+  task :release, :target do |t, args|
+    target = args[:target]
+    if ! target
+      abort "Usage: rake noosfero:release[TARGET]"
+    end
+
+    puts "==> Checking required packages"
+    Rake::Task['noosfero:check_release_deps'].invoke
     puts "==> Updating authors..."
     Rake::Task['noosfero:authors'].invoke
-    Rake::Task['noosfero:set_version'].invoke(release_kind)
-
-    puts "==> Checking tags..."
-    Rake::Task['noosfero:check_tag'].invoke
-
-    puts "==> Checking debian package version..."
-    Rake::Task['noosfero:check_debian_package'].invoke
-
     puts "==> Checking translations..."
     Rake::Task['noosfero:error-pages:translate'].invoke
     if !pendencies_on_public_errors[:ok]
       commit_changes(['public/500.html', 'public/503.html'], 'Updating public error pages')
     end
+    Rake::Task['noosfero:set_version'].invoke(target)
+
+    puts "==> Checking tags..."
+    Rake::Task['noosfero:check_tag'].invoke
+
     puts "==> Checking repository..."
     Rake::Task['noosfero:check_repo'].invoke
     puts "==> Preparing debian packages..."
     Rake::Task['noosfero:debian_packages'].invoke
-    if confirm('Do you want to upload the packages')
-      puts "==> Uploading debian packages..."
-      Rake::Task['noosfero:upload_packages'].invoke(release_kind)
-    end
-    sh "git tag #{version.gsub('~','-')}"
-    push_tags = confirm('Push new version tag')
-    if push_tags
+    sh "git tag #{$version.gsub('~','-')}"
+    if confirm('Push new version tag')
       repository = ask('Repository name', 'origin')
       puts "==> Uploading tags..."
-      sh "git push #{repository} #{version.gsub('~','-')}"
+      sh "git push #{repository} #{$version.gsub('~','-')}"
     end
-    sh "rm tmp/pending-release" if Dir["tmp/pending-release"].first.present?
+    if confirm('Do you want to upload the packages')
+      puts "==> Uploading debian packages..."
+      Rake::Task['noosfero:upload_packages'].invoke(target)
+    else
+      puts "I: please upload the package manually!"
+    end
-    puts "I: please upload the tarball and Debian packages to the website!"
-    puts "I: please push the tag for version #{version} that was just created!" if !push_tags
-    puts "I: notify the community about this sparkling new version!"
+    rm_f "rm tmp/pending-release"
   end
   desc 'Build Debian packages'
   task :debian_packages => :package do
-    target = "pkg/noosfero-#{Noosfero::VERSION}"
+    target = "pkg/noosfero-#{$version}"
     # base pre-config
     mkdir "#{target}/tmp"
@@ -240,7 +240,7 @@ EOF
   desc 'Test Debian package'
   task 'debian:test' => :debian_packages do
     Dir.chdir 'pkg' do
-      rm_rf "noosfero-#{Noosfero::VERSION}"
+      rm_rf "noosfero-#{$version}"
       sh 'apt-ftparchive packages . > Packages'
       sh 'apt-ftparchive release . > Release'
     end
@@ -5,7 +5,7 @@ namespace :noosfero do
     task :update => ['updatepo', 'noosfero:doc:rebuild']
     desc 'Compiles all translations'
-    task :compile => ['makemo', 'noosfero:doc:translate']
+    task :compile => ['makemo', 'environment', 'noosfero:doc:translate']
   end
 end
 module CommunityTrackPlugin::TrackHelper
+  include CategoriesHelper
+
   def category_class(track)
     'category_' + (track.categories.empty? ? 'not_defined' : track.categories.first.name.to_slug)
   end
@@ -9,4 +11,13 @@ module CommunityTrackPlugin::TrackHelper
     excerpt(lead_stripped, lead_stripped.first(3), track.image ? 180 : 300)
   end
+  def track_color_style(track)
+    category_color_style(track.categories.first.with_color) if !track.categories.empty?
+  end
+
+  def track_name_color_style(track)
+    category = track.categories.empty? ? nil : track.categories.first.with_color
+    category ? "color: ##{category.display_color};" : ''
+  end
+
 end
@@ -52,4 +52,16 @@ class TrackHelperTest &lt; ActiveSupport::TestCase
     assert_equal 186, track_card_lead(@track).length
   end
+  should 'return category color if its defined' do
+    category1 = fast_create(Category, :name => 'education', :display_color => 'fbfbfb')
+    @track.categories << category1
+    assert_equal 'background-color: #fbfbfb;', track_color_style(@track)
+  end
+
+  should 'return category color for track name' do
+    category1 = fast_create(Category, :name => 'education', :display_color => 'fbfbfb')
+    @track.categories << category1
+    assert_equal 'color: #fbfbfb;', track_name_color_style(@track)
+  end
+
 end
@@ -2,13 +2,13 @@
 <div class="item_card <%= category_class(track_card) %>">
   <a href="<%= url_for track_card.url %>">
   <div class="track_content">
-    <div class="title">
+    <div class="title" style="<%= track_color_style(track_card) %>">
       <%= track_card.category_name %>
     </div>
     <div class="image">
       <%= image_tag track_card.image.public_filename if track_card.image %>
     </div>
-    <div class="name">
+    <div class="name" style="<%= track_name_color_style(track_card) %>">
       <%= track_card.name %>
     </div>
     <div class="lead">
@@ -65,10 +65,8 @@ class CustomFormsPluginMyprofileController &lt; MyProfileController
   def submissions
     @form = CustomFormsPlugin::Form.find(params[:id])
-    @submissions = @form.submissions
-
-    @sort_by = params[:sort_by]
-    @submissions = @submissions.sort_by { |s| s.profile.present? ? s.profile.name : s.author_name } if @sort_by == 'author'
+    @sort_by = params[:sort_by] == 'author_name' ? 'author_name' : 'created_at'
+    @submissions = @form.submissions.order(@sort_by)
     respond_to do |format|
       format.html
@@ -6,40 +6,26 @@ class CustomFormsPluginProfileController &lt; ProfileController
     @form = CustomFormsPlugin::Form.find(params[:id])
     if user
-      @submission ||= CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
+      @submission = CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
       @submission ||= CustomFormsPlugin::Submission.new(:form => @form, :profile => user)
     else
-      @submission ||= CustomFormsPlugin::Submission.new(:form => @form)
+      @submission = CustomFormsPlugin::Submission.new(:form => @for)
     end
     # build the answers
-    @submission.answers.push(*(answers = build_answers(params[:submission], @form))) if params[:submission]
+    @answers = if params[:submission] then @submission.build_answers params[:submission] else @submission.answers end
     if request.post?
       begin
         raise 'Submission already present!' if user.present? && CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
         raise 'Form expired!' if @form.expired?
-        # @submission.answers for some reason has the same answer twice
-        failed_answers = answers.select {|answer| !answer.valid? }
-
-        if failed_answers.empty?
-          # Save the submission
-          ActiveRecord::Base.transaction do
-            if !user
-              @submission.author_name = params[:author_name]
-              @submission.author_email = params[:author_email]
-            end
-            @submission.save!
-          end
-        else
-          @submission.errors.clear
-          failed_answers.each do |answer|
-            answer.valid?
-            answer.errors.each do |attribute, msg|
-              @submission.errors.add(answer.field.id.to_s.to_sym, msg)
-            end
-          end
+        if !user
+          @submission.author_name = params[:author_name]
+          @submission.author_email = params[:author_email]
+        end
+
+        if not @submission.save
           raise 'Submission failed: answers not valid'
         end
         session[:notice] = _('Submission saved')
@@ -4,10 +4,7 @@ class AddAdmissionToForm &lt; ActiveRecord::Migration
       t.boolean :for_admission, :default => false
     end 
-    CustomFormsPlugin::Form.find_each do |f|
-      f.for_admission = false
-      f.save!
-    end
+    execute('update custom_forms_plugin_forms set for_admission = (1<0)')
   end
   def self.down
	@@ -1,250 +0,0 @@	@@ -1,250 +0,0 @@
1	-If you are not listed here, but should be, please write to the noosfero mailing
2	-list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
3	-(this list requires subscription to post, but since you are an author of
4	-noosfero, that's not a problem).
5	-
6	-Developers
7	-==========
8	-
9	-Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
10	-Alan Freihof Tygel <alantygel@gmail.com>
11	-alcampelo <alcampelo@alcampelo.(none)>
12	-Alessandro Palmeira <alessandro.palmeira@gmail.com>
13	-Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
14	-Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
15	-Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
16	-Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
17	-Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
18	-Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
19	-Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
20	-Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
21	-Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
22	-Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
23	-Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
24	-Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
25	-Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
26	-Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
27	-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
28	-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
29	-Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
30	-Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
31	-Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
32	-Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
33	-Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
34	-Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
35	-Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
36	-Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
37	-Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
38	-Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
39	-Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
40	-Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
41	-Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
42	-Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
43	-Ana Losnak <analosnak@gmail.com>
44	-Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
45	-Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
46	-Antonio Terceiro <terceiro@colivre.coop.br>
47	-Arthur Del Esposte <arthurmde@gmail.com>
48	-Arthur Del Esposte <arthurmde@yahoo.com.br>
49	-Aurelio A. Heckert <aurelio@colivre.coop.br>
50	-Braulio Bhavamitra <brauliobo@gmail.com>
51	-Bráulio Bhavamitra <brauliobo@gmail.com>
52	-Braulio Bhavamitra <braulio@eita.org.br>
53	-Caio <caio.csalgado@gmail.com>
54	-Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
55	-Caio Formiga <caio.formiga@gmail.com>
56	-Caio, Pedro <caio.csalgado@gmail.com>
57	-Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
58	-Caio Salgado <caio.csalgado@gmail.com>
59	-Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
60	-Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
61	-Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
62	-Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
63	-Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
64	-Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
65	-Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
66	-Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
67	-Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
68	-Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
69	-Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
70	-Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
71	-Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
72	-Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
73	-Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
74	-Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
75	-Caio SBA <caio@colivre.coop.br>
76	-Caio Tiago Oliveira <caiotiago@colivre.coop.br>
77	-Carlos Andre de Souza <carlos.andre.souza@msn.com>
78	-Carlos Morais <carlos88morais@gmail.com>
79	-Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
80	-Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
81	-Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
82	-Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
83	-Daniela Feitosa <dani@dohko.(none)>
84	-Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
85	-Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
86	-Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
87	-Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
88	-Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
89	-Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
90	-Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
91	-Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
92	-Daniel Bucher <daniel.bucher88@gmail.com>
93	-Daniel Cunha <daniel@colivre.coop.br>
94	-David Carlos <ddavidcarlos1392@gmail.com>
95	-diegoamc <diegoamc90@gmail.com>
96	-Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
97	-Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
98	-Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
99	-Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
100	-Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
101	-Diego Araújo <diegoamc90@gmail.com>
102	-Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
103	-Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
104	-Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
105	-Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
106	-Diego Araújo + João Machini <diegoamc90@gmail.com>
107	-Diego Araújo + João Machini <digoamc90@gmail.com>
108	-Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
109	-Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
110	-Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
111	-Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
112	-Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
113	-Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
114	-Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
115	-Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
116	-Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
117	-Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
118	-Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
119	-Diego + Jefferson <diegoamc90@gmail.com>
120	-Diego Martinez <diegoamc90@gmail.com>
121	-Diego Martinez <diego@diego-K55A.(none)>
122	-Diego + Renan <renanteruoc@gmail.com>
123	-Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
124	-Evandro Jr <evandrojr@gmail.com>
125	-Evandro Junior <evandrojr@gmail.com>
126	-Fabio Teixeira <fabio1079@gmail.com>
127	-Fernanda Lopes <nanda.listas+psl@gmail.com>
128	-Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
129	-Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
130	-Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
131	-Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
132	-Gabriela Navarro <navarro1703@gmail.com>
133	-Grazieno Pellegrino <grazieno@gmail.com>
134	-Gust <darksshades@hotmail.com>
135	-Hugo Melo <hugo@riseup.net>
136	-Isaac Canan <isaac@intelletto.com.br>
137	-Italo Valcy <italo@dcc.ufba.br>
138	-Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
139	-Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
140	-Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
141	-João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
142	-João da Silva <jaodsilv@linux.ime.usp.br>
143	-João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
144	-João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
145	-João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
146	-Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
147	-João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
148	-João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
149	-João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
150	-João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
151	-João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
152	-João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
153	-João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
154	-João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
155	-João M. M. da Silva <jaodsilv@linux.ime.usp.br>
156	-Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
157	-João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
158	-João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
159	-João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
160	-João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
161	-João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
162	-João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
163	-João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
164	-João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
165	-João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
166	-Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
167	-João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
168	-João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
169	-João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
170	-Joenio Costa <joenio@colivre.coop.br>
171	-Josef Spillner <josef.spillner@tu-dresden.de>
172	-Junior Silva <junior@bajor.localhost.localdomain>
173	-Junior Silva <juniorsilva1001@gmail.com>
174	-Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
175	-Junior Silva <juniorsilva@colivre.coop.br>
176	-juniorsilva <juniorsilva@QonoS.localhost.localdomain>
177	-Keilla Menezes <keilla@colivre.coop.br>
178	-Larissa Reis <larissa@colivre.coop.br>
179	-Larissa Reis <reiss.larissa@gmail.com>
180	-Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
181	-Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
182	-Leandro Nunes dos Santos <leandronunes@gmail.com>
183	-Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
184	-LinguÁgil 2010 <linguagil.bahia@gmail.com>
185	-Lucas Melo <lucas@colivre.coop.br>
186	-Lucas Melo <lucaspradomelo@gmail.com>
187	-Luciano <lucianopcbr@gmail.com>
188	-Luis David Aguilar Carlos <ludwig9003@gmail.com>
189	-Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
190	-Marcos Ramos <ms.ramos@outlook.com>
191	-Martín Olivera <molivera@solar.org.ar>
192	-Moises Machado <moises@colivre.coop.br>
193	-Naíla Alves <naila@colivre.coop.br>
194	-Nanda Lopes <nanda.listas+psl@gmail.com>
195	-Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
196	-Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
197	-Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
198	-Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
199	-Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
200	-Paulo Meirelles <paulo@softwarelivre.org>
201	-Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
202	-Rafael Gomes <rafaelgomes@techfree.com.br>
203	-Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
204	-Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
205	-Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
206	-Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
207	-Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
208	-Rafael Martins <rmmartins@gmail.com>
209	-Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
210	-Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
211	-Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
212	-Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
213	-Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
214	-Rafael Reggiani Manzo <rr.manzo@gmail.com>
215	-Raphaël Rousseau <raph@r4f.org>
216	-Raquel Lira <raquel.lira@gmail.com>
217	-Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
218	-Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
219	-Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
220	-Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
221	-Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
222	-Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
223	-Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
224	-Rodrigo Souto <diguliu@gmail.com>
225	-Rodrigo Souto <rodrigo@colivre.coop.br>
226	-Ronny Kursawe <kursawe.ronny@googlemail.com>
227	-root <root@debian.sdr.serpro>
228	-Samuel R. C. Vale <srcvale@holoscopio.com>
229	-Valessio Brito <contato@valessiobrito.com.br>
230	-Valessio Brito <contato@valessiobrito.info>
231	-Valessio Brito <valessio@gmail.com>
232	-vfcosta <vfcosta@gmail.com>
233	-Victor Carvalho <victorhugodf.ac@gmail.com>
234	-Victor Costa <vfcosta@gmail.com>
235	-Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
236	-Vinicius Cubas Brand <viniciuscb@gmail.com>
237	-Visita <visita@debian.(none)>
238	-Yann Lugrin <yann.lugrin@liquid-concept.ch>
239	-
240	-Ideas, specifications and incentive
241	-===================================
242	-Daniel Tygel <dtygel@fbes.org.br>
243	-Guilherme Rocha <guilherme@gf7.com.br>
244	-Raphael Rousseau <raph@r4f.org>
245	-Théo Bondolfi <move@cooperation.net>
246	-Vicente Aguiar <vicenteaguiar@colivre.coop.br>
247	-
248	-Arts
249	-===================================
250	-Nara Oliveira <narananet@gmail.com>
	@@ -61,9 +61,21 @@ GEM		@@ -61,9 +61,21 @@ GEM
61	database_cleaner (1.2.0)	61	database_cleaner (1.2.0)
62	diff-lcs (1.1.3)	62	diff-lcs (1.1.3)
63	erubis (2.7.0)	63	erubis (2.7.0)
64	- eventmachine (0.12.11)	64	+ eventmachine (0.12.10)
		65	+ exception_notification (4.0.1)
		66	+ actionmailer (>= 3.0.4)
		67	+ activesupport (>= 3.0.4)
65	fast_gettext (0.6.8)	68	fast_gettext (0.6.8)
66	ffi (1.0.11)	69	ffi (1.0.11)
		70	+ gettext (2.2.1)
		71	+ locale
		72	+ gettext_activerecord (2.1.0)
		73	+ activerecord (>= 2.3.2)
		74	+ gettext (>= 2.1.0)
		75	+ gettext_rails (2.1.0)
		76	+ gettext_activerecord (>= 2.1.0)
		77	+ locale_rails (>= 2.0.5)
		78	+ rails (>= 2.3.2)
67	gherkin (2.4.21)	79	gherkin (2.4.21)
68	json (>= 1.4.6)	80	json (>= 1.4.6)
69	hike (1.2.1)	81	hike (1.2.1)
	@@ -71,6 +83,9 @@ GEM		@@ -71,6 +83,9 @@ GEM
71	i18n (0.6.0)	83	i18n (0.6.0)
72	journey (1.0.3)	84	journey (1.0.3)
73	json (1.7.3)	85	json (1.7.3)
		86	+ locale (2.0.5)
		87	+ locale_rails (2.0.5)
		88	+ locale (>= 2.0.5)
74	mail (2.4.4)	89	mail (2.4.4)
75	i18n (>= 0.4.0)	90	i18n (>= 0.4.0)
76	mime-types (~> 1.16)	91	mime-types (~> 1.16)
	@@ -167,7 +182,9 @@ DEPENDENCIES		@@ -167,7 +182,9 @@ DEPENDENCIES
167	daemons	182	daemons
168	dalli	183	dalli
169	database_cleaner	184	database_cleaner
		185	+ exception_notification
170	fast_gettext	186	fast_gettext
		187	+ gettext_rails
171	hpricot	188	hpricot
172	mocha	189	mocha
173	nokogiri	190	nokogiri
1	#!/usr/bin/env rake	1	#!/usr/bin/env rake
		2	+
2	# Add your own tasks in files placed in lib/tasks ending in .rake,	3	# Add your own tasks in files placed in lib/tasks ending in .rake,
3	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.	4	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4		5
	@@ -51,4 +51,10 @@ class FeaturesController < AdminController		@@ -51,4 +51,10 @@ class FeaturesController < AdminController
51	redirect_to :action => 'manage_fields'	51	redirect_to :action => 'manage_fields'
52	end	52	end
53		53
		54	+ def search_members
		55	+ arg = params[:q].downcase
		56	+ result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%"])
		57	+ render :text => prepare_to_token_input(result).to_json
		58	+ end
		59	+
54	end	60	end
	@@ -7,6 +7,12 @@ class ApplicationController < ActionController::Base		@@ -7,6 +7,12 @@ class ApplicationController < ActionController::Base
7	before_filter :detect_stuff_by_domain	7	before_filter :detect_stuff_by_domain
8	before_filter :init_noosfero_plugins	8	before_filter :init_noosfero_plugins
9	before_filter :allow_cross_domain_access	9	before_filter :allow_cross_domain_access
		10	+ before_filter :login_required, :if => :private_environment?
		11	+ before_filter :verify_members_whitelist, :if => :user
		12	+
		13	+ def verify_members_whitelist
		14	+ render_access_denied unless user.is_admin? \|\| environment.in_whitelist?(user)
		15	+ end
10		16
11	after_filter :set_csrf_cookie	17	after_filter :set_csrf_cookie
12		18
	@@ -187,4 +193,8 @@ class ApplicationController < ActionController::Base		@@ -187,4 +193,8 @@ class ApplicationController < ActionController::Base
187	{:results => scope.paginate(paginate_options)}	193	{:results => scope.paginate(paginate_options)}
188	end	194	end
189		195
		196	+ def private_environment?
		197	+ @environment.enabled?(:restrict_to_members)
		198	+ end
		199	+
190	end	200	end
	@@ -4,6 +4,7 @@ class TasksController < MyProfileController		@@ -4,6 +4,7 @@ class TasksController < MyProfileController
4		4
5	def index	5	def index
6	@filter = params[:filter_type].blank? ? nil : params[:filter_type]	6	@filter = params[:filter_type].blank? ? nil : params[:filter_type]
		7	+ @task_types = Task.pending_types_for(profile)
7	@tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])	8	@tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
8	@failed = params ? params[:failed] : {}	9	@failed = params ? params[:failed] : {}
9	end	10	end
	@@ -11,7 +11,7 @@ class CatalogController < PublicController		@@ -11,7 +11,7 @@ class CatalogController < PublicController
11	protected	11	protected
12		12
13	def check_enterprise_and_environment	13	def check_enterprise_and_environment
14	- unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')	14	+ unless profile.enterprise? && @profile.environment.enabled?('products_for_enterprises')
15	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'	15	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
16	end	16	end
17	end	17	end
1	module CategoriesHelper	1	module CategoriesHelper
2		2
3	-
4	- COLORS = [
5	- [ N_('Do not display at the menu'), nil ],
6	- [ N_('Orange'), 1],
7	- [ N_('Green'), 2],
8	- [ N_('Purple'), 3],
9	- [ N_('Red'), 4],
10	- [ N_('Dark Green'), 5],
11	- [ N_('Blue Oil'), 6],
12	- [ N_('Blue'), 7],
13	- [ N_('Brown'), 8],
14	- [ N_('Light Green'), 9],
15	- [ N_('Light Blue'), 10],
16	- [ N_('Dark Blue'), 11],
17	- [ N_('Blue Pool'), 12],
18	- [ N_('Beige'), 13],
19	- [ N_('Yellow'), 14],
20	- [ N_('Light Brown'), 15]
21	- ]
22	-
23	TYPES = [	3	TYPES = [
24	[ _('General Category'), Category.to_s ],	4	[ _('General Category'), Category.to_s ],
25	[ _('Product Category'), ProductCategory.to_s ],	5	[ _('Product Category'), ProductCategory.to_s ],
26	[ _('Region'), Region.to_s ],	6	[ _('Region'), Region.to_s ],
27	]	7	]
28		8
29	- def select_color_for_category
30	- if @category.top_level?
31	- labelled_form_field(_('Display at the menu?'), select('category', 'display_color', CategoriesHelper::COLORS.map {\|item\| [gettext(item[0]), item[1]] }))
32	- else
33	- ""
34	- end
35	- end
36	-
37	- def display_color_for_category(category)
38	- color = category.display_color
39	- if color.nil?
40	- ""
41	- else
42	- "[" + gettext(CategoriesHelper::COLORS.find {\|item\| item[1] == color}.first) + "]"
43	- end
44	- end
45	-
46	def select_category_type(field)	9	def select_category_type(field)
47	value = params[field]	10	value = params[field]
48	labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))	11	labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
49	end	12	end
50		13
		14	+ def category_color_style(category)
		15	+ return '' if category.nil? or category.display_color.blank?
		16	+ 'background-color: #'+category.display_color+';'
		17	+ end
		18	+
51	#FIXME make this test	19	#FIXME make this test
52	def selected_category_link(cat)	20	def selected_category_link(cat)
53	js_remove = "jQuery('#selected-category-#{cat.id}').remove();"	21	js_remove = "jQuery('#selected-category-#{cat.id}').remove();"
	@@ -10,7 +10,7 @@ module ContentViewerHelper		@@ -10,7 +10,7 @@ module ContentViewerHelper
10	end	10	end
11		11
12	def number_of_comments(article)	12	def number_of_comments(article)
13	- display_number_of_comments(article.comments.without_spam.count)	13	+ display_number_of_comments(article.comments_count - article.spam_comments_count)
14	end	14	end
15		15
16	def article_title(article, args = {})	16	def article_title(article, args = {})
	@@ -26,7 +26,7 @@ module ContentViewerHelper		@@ -26,7 +26,7 @@ module ContentViewerHelper
26	end	26	end
27	title << content_tag('span',	27	title << content_tag('span',
28	content_tag('span', show_date(article.published_at), :class => 'date') +	28	content_tag('span', show_date(article.published_at), :class => 'date') +
29	- content_tag('span', _(", by %s") % link_to(article.author_name, article.author_url), :class => 'author') +	29	+ content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
30	content_tag('span', comments, :class => 'comments'),	30	content_tag('span', comments, :class => 'comments'),
31	:class => 'created-at'	31	:class => 'created-at'
32	)	32	)
	@@ -2,7 +2,7 @@ require 'noosfero/multi_tenancy'		@@ -2,7 +2,7 @@ require 'noosfero/multi_tenancy'
2		2
3	class Domain < ActiveRecord::Base	3	class Domain < ActiveRecord::Base
4		4
5	- attr_accessible :name, :owner	5	+ attr_accessible :name, :owner, :is_default
6		6
7	# relationships	7	# relationships
8	###############	8	###############