Merge branch 'master' into api

Conflicts: Gemfile

Merge branch 'master' into api
Conflicts: Gemfile
Victor Costa
2 parents cbc96f12 f323c51d
Showing 671 changed files with 90386 additions and 95088 deletions Show diff stats
.ackrc
AUTHORS
AUTHORS.md
Gemfile
Gemfile.lock
INSTALL.chat.md
INSTALL.https.md
INSTALL.varnish.md
Rakefile
Vagrantfile
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/categories_controller.rb
app/controllers/admin/environment_design_controller.rb
app/controllers/admin/features_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
@@ -0,0 +1,5 @@
+--ignore-dir=log
+--ignore-dir=tmp
+--ignore-dir=pkg
+--ignore-dir=public/javascripts/cache
+--ignore-dir=public/stylesheets/cache
@@ -1,240 +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
-==========
-
-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@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>
-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>
-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>
-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 <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>
-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>
-Luis David Aguilar Carlos <ludwig9003@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,13 @@ 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>
+Andre Bernardes <andrebsguedes@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
+Arthur Del Esposte <arthurmde@gmail.com>
+Arthur Del Esposte <arthurmde@yahoo.com.br>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
@@ -65,11 +74,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 +90,9 @@ Daniel Alves + Diego Araújo + Guilherme Rojas &lt;guilhermehrojas@gmail.com&gt;
 Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
 Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
+Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
+David Carlos <ddavidcarlos1392@gmail.com>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
@@ -107,15 +121,26 @@ 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>
+Hebert Douglas <hebertdougl@gmail.com>
+Hugo Melo <hugo@riseup.net>
 Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
 Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
+João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
 João da Silva <jaodsilv@linux.ime.usp.br>
 João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
@@ -146,17 +171,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 +226,21 @@ 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>
+Tallys Martins <tallysmartins@gmail.com>
+tallys <tallys@tallys.(none)>
+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>
 source "https://rubygems.org"
-gem 'rails'
-gem 'fast_gettext'
-gem 'acts-as-taggable-on'
-gem 'prototype-rails'
-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
-gem 'rails_autolink'
-gem 'pg'
-gem 'rmagick'
-gem 'RedCloth'
-gem 'will_paginate'
-gem 'ruby-feedparser'
-gem 'daemons'
-gem 'thin'
-gem 'hpricot'
-gem 'nokogiri'
+gem 'rails',                    '~> 3.2.19'
+gem 'fast_gettext',             '~> 0.6.8'
+gem 'acts-as-taggable-on',      '~> 3.0.2'
+gem 'prototype-rails',          '~> 3.2.1'
+gem 'prototype_legacy_helper',  '0.0.0', :path => 'vendor/prototype_legacy_helper'
+gem 'rails_autolink',           '~> 1.1.5'
+gem 'pg',                       '~> 0.13.2'
+gem 'rmagick',                  '~> 2.13.1'
+gem 'RedCloth',                 '~> 4.2.9'
+gem 'will_paginate',            '~> 3.0.3'
+gem 'ruby-feedparser',          '~> 0.7'
+gem 'daemons',                  '~> 1.1.5'
+gem 'thin',                     '~> 1.3.1'
+gem 'hpricot',                  '~> 0.8.6'
+gem 'nokogiri',                 '~> 1.5.5'
 gem 'rake', :require => false
+gem 'rest-client',              '~> 1.6.7'
+gem 'exception_notification',   '~> 4.0.1'
+gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
 gem 'grape', '0.2.1'
  
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
  
 group :production do
-  gem 'dalli'
+  gem 'dalli', '~> 2.7.0'
 end
  
 group :test do
-  gem 'rspec'
-  gem 'rspec-rails'
+  gem 'rspec',                  '~> 2.10.0'
+  gem 'rspec-rails',            '~> 2.10.1'
+  gem 'mocha',                  '~> 1.1.0', :require => false
 end
  
 group :cucumber do
-  gem 'rake'
-  gem 'cucumber-rails', :require => false
-  gem 'capybara'
-  gem 'cucumber'
-  gem 'database_cleaner'
-  gem 'selenium-webdriver'
+  gem 'cucumber-rails',         '~> 1.0.6', :require => false
+  gem 'capybara',               '~> 2.1.0'
+  gem 'cucumber',               '~> 1.0.6'
+  gem 'database_cleaner',       '~> 1.2.0'
+  gem 'selenium-webdriver',     '~> 2.39.0'
 end
  
 # include plugin gemfiles
@@ -1,180 +0,0 @@
-PATH
-  remote: vendor/prototype_legacy_helper
-  specs:
-    prototype_legacy_helper (0.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    actionmailer (3.2.6)
-      actionpack (= 3.2.6)
-      mail (~> 2.4.4)
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    acts-as-taggable-on (3.0.2)
-      rails (>= 3, < 5)
-    arel (3.0.2)
-    builder (3.0.0)
-    capybara (2.1.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.3.3)
-      ffi (~> 1.0.6)
-    cucumber (1.0.6)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.0.6)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.0.6)
-      nokogiri (>= 1.5.0)
-    daemons (1.1.5)
-    dalli (2.7.0)
-    database_cleaner (1.2.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    eventmachine (0.12.11)
-    fast_gettext (0.6.8)
-    ffi (1.0.11)
-    gherkin (2.4.21)
-      json (>= 1.4.6)
-    hike (1.2.1)
-    hpricot (0.8.6)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.3)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
-    pg (0.13.2)
-    polyglot (0.3.3)
-    prototype-rails (3.2.1)
-      rails (~> 3.2)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.6)
-      actionmailer (= 3.2.6)
-      actionpack (= 3.2.6)
-      activerecord (= 3.2.6)
-      activeresource (= 3.2.6)
-      activesupport (= 3.2.6)
-      bundler (~> 1.0)
-      railties (= 3.2.6)
-    rails_autolink (1.1.5)
-      rails (> 3.1)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.9.4)
-    rmagick (2.13.1)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.10.0)
-    ruby-feedparser (0.7)
-    rubyzip (1.1.2)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.7)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.15.3)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    websocket (1.0.7)
-    will_paginate (3.0.3)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  acts-as-taggable-on
-  capybara
-  cucumber
-  cucumber-rails
-  daemons
-  dalli
-  database_cleaner
-  fast_gettext
-  hpricot
-  nokogiri
-  pg
-  prototype-rails
-  prototype_legacy_helper (= 0.0.0)!
-  rails
-  rails_autolink
-  rake
-  rmagick
-  rspec
-  rspec-rails
-  ruby-feedparser
-  selenium-webdriver
-  thin
-  will_paginate
-XMPP/Chat Client Setup
-======================
+XMPP/Chat Setup
+===============
  
-To configure XMPP/BOSH in Noosfero you need:
+The samples of config file to configure a XMPP/BOSH server with ejabberd,
+postgresql and apache2 can be found at util/chat directory.
  
-* REST Client - http://github.com/archiloque/rest-client
-* SystemTimer - http://ph7spot.com/musings/system-timer
-* Pidgin data files - http://www.pidgin.im/
+This setup supposes that you are using Noosfero installed via Debian package
+in a production environment.
  
-If you use Debian 6.0 (squeeze):
-
-    # apt-get install librestclient-ruby pidgin-data ruby1.8-dev
-    # gem install SystemTimer
-
-The samples of config file to configure a XMPP/BOSH server with ejabberd, postgresql and apache2 can be found at util/chat directory.
-
-XMPP/Chat Server Setup
-======================
+Steps
+=====
  
 This is a step-by-step guide to get a XMPP service working, in a Debian system.
  
 ## 1. Install the required packages
  
-    # apt-get install ejabberd odbc-postgresql
+    # apt-get install ejabberd odbc-postgresql librestclient-ruby pidgin-data ruby1.8-dev
+    # gem install SystemTimer
  
 ## 2. Ejabberd configuration
  
-All the following changes must be done in config file: `/etc/ejabberd/ejabberd.cfg`
-
-### 2.1. Set the default admin user
-
-    { acl, admin, { user, "john", "www.example.com" } }.
-    { acl, admin, { user, "bart", "www.example.com" } }.
-
-### 2.2. Set the default host
-
-    { hosts, [ "www.example.com" ] }.
-
-### 2.3. Http-Bind activation
-
-    { 5280, ejabberd_http, [
-          http_bind,
-          web_admin
-       ]
-    }
-
-    (...)
-
-    { modules, [
-       {mod_http_bind, []},
-       ...
-    ] }.
-
-Ejabberd creates semi-anonymous rooms by default, but Noosfero's Jabber client needs non-anonymous room, then we need to change default params of creation rooms in ejabberd to create non-anonymous rooms.
-
-In non-anonymous rooms the jabber service sends the new occupant's full JID to all occupants in the room [[1]].
+    # cp /usr/share/noosfero/util/chat/ejabberd.cfg /etc/ejabberd/
  
-Add option "`{default_room_options, [{anonymous, false}]}`" to `/etc/ejabberd/ejabberd.cfg` in mod_muc session. See below:
+Edit the /etc/ejabberd/ejabberd.cfg file and set your domain on the first 2 lines.
  
-    { mod_muc, [
-       %%{host, "conference.@HOST@"},
-       {access, muc},
-       {access_create, muc},
-       {access_persistent, muc},
-       {access_admin, muc_admin},
-       {max_users, 500},
-       {default_room_options, [{anonymous, false}]}
-    ]},
-
-[1]: http://xmpp.org/extensions/xep-0045.html#enter-nonanon
-
-
-### 2.4. Authentication method
-
-To use Postgresql through ODBC, the following modifications must be done:
-
- * Disable the default method:
-   `{auth_method, internal}.`
-
- * Enable autheticantion through ODBC:
-   `{auth_method, odbc}.`
+## 3. Configuring Postgresql
  
- * Set database server name
-   `{odbc_server, "DSN=PostgreSQLEjabberdNoosfero"}.`
+Give permission to noosfero user create new roles, login as
+postgres user and execute:
  
+    $ psql
+    postgres=# GRANT CREATE ON DATABASE noosfero TO noosfero;
  
-### 2.5. Increase the shaper traffic limit
+Change the postgresql authentication method to md5 instead of ident,
+add the following line to the file /etc/postgresql/8.4/main/pg_hba.conf:
  
-    { shaper, normal, { maxrate, 10000000 } }.
+   # Noosfero user
+   local   noosfero    noosfero                          md5
  
+(add this line before the following line)
  
-### 2.6. Disable unused modules
+   # "local" is for Unix domain socket connections only
+   local   all         all                               ident
  
-Unused modules can be disabled, for example:
+Restart postgresql server:
  
- * s2s
- * web_admin
- * mod_pubsub
- * mod_irc
- * mod_offline
- * mod_admin_extra
- * mod_register
+    # service postgresql restart
  
+Login as noosfero user, and execute:
  
-### 2.7. Enable ODBC modules
+    $ psql -U noosfero -W noosfero < /usr/share/noosfero/util/chat/postgresql/ejabberd.sql
  
- * mod_privacy -> mod_privacy_odbc
- * mod_private -> mod_private_odbc
- * mod_roster  -> mod_roster_odbc
+(see database password in the /etc/noosfero/database.yml file)
  
-## 3. Configuring Postgresql
+This will create a new schema inside the noosfero database, called `ejabberd`.
  
-Login as noosfero user, and execute:
+Note that there should be at least one domain with `is_default = true` in
+`domains` table, otherwise people won't be able to see their friends online.
  
-    $ psql noosfero < /path/to/noosfero/util/chat/postgresql/ejabberd.sql
+## 4. ODBC configuration
  
-Where `noosfero` may need to be replace by the name of the database used for Noosfero.
+Create the following files:
  
-This will create a new schema inside the noosfero database, called `ejabberd`.
+    # cp /usr/share/noosfero/util/chat/odbc.ini /etc/
+    # cp /usr/share/noosfero/util/chat/odbcinst.ini /etc/
  
-Note `noosfero` user should have permission to create Postgresql schemas. Also, there should be at least one domain with `is_default = true` in `domains` table, otherwise people won't be able to see their friends online.
+Edit the odbc.ini file and set the password for the database user, see
+the file /etc/noosfero/database.yml to get the password.
  
-## 4. ODBC configuration
+Adjust premissions:
  
-The following files must be created:
-
-`/etc/odbc.ini`:
-
-    [PostgreSQLEjabberdNoosfero]
-    Description      = PostgreSQL Noosfero ejabberd database
-    Driver           = PostgreSQL Unicode
-    Trace            = No
-    TraceFile        = /tmp/psqlodbc.log
-    Database         = noosfero
-    Servername       = localhost
-    UserName         = <DBUSER>
-    Password         = <DBPASS>
-    Port             =
-    ReadOnly         = No
-    RowVersioning    = No
-    ShowSystemTables = No
-    ShowOidColumn    = No
-    FakeOidIndex     = No
-    ConnSettings     = SET search_path TO ejabberd
-
-`/etc/odbcinst.ini`:
-
-    [PostgreSQL Unicode]
-    Description = PostgreSQL ODBC driver (Unicode version)
-    Driver      = /usr/lib/odbc/psqlodbcw.so
-    Setup       = /usr/lib/odbc/libodbcpsqlS.so
-    Debug       = 0
-    CommLog     = 1
-    UsageCount  = 3
+    # chmod 640 /etc/odbc.ini
+    # chown ejabberd /etc/odbc.ini
  
 ## 4.1 testing all:
  
@@ -159,7 +78,6 @@ The following files must be created:
  
 If the configuration was done right, the message "Connected!" will be displayed.
  
-
 ## 5. Enabling kernel polling and SMP in `/etc/default/ejabberd`
  
     POLL=true
@@ -205,32 +123,45 @@ Note: module proxy_http must be enabled:
  
     # a2enmod proxy_http
  
-## 8. DNS configuration
+Restart services:
  
-For this point, we assume you are using BIND as your DNS server. You need to add the following entries to the DNS zone file corresponding to the domain of your noosfero site:
+    # service ejabberd restart
+    # service noosfero restart
+    # service apache2 restart
  
-    _xmpp-client._tcp   SRV   5 100 5222 master
-    conference   CNAME master
-    _xmpp-client._tcp.conference   SRV   5 100 5222 master
+## 8. Test Apache Configuration
  
-If you are running a DNS server other than BIND, you will have to figure out how to create equivalente rules for your zone file. Patches to this documentation are welcome.
+Open in your browser the address:
  
-## 9. Testing this Setup
+    http://<yout domain>/http-bind
  
-Adjust shell limits to proceed with some benchmarks and load tests: 
+You should see a page with a message like that:
  
-    # ulimit −s 256
-    # ulimit −n 8192
-    # echo 10 > /proc/sys/net/ipv4/tcp_syn_retries
+   ejabberd mod_http_bind
+   An implementation of XMPP over BOSH (XEP-0206)
+   This web page is only informative. To use HTTP-Bind you need a Jabber/XMPP
+   client that supports it.
  
-To measure the bandwidth between server and client:
+## 9. Test chat session
  
- * at server side:
-   `# iperf −s`
+Open Noosfero console and execute:
  
- * at client side:
-   `# iperf −c server_ip`
+>> environment = Environment.default
+>> user = Person['guest']
+>> password = user.user.crypted_password
+>> login = user.jid
+>> RubyBOSH.initialize_session(login, password, "http://#{environment.default_hostname}/http-bind", :wait => 30, :hold => 1, :window => 5
  
-For heavy load tests, clone and use this software:
+If you have luck, should see something like that:
  
-    $ git clone http://git.holoscopio.com/git/metal/tester.git
+Ruby-BOSH - SEND
+<body window="5" rid="60265" xmlns="http://jabber.org/protocol/httpbind" xmlns:xmpp="urn:xmpp:xbosh" to="vagrant-debian-squeeze.vagrantup.com" wait="30" xmpp:version="1.0" hold="1"/>
+Ruby-BOSH - SEND
+<body rid="60266" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"><auth mechanism="PLAIN" xmlns="urn:ietf:params:xml:ns:xmpp-sasl">Z3Vlc3RAdmFncmFudC1kZWJpYW4tc3F1ZWV6ZS52YWdyYW50dXAuY29tAGd1ZXN0ADEzZTFhYWVlYjRhYjZlMTA0MmRkNWI1YWY0MzM4MjA1OGJiOWZmNzk=</auth></body>
+Ruby-BOSH - SEND
+<body xmpp:restart="true" rid="60267" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"/>
+Ruby-BOSH - SEND
+<body rid="60268" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"><iq type="set" xmlns="jabber:client" id="bind_29330"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><resource>bosh_9631</resource></bind></iq></body>
+Ruby-BOSH - SEND
+<body rid="60269" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"><iq type="set" xmlns="jabber:client" id="sess_21557"><session xmlns="urn:ietf:params:xml:ns:xmpp-session"/></iq></body>
+=> ["guest@vagrant-debian-squeeze.vagrantup.com", "24cdfc43646a2af1059a7060b677c2e11b26f34f", 60270]
@@ -0,0 +1,115 @@
+Setup Noosfero to use HTTPS
+===========================
+
+This document assumes that you have a fully and clean Noosfero
+installation as explained at the `INSTALL.md` file.
+
+SSL certificate
++++++++++++++++
+
+You should get a valid SSL certificate, but if you want to test
+your setup before, you could generate a self-signed certificate
+as below:
+
+    # mkdir /etc/noosfero/ssl
+    # cd /etc/noosfero/ssl
+	  # openssl genrsa 1024 > noosfero.key
+    # openssl req -new -x509 -nodes -sha1 -days $[10*365] -key noosfero.key > noosfero.cert
+    # cat noosfero.key noosfero.cert > noosfero.pem
+
+There are two ways of using SSL with Noosfero: 1) If you are not using
+Varnish; and 2) If you are using Varnish.
+
+1) If you are are not using Varnish
++++++++++++++++++++++++++++++++++++
+
+Simply do a redirect in apache to force all connections with SSL:
+
+  <VirtualHost *:8080>
+    ServerName test.stoa.usp.br
+   
+    Redirect / https://example.com/
+  </VirtualHost>
+
+And set a vhost to receive then:
+
+  <VirtualHost *:443>
+    ServerName example.com
+   
+    SSLEngine On
+    SSLCertificateFile    /etc/ssl/certs/cert.pem
+    SSLCertificateKeyFile /etc/ssl/private/cert.key
+   
+    Include /etc/noosfero/apache/virtualhost.conf
+  </VirtualHost>
+
+Be aware that if you had configured varnish, the requests won't reach
+it with this configuration.
+
+2) If you are using Varnish
++++++++++++++++++++++++++++
+
+Varnish isn't able to communicate with the SSL protocol, so we will
+need some one who do this and Pound[1] can do the job. In order to
+install it in Debian based systems:
+
+  $ sudo apt-get install pound
+
+Set Varnish to listen in other port than 80:
+
+/etc/defaults/varnish
+---------------------
+
+  DAEMON_OPTS="-a localhost:6081 \
+               -T localhost:6082 \ 
+               -f /etc/varnish/default.vcl \ 
+               -S /etc/varnish/secret \ 
+               -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
+
+Configure Pound:
+
+    # cp /usr/share/noosfero/etc/pound.cfg /etc/pound/
+
+Edit /etc/pound.cfg and set the IP and domain of your server.
+
+Configure Pound to start at system initialization:
+
+/etc/default/pound
+------------------
+
+  startup=1
+
+Set Apache to only listen to localhost:
+
+/etc/apache2/ports.conf
+-----------------------
+
+  Listen 127.0.0.1:8080
+
+Restart the services:
+
+  $ sudo service apache2 restart
+  $ sudo service varnish restart
+
+Start pound:
+
+  $ sudo service pound start
+
+[1] http://www.apsis.ch/pound
+
+Noosfero XMPP chat
+++++++++++++++++++
+
+If you want to use chat over HTTPS, then you should add the domain
+and IP of your server in the /etc/hosts file, example:
+
+/etc/hosts
+----------
+
+  192.168.1.86	mydomain.example.com
+
+Also, it's recomended that you remove lines above from the file
+`/etc/apache2/sites-enabled/noosfero`:
+
+    RewriteEngine On
+    Include /usr/share/noosfero/util/chat/apache/xmpp.conf
@@ -24,10 +24,6 @@ Install the RPAF apache module (or skip this step if not using apache):
  
 3b) Edit `/etc/apache2/sites-enabled/*`, and change `<VirtualHost *:80>` to `<VirtualHost *:8080>`
  
-3c) Restart apache
-
-    # invoke-rc.d apache2 restart
-
 4) Varnish configuration
  
 4a) Edit `/etc/default/varnish`
@@ -44,10 +40,6 @@ On manual installations, change `/etc/noosfero/*` to `{Rails.root}/etc/noosfero/
  
 **NOTE**: it is very important that the `*.vcl` files are included in that order, i.e. *first* include `varnish-noosfero.vcl`, and *after* `noosfero-accept-language.cvl`.
  
-4c) Restart Varnish
-
-    # invoke-rc.d varnish restart
-
 5) Enable varnish logging:
  
 5a) Edit `/etc/default/varnishncsa` and uncomment the line that contains:
@@ -56,8 +48,10 @@ On manual installations, change `/etc/noosfero/*` to `{Rails.root}/etc/noosfero/
  
 The varnish log will be written to `/var/log/varnish/varnishncsa.log` in an apache-compatible format. You should change your statistics generation software (e.g. awstats) to use that instead of apache logs.
  
-5b) Restart Varnish Logging service
+Thanks to Cosimo Streppone for varnish-accept-language. See http://github.com/cosimo/varnish-accept-language for more information.
  
-    # invoke-rc.d varnishncsa restart
+6) Restart services
  
-Thanks to Cosimo Streppone for varnish-accept-language. See http://github.com/cosimo/varnish-accept-language for more information.
+    # service apache2 restart
+    # service varnish restart
+    # service varnishncsa restart
 #!/usr/bin/env rake
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
  
 require File.expand_path('../config/application', __FILE__)
  
 Noosfero::Application.load_tasks
+
+[
+  "baseplugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+  "config/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+  "config/plugins/*/vendor/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+].map do |pattern|
+  Dir.glob(pattern).sort
+end.flatten.each do |taskfile|
+  load taskfile
+end
@@ -3,7 +3,7 @@
  
 VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "debian-wheezy"
+  config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
   config.vm.network :forwarded_port, host: 3000, guest: 3000
   config.vm.provision :shell do |shell|
     shell.inline = 'su vagrant -c /vagrant/script/vagrant'
@@ -7,6 +7,7 @@ class AdminPanelController &lt; AdminController
   end
  
   def site_info
+    @no_design_blocks = true
     if request.post?
       if params[:environment][:languages]
         params[:environment][:languages] = params[:environment][:languages].map {|lang, value| lang if value=='true'}.compact
@@ -45,9 +45,11 @@ class CategoriesController &lt; AdminController
       if request.post?
         @category.update_attributes!(params[:category])
         @saved = true
+        session[:notice] = _("Category %s saved." % @category.name)
         redirect_to :action => 'index'
       end
     rescue Exception => e
+      session[:notice] = _('Could not save category.')
       render :action => 'edit'
     end
   end
@@ -3,9 +3,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
  
   def available_blocks
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
  
@@ -51,4 +51,10 @@ class FeaturesController &lt; AdminController
     redirect_to :action => 'manage_fields'
   end
  
+  def search_members
+    arg = params[:q].downcase
+    result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%"])
+    render :text => prepare_to_token_input(result).to_json
+  end
+
 end
@@ -7,6 +7,12 @@ class ApplicationController &lt; ActionController::Base
   before_filter :detect_stuff_by_domain
   before_filter :init_noosfero_plugins
   before_filter :allow_cross_domain_access
+  before_filter :login_required, :if => :private_environment?
+  before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
+
+  def verify_members_whitelist
+    render_access_denied unless user.is_admin? || environment.in_whitelist?(user)
+  end
  
   after_filter :set_csrf_cookie
  
@@ -34,7 +40,7 @@ class ApplicationController &lt; ActionController::Base
  
     theme_layout = theme_option(:layout)
     if theme_layout
-      theme_view_file('layouts/'+theme_layout) || theme_layout
+      (theme_view_file('layouts/'+theme_layout) || theme_layout).to_s
     else
      'application'
     end
@@ -187,4 +193,8 @@ class ApplicationController &lt; ActionController::Base
     {:results => scope.paginate(paginate_options)}
   end
  
+  def private_environment?
+    @environment.enabled?(:restrict_to_members)
+  end
+
 end
@@ -4,6 +4,12 @@ class CmsController &lt; MyProfileController
  
   include ArticleHelper
  
+  def search_tags
+    arg = params[:term].downcase
+    result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
+  end
+
   def self.protect_if(*args)
     before_filter(*args) do |c|
       user, profile = c.send(:user), c.send(:profile)
@@ -143,7 +149,9 @@ class CmsController &lt; MyProfileController
     end
  
     @article.profile = profile
+    @article.author = user
     @article.last_changed_by = user
+    @article.created_by = user
  
     translations if @article.translatable?
  
@@ -187,7 +195,18 @@ class CmsController &lt; MyProfileController
     end
     if request.post? && params[:uploaded_files]
       params[:uploaded_files].each do |file|
-        @uploaded_files << UploadedFile.create({:uploaded_data => file, :profile => profile, :parent => @parent, :last_changed_by => user}, :without_protection => true) unless file == ''
+        unless file == ''
+          @uploaded_files << UploadedFile.create(
+            {
+              :uploaded_data => file,
+              :profile => profile,
+              :parent => @parent,
+              :last_changed_by => user,
+              :author => user,
+            },
+            :without_protection => true
+          )
+        end
       end
       @errors = @uploaded_files.select { |f| f.errors.any? }
       if @errors.any?
@@ -208,7 +227,7 @@ class CmsController &lt; MyProfileController
     @article = profile.articles.find(params[:id])
     if request.post?
       @article.destroy
-      session[:notice] = _("\"#{@article.name}\" was removed.")
+      session[:notice] = _("\"%s\" was removed." % @article.name)
       referer = Rails.application.routes.recognize_path URI.parse(request.referer).path rescue nil
       if referer and referer[:controller] == 'cms' and referer[:action] != 'edit'
         redirect_to referer
@@ -231,7 +250,7 @@ class CmsController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     end
-    render :template => 'shared/update_categories', :locals => { :category => @current_category }
+    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'article' }
   end
  
   def publish
@@ -247,12 +266,15 @@ class CmsController &lt; MyProfileController
     end.compact unless params[:marked_groups].nil?
     if request.post?
       @failed = {}
+      if @marked_groups.empty?
+        return session[:notice] = _("Select some group to publish your article")
+      end
       @marked_groups.each do |item|
         task = ApproveArticle.create!(:article => @article, :name => item[:name], :target => item[:group], :requestor => profile)
         begin
           task.finish unless item[:group].moderated_articles?
         rescue Exception => ex
-           @failed[ex.message] ? @failed[ex.message] << item[:group].name : @failed[ex.message] = [item[:group].name]
+          @failed[ex.message] ? @failed[ex.message] << item[:group].name : @failed[ex.message] = [item[:group].name]
         end
       end
       if @failed.blank?
@@ -11,7 +11,7 @@ class FriendsController &lt; MyProfileController
   def remove
     @friend = profile.friends.find(params[:id])
     if request.post? && params[:confirmation]
-      profile.remove_friend(@friend)
+      Friendship.remove_friendship(profile, @friend)
       redirect_to :action => 'index'
     end
   end
@@ -20,7 +20,7 @@ class FriendsController &lt; MyProfileController
  
   class << self
     def per_page
-      10
+      12
     end
   end
   def per_page
@@ -7,9 +7,9 @@ class MembershipsController &lt; MyProfileController
       ra = profile.role_assignments.find_by_role_id(role.id)
       ra.present? && ra.resource_type == 'Profile'
     end
-    @filter = params[:filter_type].blank? ? nil : params[:filter_type]
+    @filter = params[:filter_type].to_i
     begin
-      @memberships = @filter.nil? ? profile.memberships : profile.memberships_by_role(environment.roles.find(@filter))
+      @memberships = @filter.zero? ? profile.memberships : profile.memberships_by_role(environment.roles.find(@filter))
     rescue ActiveRecord::RecordNotFound
       @memberships = []
     end
@@ -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
@@ -9,14 +9,8 @@ class ProfileDesignController &lt; BoxOrganizerController
  
     blocks += plugins.dispatch(:extra_blocks)
  
-    # blocks exclusive for organizations
-    if profile.has_members?
-      blocks << MembersBlock
-    end
-
     # blocks exclusive to people
     if profile.person?
-      blocks << FriendsBlock
       blocks << FavoriteEnterprisesBlock
       blocks << CommunitiesBlock
       blocks << EnterprisesBlock
@@ -54,7 +54,7 @@ class ProfileEditorController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     end
-    render :template => 'shared/update_categories', :locals => { :category => @current_category }
+    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'profile_data' }
   end
  
   def header_footer
@@ -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,9 +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!")
-      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
@@ -35,6 +49,7 @@ class AccountController &lt; ApplicationController
     self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
  
     if logged_in?
+      check_join_in_community(self.current_user)
       if params[:remember_me] == "1"
         self.current_user.remember_me
         cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
@@ -82,6 +97,7 @@ class AccountController &lt; ApplicationController
       @user.return_to = session[:return_to]
       @person = Person.new(params[:profile_data])
       @person.environment = @user.environment
+
       if request.post?
         if may_be_a_bot
           set_signup_start_time_for_now
@@ -91,6 +107,7 @@ class AccountController &lt; ApplicationController
           if session[:may_be_a_bot]
             return false unless verify_recaptcha :model=>@user, :message=>_('Captcha (the human test)')
           end
+          @user.community_to_join = session[:join]
           @user.signup!
           owner_role = Role.find_by_name('owner')
           @user.person.affiliate(@user.person, [owner_role]) if owner_role
@@ -99,10 +116,20 @@ class AccountController &lt; ApplicationController
             invitation.update_attributes!({:friend => @user.person})
             invitation.finish
           end
+
+          unless params[:file].nil?
+            image = Image::new :uploaded_data=> params[:file][:image]
+
+            @user.person.image = image
+            @user.person.save
+          end
+
           if @user.activated?
             self.current_user = @user
+            check_join_in_community(@user)
             go_to_signup_initial_page
           else
+            session[:notice] = _('Thanks for registering!')
             @register_pending = true
           end
         end
@@ -388,12 +415,6 @@ class AccountController &lt; ApplicationController
   end
  
   def go_to_initial_page
-    if params[:redirection]
-      session[:return_to] = @user.return_to
-      @user.return_to = nil
-      @user.save
-    end
-
     if params[:return_to]
       redirect_to params[:return_to]
     elsif environment.enabled?('allow_change_of_redirection_after_login')
@@ -444,4 +465,19 @@ class AccountController &lt; ApplicationController
       redirect_back_or_default(default)
     end
   end
+
+  def check_redirection
+    unless params[:redirection].blank?
+      session[:return_to] = @user.return_to
+      @user.update_attributes(:return_to => nil)
+    end
+  end
+
+  def check_join_in_community(user)
+    profile_to_join = session[:join]
+    unless profile_to_join.blank?
+     environment.profiles.find_by_identifier(profile_to_join).add_member(user.person)
+     session.delete(:join)
+    end
+  end
 end
@@ -11,7 +11,7 @@ class CatalogController &lt; PublicController
   protected
  
   def check_enterprise_and_environment
-    unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')
+    unless profile.enterprise? && @profile.environment.enabled?('products_for_enterprises')
       redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
     end
   end
@@ -19,9 +19,13 @@ class ChatController &lt; PublicController
   def avatar
     profile = environment.profiles.find_by_identifier(params[:id])
     filename, mimetype = profile_icon(profile, :minor, true)
-    data = File.read(File.join(Rails.root, 'public', filename))
-    render :text => data, :layout => false, :content_type => mimetype
-    expires_in 24.hours
+    if filename =~ /^https?:/
+      redirect_to filename
+    else
+      data = File.read(File.join(Rails.root, 'public', filename))
+      render :text => data, :layout => false, :content_type => mimetype
+      expires_in 24.hours
+    end
   end
  
   def index
@@ -8,49 +8,32 @@ class ContentViewerController &lt; ApplicationController
   helper TagsHelper
  
   def view_page
-    path = params[:page]
-    path = path.join('/') if path.kind_of?(Array)
-    path = "#{path}.#{params[:format]}" if params[:format]
+    path = get_path(params[:page], params[:format])
+
     @version = params[:version].to_i
  
     if path.blank?
-      @page = profile.home_page
-      if @page.nil?
-        redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
-        return
-      end
+      @page = profile.home_page 
+      return if redirected_to_profile_index
     else
       @page = profile.articles.find_by_path(path)
-      unless @page
-        page_from_old_path = profile.articles.find_by_old_path(path)
-        if page_from_old_path
-          redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
-          return
-        end
-      end
+      return if redirected_page_from_old_path(path)
     end
  
     return unless allow_access_to_page(path)
  
     if @version > 0
       return render_access_denied unless @page.display_versions?
-      @versioned_article = @page.versions.find_by_version(@version)
-      if @versioned_article && @page.versions.latest.version != @versioned_article.version
-        render :template => 'content_viewer/versioned_article.html.erb'
-        return
-      end
+      return if rendered_versioned_article
     end
  
     redirect_to_translation and return if @page.profile.redirect_l10n
  
-    if request.post?
-      if @page.forum? && @page.has_terms_of_use && params[:terms_accepted] == "true"
-        @page.add_agreed_user(user)
-      end
-    elsif !@page.parent.nil? && @page.parent.forum?
-      unless @page.parent.agrees_with_terms?(user)
-        redirect_to @page.parent.url
-      end
+    if request.post? && @page.forum?
+      process_forum_terms_of_use(user, params[:terms_accepted])
+    elsif is_a_forum_topic?(@page) && !@page.parent.agrees_with_terms?(user)
+      redirect_to @page.parent.url
+      return
     end
  
     # At this point the page will be showed
@@ -58,64 +41,22 @@ class ContentViewerController &lt; ApplicationController
  
     @page = FilePresenter.for @page
  
-    if @page.download? params[:view]
-      headers['Content-Type'] = @page.mime_type
-      headers.merge! @page.download_headers
-      data = @page.data
-
-      # TODO test the condition
-      if data.nil?
-        raise "No data for file"
-      end
-
-      render :text => data, :layout => false
-      return
-    end
+    return if rendered_file_download(params[:view])
  
     @form_div = params[:form]
  
     #FIXME see a better way to do this. It's not need to pass this variable anymore
     @comment = Comment.new
  
-    if @page.has_posts?
-      posts = if params[:year] and params[:month]
-        filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
-        @page.posts.by_range(filter_date..filter_date.at_end_of_month)
-      else
-        @page.posts
-      end
-
-      #FIXME Need to run this before the pagination because this version of
-      #      will_paginate returns a will_paginate collection instead of a
-      #      relation.
-      blog_with_translation = @page.blog? && @page.display_posts_in_current_language?
-      posts = posts.native_translations if blog_with_translation
-
-      @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
-
-      if blog_with_translation
-        @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
-      end
-    end
+    process_page_posts(params)
  
     if @page.folder? && @page.gallery?
-      @images = @page.images.select{ |a| a.display_to? user }
-      @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
+      @images = get_images(@page, params[:npage], params[:slideshow])
     end
  
-    @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
-    if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
-      @page.followers -= [params[:email]]
-      if @page.save
-        session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
-      end
-    end
+    process_page_followers(params)
  
-    @comments = @page.comments.without_spam
-    @comments = @plugins.filter(:unavailable_comments, @comments)
-    @comments_count = @comments.count
-    @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
-    @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
+    process_comments(params)
  
     if request.xhr? and params[:comment_order]
       if @comment_order == 'newest'
@@ -133,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
@@ -203,4 +144,127 @@ class ContentViewerController &lt; ApplicationController
     user_agent.match(/crawler/) ||
     user_agent.match(/\(.*https?:\/\/.*\)/)
   end
+
+  def get_path(page, format = nil)
+    path = page
+    path = path.join('/') if path.kind_of?(Array)
+    path = "#{path}.#{format}" if format
+
+    return path
+  end
+
+  def redirected_to_profile_index
+    if @page.nil?
+      redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
+      return true
+    end
+
+    return false
+  end
+
+  def redirected_page_from_old_path(path)
+    unless @page
+      page_from_old_path = profile.articles.find_by_old_path(path)
+      if page_from_old_path
+        redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
+        return true
+      end
+    end
+
+    return false
+  end
+
+  def process_forum_terms_of_use(user, terms_accepted = nil)
+    if @page.forum? && @page.has_terms_of_use && terms_accepted == "true"
+      @page.add_agreed_user(user)
+    end
+  end 
+
+  def is_a_forum_topic? (page)
+    return (!@page.parent.nil? && @page.parent.forum?)
+  end
+
+  def rendered_versioned_article
+    @versioned_article = @page.versions.find_by_version(@version)
+    if @versioned_article && @page.versions.latest.version != @versioned_article.version
+      render :template => 'content_viewer/versioned_article.html.erb'
+      return true
+    end
+
+    return false
+  end
+
+  def rendered_file_download(view = nil)
+    if @page.download? view
+      headers['Content-Type'] = @page.mime_type
+      headers.merge! @page.download_headers
+      data = @page.data
+
+      # TODO test the condition
+      if data.nil?
+        raise "No data for file"
+      end
+
+      render :text => data, :layout => false
+      return true
+    end
+
+    return false
+  end
+
+  def process_page_posts(params)
+    if @page.has_posts?
+      posts = get_posts(params[:year], params[:month])
+
+      #FIXME Need to run this before the pagination because this version of
+      #      will_paginate returns a will_paginate collection instead of a
+      #      relation.
+      posts = posts.native_translations if blog_with_translation?(@page)
+
+      @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
+
+      if blog_with_translation?(@page)
+        @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
+      end
+    end
+  end
+
+  def get_posts(year = nil, month = nil)
+    if year && month
+      filter_date = DateTime.parse("#{year}-#{month}-01")
+      return @page.posts.by_range(filter_date..filter_date.at_end_of_month)
+    else
+      return @page.posts
+    end
+  end
+
+  def blog_with_translation?(page)
+    return (page.blog? && page.display_posts_in_current_language?)
+  end
+
+  def get_images(page, npage, slideshow)
+    images = page.images.select{ |a| a.display_to? user }
+    images = images.paginate(:per_page => per_page, :page => npage) unless slideshow
+
+    return images
+  end
+
+  def process_page_followers(params)
+    @unfollow_form = params[:unfollow] == 'true'
+    if params[:unfollow] == 'commit' && request.post?
+      @page.followers -= [params[:email]]
+      if @page.save
+        session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
+      end
+    end
+  end
+
+  def process_comments(params)
+    @comments = @page.comments.without_spam
+    @comments = @plugins.filter(:unavailable_comments, @comments)
+    @comments_count = @comments.count
+    @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
+    @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
+  end
+
 end
@@ -3,7 +3,7 @@ class ProfileController &lt; PublicController
   needs_profile
   before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
   before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]
-  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
+  before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
  
   helper TagsHelper
  
@@ -51,7 +51,7 @@ class ProfileController &lt; PublicController
  
   def communities
     if is_cache_expired?(profile.communities_cache_key(params))
-      @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
+      @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.communities.count)
     end
   end
  
@@ -97,21 +97,12 @@ class ProfileController &lt; PublicController
   end
  
   def join_not_logged
-    if request.post?
-      profile.add_member(user)
-      session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name if profile.closed?
-      redirect_to_previous_location
+    session[:join] = profile.identifier
+
+    if user
+      redirect_to :controller => 'profile', :action => 'join'
     else
-      if user.memberships.include?(profile)
-        session[:notice] = _('You are already a member of %s.') % profile.name
-        redirect_to profile.url
-        return
-      end
-      if request.xhr?
-        render :layout => false
-      else
-        redirect_to profile.url
-      end
+      redirect_to :controller => '/account', :action => 'login'
     end
   end
  
@@ -211,7 +202,8 @@ class ProfileController &lt; PublicController
   end
  
   def more_comments
-    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity], :user_id => @profile})
+    profile_filter = @profile.person? ? {:user_id => @profile} : {:target_id => @profile}
+    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity]}.merge(profile_filter))
     comments_count = activity.comments.count
     comment_page = (params[:comment_page] || 1).to_i
     comments_per_page = 5
@@ -312,13 +312,13 @@ module ApplicationHelper
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
   end
  
-  def view_for_profile_actions(klass)
-    raise ArgumentError, 'No profile actions view for this class.' if klass.nil?
-
-    name = klass.name.underscore
-    return "blocks/profile_info_actions/" + name + '.html.erb' if File.exists?(Rails.root.join('app', 'views', 'blocks', 'profile_info_actions', name + '.html.erb'))
-
-    view_for_profile_actions(klass.superclass)
+  def render_profile_actions klass
+    name = klass.to_s.underscore
+    begin
+      render "blocks/profile_info_actions/#{name}"
+    rescue ActionView::MissingTemplate
+      render_profile_actions klass.superclass
+    end
   end
  
   def user
@@ -482,7 +482,12 @@ module ApplicationHelper
             '/images/icons-app/enterprise-'+ size.to_s() +'.png'
           end
         else
-          '/images/icons-app/person-'+ size.to_s() +'.png'
+          pixels = Image.attachment_options[:thumbnails][size].split('x').first
+          gravatar_profile_image_url(
+            profile.email,
+            :size => pixels,
+            :d => gravatar_default
+          )
         end
       filename = default_or_themed_icon(icon)
     end
@@ -602,7 +607,7 @@ module ApplicationHelper
   end
  
   def gravatar_default
-    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar']
+    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar'] || 'mm'
   end
  
   attr_reader :environment
@@ -671,7 +676,7 @@ module ApplicationHelper
  
   def theme_javascript_ng
     script = File.join(theme_path, 'theme.js')
-    if File.exists?(Rails.root.join('public', script))
+    if File.exists?(File.join(Rails.root, 'public', script))
       javascript_include_tag script
     else
       nil
@@ -1002,17 +1007,26 @@ module ApplicationHelper
   def display_category_menu(block, categories, root = true)
     categories = categories.sort{|x,y| x.name <=> y.name}
     return "" if categories.blank?
-    content_tag(:ul,
+    content_tag(:ul) do
       categories.map do |category|
         category_path = category.kind_of?(ProductCategory) ? {:controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id} : { :controller => 'search', :action => 'category_index', :category_path => category.explode_path }
-        category.display_in_menu? ?
-        content_tag(:li,
-          ( !category.is_leaf_displayable_in_menu? ? content_tag(:a, collapsed_item_icon, :href => "#", :id => "block_#{block.id}_category_#{category.id}", :class => 'category-link-expand ' + (root ? 'category-root' : 'category-no-root'), :onclick => "expandCategory(#{block.id}, #{category.id}); return false", :style => 'display: none') : leaf_item_icon) +
-          link_to(content_tag(:span, category.name, :class => 'category-name'), category_path, :class => ("category-leaf" if category.is_leaf_displayable_in_menu?)) +
-          content_tag(:div, display_category_menu(block, category.children, false), :id => "block_#{block.id}_category_content_#{category.id}", :class => 'child-category')
-        ) : ''
-      end
-    ) +
+        if category.display_in_menu?
+          content_tag(:li) do
+            if !category.is_leaf_displayable_in_menu?
+              content_tag(:a, collapsed_item_icon, :href => "#", :id => "block_#{block.id}_category_#{category.id}", :class => "category-link-expand " + (root ? "category-root" : "category-no-root"), :onclick => "expandCategory(#{block.id}, #{category.id}); return false", :style => "display: none")
+            else
+              leaf_item_icon
+            end +
+            link_to(content_tag(:span, category.name, :class => "category-name"), category_path, :class => ("category-leaf" if category.is_leaf_displayable_in_menu?)) +
+            content_tag(:div, :id => "block_#{block.id}_category_content_#{category.id}", :class => 'child-category') do
+              display_category_menu(block, category.children, false)
+            end
+          end
+        else
+          ""
+        end
+      end.join.html_safe
+    end +
     content_tag(:p) +
     (root ? javascript_tag("
       jQuery('.child-category').hide();
@@ -1034,7 +1048,7 @@ module ApplicationHelper
     end
  
     link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => nil}, :id => 'submenu-contents') +
-    link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
+    link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
   end
   alias :browse_contents_menu :search_contents_menu
  
@@ -1050,7 +1064,7 @@ module ApplicationHelper
      end
  
     link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
-    link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
+    link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
   end
   alias :browse_people_menu :search_people_menu
  
@@ -1066,7 +1080,7 @@ module ApplicationHelper
      end
  
     link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
-    link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
+    link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
   end
   alias :browse_communities_menu :search_communities_menu
  
@@ -1086,7 +1100,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
@@ -1099,19 +1113,23 @@ 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)
+    return '' unless user && user.environment.enabled?(:display_my_enterprises_on_user_menu)
+    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)
+    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)
+    manage_link(administered_communities, :communities, _('My communities')).to_s
+  end
+
+  def admin_link
+    user.is_admin?(environment) ? link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', environment.admin_url, :title => _("Configure the environment"), :class => 'admin-link') : ''
   end
  
   def usermenu_logged_in
@@ -1123,9 +1141,9 @@ module ApplicationHelper
  
     (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
-    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.admin_url, :title => _("Configure the environment"), :class => 'admin-link') +
-    manage_enterprises.to_s +
-    manage_communities.to_s +
+    admin_link +
+    manage_enterprises +
+    manage_communities +
     link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', user.admin_url, :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
@@ -1210,22 +1228,9 @@ module ApplicationHelper
   end
  
   def add_zoom_to_images
-    stylesheet_link_tag('fancybox') +
-    javascript_include_tag('jquery.fancybox-1.3.4.pack') +
-    javascript_tag("jQuery(function($) {
-      $(window).load( function() {
-        $('#article .article-body img').each( function(index) {
-          var original = original_image_dimensions($(this).attr('src'));
-          if ($(this).width() < original['width'] || $(this).height() < original['height']) {
-            $(this).wrap('<div class=\"zoomable-image\" />');
-            $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
-            $(this).attr('style', '');
-            $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
-          }
-        });
-        $('.zoomify-image').fancybox();
-      });
-    });" % _('Zoom in'))
+    stylesheet_link_tag('jquery.fancybox') +
+    javascript_include_tag('jquery.fancybox.pack') +
+    javascript_tag("apply_zoom_to_images(#{_('Zoom in').to_json})")
   end
  
   def render_dialog_error_messages(instance_name)
@@ -1281,9 +1286,9 @@ module ApplicationHelper
  
   def delete_article_message(article)
     if article.folder?
-      _("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")
+      _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
     else
-      _("Are you sure that you want to remove the item \"#{article.name}\"?")
+      _("Are you sure that you want to remove the item \"%s\"?") % article.name
     end
   end
  
@@ -1360,7 +1365,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
@@ -1402,4 +1407,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
@@ -83,6 +83,10 @@ module ArticleHelper
     array.map { |object| {:id => object.id, :name => object.name} }
   end
  
+  def prepare_to_token_input_by_label(array)
+    array.map { |object| {:label => object.name, :value => object.name} }
+  end
+
   def cms_label_for_new_children
     _('New article')
   end
@@ -6,19 +6,20 @@ module BlockHelper
     content_tag 'h3', content_tag('span', h(title)), :class => tag_class
   end
  
-  def highlights_block_config_image_fields(block, image={})
+  def highlights_block_config_image_fields(block, image={}, row_number=nil)
     "
-    <tr class=\"image-data-line\">
+    <tr class=\"image-data-line\" data-row-number='#{row_number}'>
       <td>
         #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
       </td>
       <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
       <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
-    </tr><tr class=\"image-title\">
+    </tr><tr class=\"image-title\" data-row-number='#{row_number}'>
       <td colspan=\"3\"><label>#{
         content_tag('span', _('Title')) +
         text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
       }</label></td>
+      <td>#{link_to '', '#', :class=>'button icon-button icon-delete delete-highlight', :confirm=>_('Are you sure you want to remove this highlight')}</td>
     </tr>
     "
   end
@@ -17,13 +17,13 @@ module BlogHelper
     _('Configure blog')
   end
  
-  def list_posts(articles, format = 'full')
+  def list_posts(articles, format = 'full', paginate = true)
     pagination = will_paginate(articles, {
       :param_name => 'npage',
       :previous_label => _('&laquo; Newer posts'),
       :next_label => _('Older posts &raquo;'),
       :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
-    }) if articles.present?
+    }) if articles.present? && paginate
     content = []
     artic_len = articles.length
     articles.each_with_index{ |art,i|
@@ -45,9 +45,9 @@ module BlogHelper
  
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
+    title = article_title(article, :no_comments => no_comments)
     html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
-
-    article_title(article, :no_comments => no_comments) + html
+    title + html
   end
  
   def display_full_format(article)
 module CategoriesHelper
  
-
-  COLORS = [
-    [ N_('Do not display at the menu'), nil ],
-    [ N_('Orange'), 1],
-    [ N_('Green'), 2],
-    [ N_('Purple'), 3],
-    [ N_('Red'), 4],
-    [ N_('Dark Green'), 5],
-    [ N_('Blue Oil'), 6],
-    [ N_('Blue'), 7],
-    [ N_('Brown'), 8],
-    [ N_('Light Green'), 9],
-    [ N_('Light Blue'), 10],
-    [ N_('Dark Blue'), 11],
-    [ N_('Blue Pool'), 12],
-    [ N_('Beige'), 13],
-    [ N_('Yellow'), 14],
-    [ N_('Light Brown'), 15]
-  ]
-
   TYPES = [
     [ _('General Category'), Category.to_s ],
     [ _('Product Category'), ProductCategory.to_s ],
     [ _('Region'), Region.to_s ],
   ]
  
-  def select_color_for_category
-    if @category.top_level?
-      labelled_form_field(_('Display at the menu?'), select('category', 'display_color', CategoriesHelper::COLORS.map {|item| [gettext(item[0]), item[1]] }))
-    else
-      ""
-    end
-  end
-
-  def display_color_for_category(category)
-    color = category.display_color
-    if color.nil?
-      ""
-    else
-      "[" + gettext(CategoriesHelper::COLORS.find {|item| item[1] == color}.first) + "]"
-    end
-  end
-
   def select_category_type(field)
     value = params[field]
     labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
   end
  
+  def category_color_style(category)
+    return '' if category.nil? or category.display_color.blank?
+    'background-color: #'+category.display_color+';'
+  end
+
   #FIXME make this test
   def selected_category_link(cat)
     js_remove = "jQuery('#selected-category-#{cat.id}').remove();"
@@ -10,7 +10,7 @@ module ContentViewerHelper
   end
  
   def number_of_comments(article)
-    display_number_of_comments(article.comments.without_spam.count)
+    display_number_of_comments(article.comments_count - article.spam_comments_count)
   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
@@ -27,6 +27,7 @@ module LayoutHelper
       'thickbox',
       'lightbox',
       'colorbox',
+      'inputosaurus',
       pngfix_stylesheet_path,
     ] + tokeninput_stylesheets
     plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
@@ -18,9 +18,7 @@ module SweeperHelper
       expire_timeout_fragment(profile.manage_friends_cache_key(:npage => i.to_s))
     end
  
-    # friends blocks
-    blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
-    BlockSweeper.expire_blocks(blocks)
+    expire_blocks_cache(profile, [:profile])
   end
  
   def expire_communities(profile)
@@ -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
@@ -15,10 +15,12 @@ class UserMailer &lt; ActionMailer::Base
   end
  
   def activation_code(user)
-    @recipient = user.name,
+    @recipient = user.name
     @activation_code = user.activation_code
     @environment = user.environment.name
     @url = user.environment.top_url
+    @redirection = (true if user.return_to)
+    @join = (user.community_to_join if user.community_to_join)
  
     mail(
       from: "#{user.environment.name} <#{user.environment.contact_email}>",
@@ -48,7 +48,7 @@ class ApproveArticle &lt; Task
   end
  
   def perform
-    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author_id)
+    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.last_changed_by_id, :created_by_id => article.created_by_id)
   end
  
   def title
@@ -2,7 +2,7 @@ require &#39;hpricot&#39;
  
 class Article < ActiveRecord::Base
  
-  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions
+  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link, :image_builder
  
   acts_as_having_image
  
@@ -41,8 +41,8 @@ class Article &lt; ActiveRecord::Base
   before_save :sanitize_tag_list
  
   before_create do |article|
-    if article.last_changed_by_id
-      article.author_name = Person.find(article.last_changed_by_id).name
+    if article.author
+      article.author_name = article.author.name
     end
   end
  
@@ -54,7 +54,9 @@ 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'
  
   has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
  
@@ -89,6 +91,11 @@ class Article &lt; ActiveRecord::Base
         article.parent = article.profile.blog
       end
     end
+
+    if article.created_by
+      article.author_name = article.created_by.name
+    end
+
   end
  
   after_destroy :destroy_activity
@@ -160,14 +167,17 @@ class Article &lt; ActiveRecord::Base
     self.profile
   end
  
-  def self.human_attribute_name(attrib, options = {})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
     when :name
       _('Title')
     else
-      _(self.superclass.human_attribute_name(attrib))
+      _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   def css_class_list
     [self.class.name.to_css_class]
@@ -215,6 +225,10 @@ class Article &lt; ActiveRecord::Base
   acts_as_versioned
   self.non_versioned_columns << 'setting'
  
+  def version_condition_met?
+    (['name', 'body', 'abstract', 'filename', 'start_date', 'end_date', 'image_id', 'license_id'] & changed).length > 0
+  end
+
   def comment_data
     comments.map {|item| [item.title, item.body].join(' ') }.join(' ')
   end
@@ -462,10 +476,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 ] } }
@@ -475,7 +489,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
@@ -502,6 +516,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
  
@@ -521,9 +536,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
@@ -638,33 +658,30 @@ class Article &lt; ActiveRecord::Base
     can_display_versions? && display_versions
   end
  
-  def author(version_number = nil)
-    if version_number
-      version = versions.find_by_version(version_number)
-      author_id = version.last_changed_by_id if version
-      Person.exists?(author_id) ? Person.find(author_id) : nil
-    else
-      if versions.empty?
-        last_changed_by
-      else
-        author_id = versions.first.last_changed_by_id
-        Person.exists?(author_id) ? Person.find(author_id) : nil
-      end
-    end
+  def get_version(version_number = nil)
+    version_number ? versions.find(:first, :order => 'version', :offset => version_number - 1) : versions.earliest
+  end
+
+  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
  
@@ -675,7 +692,7 @@ class Article &lt; ActiveRecord::Base
  
   def version_license(version_number = nil)
     return license if version_number.nil?
-    profile.environment.licenses.find_by_id(versions.find_by_version(version_number).license_id)
+    profile.environment.licenses.find_by_id(get_version(version_number).license_id)
   end
  
   alias :active_record_cache_key :cache_key
@@ -22,6 +22,10 @@ class Block &lt; ActiveRecord::Base
     false
   end
  
+  def get_limit
+    [0,limit].max
+  end
+
   def embed_code
     me = self
     proc do
@@ -28,20 +28,14 @@ class Box &lt; ActiveRecord::Base
       CategoriesBlock,
       CommunitiesBlock,
       EnterprisesBlock,
-      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-      #      the Noosfero core soon, see ActionItem3045
-      EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
       FeedReaderBlock,
-      FriendsBlock,
       HighlightsBlock,
       LinkListBlock,
       LoginBlock,
       MainBlock,
-      MembersBlock,
       MyNetworkBlock,
-      PeopleBlock,
       ProfileImageBlock,
       RawHTMLBlock,
       RecentDocumentsBlock,
@@ -56,21 +50,15 @@ class Box &lt; ActiveRecord::Base
       CommunitiesBlock,
       DisabledEnterpriseMessageBlock,
       EnterprisesBlock,
-      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-      #      the Noosfero core soon, see ActionItem3045
-      EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
       FeaturedProductsBlock,
       FeedReaderBlock,
-      FriendsBlock,
       HighlightsBlock,
       LinkListBlock,
       LocationBlock,
       LoginBlock,
-      MembersBlock,
       MyNetworkBlock,
-      PeopleBlock,
       ProductsBlock,
       ProductCategoriesBlock,
       ProfileImageBlock,
@@ -8,6 +8,8 @@ class CategoriesBlock &lt; Block
  
   settings_items :category_types, :type => Array, :default => []
  
+  attr_accessible :category_types
+
   def self.description
     _("Categories Menu")
   end
@@ -14,9 +14,6 @@ class Category &lt; ActiveRecord::Base
   validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('{fn} is already being used by another category.').fix_i18n
   belongs_to :environment
  
-  validates_inclusion_of :display_color, :in => 1..15, :allow_nil => true
-  validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('{fn} was already assigned to another category.').fix_i18n
-
   # Finds all top level categories for a given environment. 
   scope :top_level_for, lambda { |environment|
     {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
@@ -42,6 +39,13 @@ class Category &lt; ActiveRecord::Base
  
   acts_as_having_image
  
+  before_save :normalize_display_color
+
+  def normalize_display_color
+    display_color.gsub!('#', '') if display_color
+    display_color = nil if display_color.blank?
+  end
+
   scope :from_types, lambda { |types|
     types.select{ |t| t.blank? }.empty? ?
       { :conditions => { :type => types } } :
@@ -101,4 +105,12 @@ class Category &lt; ActiveRecord::Base
     self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
   end
  
+  def with_color
+    if display_color.blank?
+      parent.nil? ? nil : parent.with_color
+    else
+      self
+    end
+  end
+
 end
@@ -2,16 +2,19 @@ class ChangePassword &lt; Task
  
   attr_accessor :password, :password_confirmation
  
-  def self.human_attribute_name(attrib, options = {})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
     when :password
       _('Password')
     when :password_confirmation
       _('Password Confirmation')
     else
-      _(self.superclass.human_attribute_name(attrib))
+      _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   validates_presence_of :requestor
  
@@ -125,14 +125,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
 class Community < Organization
  
-  attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
+  attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type, :address_reference, :district, :tag_list, :language
   after_destroy :check_invite_member_for_destroy
  
   def self.type_name
@@ -85,10 +85,6 @@ class Community &lt; Organization
     recent_documents(limit, ["articles.type != ? AND articles.highlighted = ?", 'Folder', highlight])
   end
  
-  def blocks_to_expire_cache
-    [MembersBlock]
-  end
-
   def each_member(offset=0)
     while member = self.members.first(:order => :id, :offset => offset)
       yield member
@@ -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
   ###############
@@ -2,6 +2,8 @@
 # only enterprises can offer products and services.
 class Enterprise < Organization
  
+  attr_accessible :business_name, :address_reference, :district, :tag_list, :organization_website, :historic_and_current_context, :activities_short_description, :products_per_catalog_page
+
   SEARCH_DISPLAYS += %w[map full]
  
   def self.type_name
@@ -23,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
+  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist
  
   has_many :users
  
@@ -124,6 +124,7 @@ class Environment &lt; ActiveRecord::Base
       'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
       'enable_organization_url_change' => _("Allow organizations to change their URL"),
       'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
+      'admin_must_approve_new_users' => _("Admin must approve registration of new users"),
       'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
       'xmpp_chat' => _('XMPP/Jabber based chat'),
       'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
@@ -132,7 +133,8 @@ class Environment &lt; ActiveRecord::Base
       'send_welcome_email_to_new_users' => _('Send welcome e-mail to new users'),
       'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login'),
       'display_my_communities_on_user_menu' => _('Display on menu the list of communities the user can manage'),
-      'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage')
+      'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage'),
+      'restrict_to_members' => _('Show content only to members')
     }
   end
  
@@ -175,14 +177,10 @@ class Environment &lt; ActiveRecord::Base
  
     # "left" area
     env.boxes[1].blocks << LoginBlock.new
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    env.boxes[1].blocks << EnvironmentStatisticsBlock.new
     env.boxes[1].blocks << RecentDocumentsBlock.new
  
     # "right" area
     env.boxes[2].blocks << CommunitiesBlock.new(:limit => 6)
-    env.boxes[2].blocks << PeopleBlock.new(:limit => 6)
   end
  
   # One Environment can be reached by many domains
@@ -287,7 +285,7 @@ class Environment &lt; ActiveRecord::Base
     www.youtube.com
   ] + ('a' .. 'z').map{|i| "#{i}.yimg.com"}
  
-  settings_items :enabled_plugins, :type => Array, :default => []
+  settings_items :enabled_plugins, :type => Array, :default => Noosfero::Plugin.available_plugin_names
  
   settings_items :search_hints, :type => Hash, :default => {}
  
@@ -298,6 +296,23 @@ class Environment &lt; ActiveRecord::Base
   settings_items :access_control_allow_origin, :type => Array, :default => []
   settings_items :access_control_allow_methods, :type => String
  
+  settings_items :signup_welcome_screen_body, :type => String
+
+  def has_custom_welcome_screen?
+    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
@@ -789,7 +804,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def notification_emails
-    [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
+    [contact_email].select(&:present?) + admins.map(&:email)
   end
  
   after_create :create_templates
@@ -1,33 +0,0 @@
-# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-#      the Noosfero core soon, see ActionItem3045
-
-class EnvironmentStatisticsBlock < Block
-
-  def self.description
-    _('Environment stastistics (DEPRECATED)')
-  end
-
-  def default_title
-    _('Statistics for %s') % owner.name
-  end
-
-  def help
-    _('This block presents some statistics about your environment.')
-  end
-
-  def content(args={})
-    users = owner.people.visible.count
-    enterprises = owner.enterprises.visible.count
-    communities = owner.communities.visible.count
-
-    info = []
-    info << (n_('One user', '%{num} users', users) % { :num => users })
-    unless owner.enabled?('disable_asset_enterprises')
-      info << (n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
-    end
-    info << (n_('One community', '%{num} communities', communities) % { :num => communities })
-
-    block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
-  end
-
-end
@@ -30,6 +30,7 @@ class ExternalFeed &lt; ActiveRecord::Base
     article.source = link 
     article.profile = blog.profile 
     article.parent = blog
+    article.author_name = self.feed_title
     unless blog.children.exists?(:slug => article.slug)
       article.save!
       article.delay.create_activity
 class FeaturedProductsBlock < Block
  
+  attr_accessible :product_ids, :groups_of, :speed, :reflect
+
   settings_items :product_ids, :type => Array, :default => []
   settings_items :groups_of, :type => :integer, :default => 3
   settings_items :speed, :type => :integer, :default => 1000
@@ -85,8 +85,4 @@ class FeedReaderBlock &lt; Block
     block_title(title) + formatted_feed_content
   end
  
-  def editable?
-    true
-  end
-
 end
@@ -3,7 +3,7 @@ class Forum &lt; Folder
   acts_as_having_posts :order => 'updated_at DESC'
   include PostsLimit
  
-  attr_accessible :has_terms_of_use, :terms_of_use
+  attr_accessible :has_terms_of_use, :terms_of_use, :allows_members_to_create_topics
  
   settings_items :terms_of_use, :type => :string, :default => ""
   settings_items :has_terms_of_use, :type => :boolean, :default => false
@@ -1,26 +0,0 @@
-class FriendsBlock < ProfileListBlock
-
-  def self.description
-    _('Friends')
-  end
-
-  def default_title
-    n_('{#} friend', '{#} friends', profile_count)
-  end
-
-  def help
-    _('This block displays your friends.')
-  end
-
-  def footer
-    owner_id = owner.identifier
-    proc do
-      link_to s_('friends|View all'), :profile => owner_id, :controller => 'profile', :action => 'friends'
-    end
-  end
-
-  def profiles
-    owner.friends
-  end
-
-end
@@ -15,4 +15,9 @@ class Friendship &lt; ActiveRecord::Base
     Friendship.update_cache_counter(:friends_count, friendship.person, -1)
     Friendship.update_cache_counter(:friends_count, friendship.friend, -1)
   end
+
+  def self.remove_friendship(person1, person2)
+    person1.remove_friend(person2)
+    person2.remove_friend(person1)
+  end
 end
 class HighlightsBlock < Block
  
-  attr_accessible :images
+  attr_accessible :images, :interval, :shuffle, :navigation
  
   settings_items :images, :type => Array, :default => []
   settings_items :interval, :type => 'integer', :default => 4
@@ -25,4 +25,7 @@ class Image &lt; ActiveRecord::Base
  
   attr_accessible :uploaded_data
  
+  def current_data
+    File.file?(full_filename) ? File.read(full_filename) : nil
+  end
 end
 class Input < ActiveRecord::Base
  
-  attr_accessible :product, :product_category
+  attr_accessible :product, :product_category, :product_category_id, :amount_used, :unit_id, :price_per_unit, :relevant_to_price
  
   belongs_to :product
   belongs_to :product_category
@@ -84,10 +84,6 @@ class LinkListBlock &lt; Block
     end
   end
  
-  def editable?
-    true
-  end
-
   def icons_options
     ICONS.map do |i|
       "<span title=\"#{i[1]}\" class=\"icon-#{i[0]}\" onclick=\"changeIcon(this, '#{i[0]}')\"></span>".html_safe
 class LocationBlock < Block
  
+  attr_accessible :zoom, :map_type
+
   settings_items :zoom, :type => :integer, :default => 4
   settings_items :map_type, :type => :string, :default => 'roadmap'
  
@@ -16,10 +16,6 @@ class MainBlock &lt; Block
     true
   end
  
-  def editable?
-    true
-  end
-
   def cacheable?
     false
   end
@@ -1,52 +0,0 @@
-class MembersBlock < ProfileListBlock
-  settings_items :show_join_leave_button, :type => :boolean, :default => false
-
-  attr_accessible :show_join_leave_button
-
-  def self.description
-    _('Members')
-  end
-
-  def default_title
-    _('{#} members')
-  end
-
-  def help
-    _('This block presents the members of a collective.')
-  end
-
-  def footer
-    profile = self.owner
-    s = show_join_leave_button
-
-    proc do
-      render :file => 'blocks/members', :locals => { :profile => profile, :show_join_leave_button => s}
-    end
-  end
-
-  def profiles
-    owner.members
-  end
-
-  def extra_option
-    data = {
-      :human_name => _("Show join leave button"),
-      :name => 'block[show_join_leave_button]',
-      :value => true,
-      :checked => show_join_leave_button,
-      :options => {}
-    }
-  end
-
-  def cache_key(language='en', user=nil)
-    logged = ''
-    if user
-      logged += '-logged-in'
-      if user.is_member_of? self.owner
-        logged += '-member'
-      end
-    end
-    super + logged
-  end
-
-end
@@ -0,0 +1,59 @@
+class ModerateUserRegistration < Task
+
+  settings_items :user_id, :type => String
+  settings_items :name, :type => String
+  settings_items :author_name, :type => String
+  settings_items :email, :type => String
+
+  after_create :schedule_spam_checking
+
+  alias :environment :target
+  alias :environment= :target=
+
+  def schedule_spam_checking
+    self.delay.check_for_spam
+  end
+
+  include Noosfero::Plugin::HotSpot
+
+  def sender
+    "#{name} (#{email})"
+  end
+
+  def perform
+    user=environment.users.find_by_id(user_id)
+    user.activate
+  end
+
+  def title
+    _("New user")
+  end
+
+  def subject
+    name
+  end
+
+  def information
+    { :message => _('%{sender} wants to register.'),
+      :variables => {:sender => sender} }
+  end
+
+  def icon
+    result = {:type => :defined_image, :src => '/images/icons-app/person-minor.png', :name => name}
+  end
+
+  def target_notification_description
+    _('%{sender} tried to register.') %
+    {:sender => sender}
+  end
+
+  def target_notification_message
+    target_notification_description + "\n\n" +
+    _('You need to login on %{system} in order to approve or reject this user.') % {  :environment => self.environment }
+  end
+
+  def target_notification_message
+    _("User \"%{user}\" just requested to register. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :user => self.name }
+  end
+
+end
 \ No newline at end of file
@@ -123,7 +123,7 @@ class Organization &lt; Profile
     [
       [MainBlock.new],
       [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
-      [MembersBlock.new, RecentDocumentsBlock.new]
+      [RecentDocumentsBlock.new]
     ]
   end
  
@@ -135,7 +135,11 @@ class Organization &lt; Profile
   end
  
   def notification_emails
-    [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
+    emails = [contact_email].select(&:present?) + admins.map(&:email)
+    if emails.empty?
+      emails << environment.contact_email
+    end
+    emails
   end
  
   def already_request_membership?(person)
@@ -1,25 +0,0 @@
-class PeopleBlock < ProfileListBlock
-
-  def default_title
-    _('People')
-  end
-
-  def help
-    _('Clicking a person takes you to his/her homepage')
-  end
-
-  def self.description
-    _('Random people')
-  end
-
-  def profiles
-    owner.people
-  end
-
-  def footer
-    lambda do |context|
-      link_to _('View all'), :controller => 'search', :action => 'people'
-    end
-  end
-
-end
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
  
-  attr_accessible :organization, :contact_information, :sex, :birth_date
+  attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website
  
   SEARCH_FILTERS += %w[
     more_popular
@@ -269,7 +269,7 @@ class Person &lt; Profile
     [
       [MainBlock.new],
       [ProfileImageBlock.new(:show_name => true), LinkListBlock.new(:links => links), RecentDocumentsBlock.new],
-      [FriendsBlock.new, CommunitiesBlock.new]
+      [CommunitiesBlock.new]
     ]
   end
  
@@ -82,7 +82,7 @@ class PersonNotifier
       @url = @profile.environment.top_url
       mail(
         content_type: "text/html",
-        from: "#{@profile.environment.name} <#{@profile.environment.contact_email}>",
+        from: "#{@profile.environment.name} <#{@profile.environment.noreply_email}>",
         to: @profile.email,
         subject: _("[%s] Network Activity") % [@profile.environment.name]
       )
@@ -11,7 +11,7 @@ class Product &lt; ActiveRecord::Base
  
   SEARCH_DISPLAYS = %w[map full]
  
-  attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers
+  attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers, :unit_id, :discount, :inputs
  
   def self.default_search_display
     'full'
@@ -17,7 +17,7 @@ class ProductCategoriesBlock &lt; Block
     profile = owner
     proc do
       if @categories.nil? or @categories.length == 0
-        categories = ProductCategory.on_level().order(:name)
+        categories = ProductCategory.on_level(nil).order(:name)
         if @categories and @categories.length == 0
           notice = _('There are no sub-categories for %s') % @category.name
         end
@@ -33,7 +33,7 @@ class ProductCategoriesBlock &lt; Block
     end
   end
  
-  DISPLAY_OPTIONS['catalog_only'] = _('Only on the catalog')
+  DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
  
   def display
     settings[:display].nil? ? 'catalog_only' : super
@@ -49,17 +49,10 @@ class ProductsBlock &lt; Block
  
   def products(reload = false)
     if product_ids.blank?
-      products_list = owner.products(reload)
-      result = []
-      [4, products_list.size].min.times do
-        p = products_list.sample
-        result << p
-        products_list -= [p]
-      end
-      result
+      owner.products.order('RANDOM()').limit([4,owner.products.count].min)
     else
-      product_ids.map {|item| owner.products.find(item) }
-    end
+      owner.products.where(:id => product_ids)
+    end.compact
   end
  
 end
@@ -3,7 +3,7 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
  
-  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time
+  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login
  
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -23,10 +23,6 @@ class ProfileImageBlock &lt; Block
     end
   end
  
-  def editable?
-    true
-  end
-
   def cacheable?
     false
   end
@@ -15,10 +15,6 @@ class ProfileInfoBlock &lt; Block
     end
   end
  
-  def editable?
-    false
-  end
-
   def cacheable?
     false
   end
 class ProfileListBlock < Block
  
-  attr_accessible :limit, :prioritize_profiles_with_image
+  attr_accessible :prioritize_profiles_with_image
  
   settings_items :limit, :type => :integer, :default => 6
   settings_items :prioritize_profiles_with_image, :type => :boolean, :default => true
@@ -18,13 +18,13 @@ class ProfileListBlock &lt; Block
     result = nil
     visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])
     if !prioritize_profiles_with_image
-      result = visible_profiles.all(:limit => limit, :order => 'updated_at DESC').sort_by{ rand }
-    elsif profiles.visible.with_image.count >= limit
-      result = visible_profiles.with_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
+      result = visible_profiles.all(:limit => get_limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
+    elsif profiles.visible.with_image.count >= get_limit
+      result = visible_profiles.with_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
     else
-      result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
     end
-    result.slice(0..limit-1)
+    result.slice(0..get_limit-1)
   end
  
   def profile_count
@@ -11,8 +11,4 @@ class ProfileSearchBlock &lt; Block
     end
   end
  
-  def editable?
-    true
-  end
-
 end
@@ -33,7 +33,7 @@ class RecentDocumentsBlock &lt; Block
   end
  
   def docs
-    self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.limit, {}, false)
+    self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.get_limit, {}, false)
   end
  
   def self.expire_on
 class RssFeed < Article
  
-  attr_accessible :limit, :enabled, :language, :include
+  attr_accessible :limit, :enabled, :language, :include, :feed_item_description
  
   def self.type_name
     _('RssFeed')
@@ -6,6 +6,8 @@ class SlideshowBlock &lt; Block
   settings_items :navigation, :type => 'boolean', :default => false
   settings_items :image_size, :type => 'string', :default => 'thumb'
  
+  attr_accessible :gallery_id, :image_size, :interval, :shuffle, :navigation
+
   def self.description
     _('Slideshow')
   end
@@ -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
@@ -6,7 +6,7 @@ require &#39;securerandom&#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')
@@ -17,15 +17,18 @@ class User &lt; ActiveRecord::Base
   end
  
   # FIXME ugly workaround
-  def self.human_attribute_name(attrib, options={})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
       when :login
         return [_('Username'), _('Email')].join(' / ')
       when :email
         return _('e-Mail')
-      else _(self.superclass.human_attribute_name(attrib))
+      else _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   before_create do |user|
     if user.environment.nil?
@@ -48,8 +51,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
@@ -64,43 +71,8 @@ class User &lt; ActiveRecord::Base
     self.person.preferred_domain && self.person.preferred_domain.name || self.environment.default_hostname(true)
   end
  
-  class Mailer < ActionMailer::Base
-    def activation_email_notify(user)
-      user_email = "#{user.login}@#{user.email_domain}"
-      recipients user_email
-      from "#{user.environment.name} <#{user.environment.noreply_email}>"
-      subject _("[%{environment}] Welcome to %{environment} mail!") % { :environment => user.environment.name }
-      body :name => user.name,
-        :email => user_email,
-        :webmail => MailConf.webmail_url(user.login, user.email_domain),
-        :environment => user.environment.name,
-        :url => url_for(:host => user.environment.default_hostname, :controller => 'home')
-    end
-
-    def activation_code(user)
-      recipients user.email
-
-      from "#{user.environment.name} <#{user.environment.noreply_email}>"
-      subject _("[%s] Activate your account") % [user.environment.name]
-      body :recipient => user.name,
-        :activation_code => user.activation_code,
-        :environment => user.environment.name,
-        :url => user.environment.top_url,
-        :redirection => (true if user.return_to)
-    end
-
-    def signup_welcome_email(user)
-      email_body = user.environment.signup_welcome_text_body.gsub('{user_name}', user.name)
-      email_subject = user.environment.signup_welcome_text_subject
-
-      content_type 'text/html'
-      recipients user.email
-
-      from "#{user.environment.name} <#{user.environment.noreply_email}>"
-      subject email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject
-      body email_body
-    end
-  end
+  # virtual attribute used to stash which community to join on signup or login
+  attr_accessor :community_to_join
  
   def signup!
     User.transaction do
@@ -185,6 +157,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
@@ -34,8 +34,7 @@ protected
       expire_timeout_fragment(profile.manage_friends_cache_key(:npage => i.to_s))
     end
  
-    blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
-    BlockSweeper.expire_blocks(blocks)
+    expire_blocks_cache(profile, [:profile])
   end
  
 end
@@ -8,9 +8,6 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
   end
  
   def after_create(profile)
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    expire_statistics_block_cache(profile)
   end
  
 protected
@@ -31,13 +28,6 @@ protected
     expire_blogs(profile) if profile.organization?
   end
  
-  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-  #      the Noosfero core soon, see ActionItem3045
-  def expire_statistics_block_cache(profile)
-    blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
-    BlockSweeper.expire_blocks(blocks)
-  end
-
   def expire_blogs(profile)
     profile.blogs.select{|b| !b.empty?}.each do |blog|
       pages = blog.posts.count / blog.posts_per_page + 1
@@ -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() == '') {
 <% if @register_pending %>
-<div id='thanks-for-signing'>
-  <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>
-</div>
+  <div id='thanks-for-signing'>
+    <% if environment.has_custom_welcome_screen? %>
+      <%= environment.settings[:signup_welcome_screen_body].html_safe %>
+    <% 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 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 %>
   <h1><%= _('Sign up for %s!') % environment.name %></h1>
   <%= render :partial => 'signup_form' %>
@@ -0,0 +1,5 @@
+<div class='description'>
+  <%= _('This text will be showed as a welcome message to users after signup') %><br/><br/>
+</div>
+
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
@@ -12,6 +12,8 @@
     :content => (render :partial => 'terms_of_use', :locals => {:f => f})} %>
   <% tabs << {:title => _('Signup welcome text'), :id => 'signup-welcome-text',
     :content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %>
+  <% tabs << {:title => _('Signup welcome message'), :id => 'signup-welcome-message',
+    :content => (render :partial => 'signup_welcome_screen', :locals => {:f => f}) }%>
   <%= render_tabs(tabs) %>
   <% button_bar do %>
     <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
@@ -1,5 +0,0 @@
-<%= link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members' %>
-
-<% if show_join_leave_button %>
-  <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
-<% end %>
 <%= 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>
...	...	@@ -0,0 +1,5 @@
	1	+--ignore-dir=log
	2	+--ignore-dir=tmp
	3	+--ignore-dir=pkg
	4	+--ignore-dir=public/javascripts/cache
	5	+--ignore-dir=public/stylesheets/cache
...	...
...	...	@@ -1,240 +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		-Alan Freihof Tygel <alantygel@gmail.com>
10		-alcampelo <alcampelo@alcampelo.(none)>
11		-Alessandro Palmeira <alessandro.palmeira@gmail.com>
12		-Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
13		-Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
14		-Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
15		-Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
16		-Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
17		-Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
18		-Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
19		-Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
20		-Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
21		-Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
22		-Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
23		-Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
24		-Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
25		-Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
26		-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
27		-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
28		-Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
29		-Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
30		-Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
31		-Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
32		-Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
33		-Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
34		-Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
35		-Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
36		-Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
37		-Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
38		-Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
39		-Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
40		-Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
41		-Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
42		-Ana Losnak <analosnak@gmail.com>
43		-Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
44		-Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
45		-Antonio Terceiro <terceiro@colivre.coop.br>
46		-Arthur Del Esposte <arthurmde@yahoo.com.br>
47		-Aurelio A. Heckert <aurelio@colivre.coop.br>
48		-Braulio Bhavamitra <brauliobo@gmail.com>
49		-Bráulio Bhavamitra <brauliobo@gmail.com>
50		-Braulio Bhavamitra <braulio@eita.org.br>
51		-Caio <caio.csalgado@gmail.com>
52		-Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
53		-Caio Formiga <caio.formiga@gmail.com>
54		-Caio, Pedro <caio.csalgado@gmail.com>
55		-Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
56		-Caio Salgado <caio.csalgado@gmail.com>
57		-Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
58		-Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
59		-Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
60		-Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
61		-Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
62		-Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
63		-Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
64		-Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
65		-Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
66		-Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
67		-Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
68		-Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
69		-Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
70		-Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
71		-Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
72		-Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
73		-Caio SBA <caio@colivre.coop.br>
74		-Carlos Andre de Souza <carlos.andre.souza@msn.com>
75		-Carlos Morais <carlos88morais@gmail.com>
76		-Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
77		-Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
78		-Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
79		-Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
80		-Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
81		-Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
82		-Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
83		-Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
84		-Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
85		-Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
86		-Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
87		-Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
88		-Daniel Bucher <daniel.bucher88@gmail.com>
89		-Daniel Cunha <daniel@colivre.coop.br>
90		-David Carlos <ddavidcarlos1392@gmail.com>
91		-diegoamc <diegoamc90@gmail.com>
92		-Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
93		-Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
94		-Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
95		-Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
96		-Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
97		-Diego Araújo <diegoamc90@gmail.com>
98		-Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
99		-Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
100		-Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
101		-Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
102		-Diego Araújo + João Machini <diegoamc90@gmail.com>
103		-Diego Araújo + João Machini <digoamc90@gmail.com>
104		-Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
105		-Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
106		-Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
107		-Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
108		-Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
109		-Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
110		-Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
111		-Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
112		-Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
113		-Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
114		-Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
115		-Diego + Jefferson <diegoamc90@gmail.com>
116		-Diego Martinez <diegoamc90@gmail.com>
117		-Diego Martinez <diego@diego-K55A.(none)>
118		-Diego + Renan <renanteruoc@gmail.com>
119		-Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
120		-Fabio Teixeira <fabio1079@gmail.com>
121		-Fernanda Lopes <nanda.listas+psl@gmail.com>
122		-Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
123		-Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
124		-Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
125		-Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
126		-Gabriela Navarro <navarro1703@gmail.com>
127		-Grazieno Pellegrino <grazieno@gmail.com>
128		-Gust <darksshades@hotmail.com>
129		-Hugo Melo <hugo@riseup.net>
130		-Isaac Canan <isaac@intelletto.com.br>
131		-Italo Valcy <italo@dcc.ufba.br>
132		-Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
133		-Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
134		-Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
135		-João da Silva <jaodsilv@linux.ime.usp.br>
136		-João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
137		-João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
138		-João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
139		-Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
140		-João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
141		-João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
142		-João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
143		-João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
144		-João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
145		-João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
146		-João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
147		-João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
148		-João M. M. da Silva <jaodsilv@linux.ime.usp.br>
149		-Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
150		-João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
151		-João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
152		-João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
153		-João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
154		-João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
155		-João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
156		-João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
157		-João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
158		-João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
159		-Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
160		-João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
161		-João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
162		-João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
163		-Joenio Costa <joenio@colivre.coop.br>
164		-Josef Spillner <josef.spillner@tu-dresden.de>
165		-Junior Silva <junior@bajor.localhost.localdomain>
166		-Junior Silva <juniorsilva1001@gmail.com>
167		-Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
168		-Junior Silva <juniorsilva@colivre.coop.br>
169		-Keilla Menezes <keilla@colivre.coop.br>
170		-Larissa Reis <larissa@colivre.coop.br>
171		-Larissa Reis <reiss.larissa@gmail.com>
172		-Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
173		-Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
174		-Leandro Nunes dos Santos <leandronunes@gmail.com>
175		-Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
176		-LinguÁgil 2010 <linguagil.bahia@gmail.com>
177		-Lucas Melo <lucas@colivre.coop.br>
178		-Lucas Melo <lucaspradomelo@gmail.com>
179		-Luis David Aguilar Carlos <ludwig9003@gmail.com>
180		-Marcos Ramos <ms.ramos@outlook.com>
181		-Martín Olivera <molivera@solar.org.ar>
182		-Moises Machado <moises@colivre.coop.br>
183		-Naíla Alves <naila@colivre.coop.br>
184		-Nanda Lopes <nanda.listas+psl@gmail.com>
185		-Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
186		-Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
187		-Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
188		-Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
189		-Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
190		-Paulo Meirelles <paulo@softwarelivre.org>
191		-Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
192		-Rafael Gomes <rafaelgomes@techfree.com.br>
193		-Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
194		-Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
195		-Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
196		-Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
197		-Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
198		-Rafael Martins <rmmartins@gmail.com>
199		-Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
200		-Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
201		-Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
202		-Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
203		-Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
204		-Rafael Reggiani Manzo <rr.manzo@gmail.com>
205		-Raphaël Rousseau <raph@r4f.org>
206		-Raquel Lira <raquel.lira@gmail.com>
207		-Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
208		-Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
209		-Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
210		-Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
211		-Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
212		-Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
213		-Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
214		-Rodrigo Souto <diguliu@gmail.com>
215		-Rodrigo Souto <rodrigo@colivre.coop.br>
216		-Ronny Kursawe <kursawe.ronny@googlemail.com>
217		-root <root@debian.sdr.serpro>
218		-Samuel R. C. Vale <srcvale@holoscopio.com>
219		-Valessio Brito <contato@valessiobrito.com.br>
220		-Valessio Brito <contato@valessiobrito.info>
221		-Valessio Brito <valessio@gmail.com>
222		-vfcosta <vfcosta@gmail.com>
223		-Victor Carvalho <victorhugodf.ac@gmail.com>
224		-Victor Costa <vfcosta@gmail.com>
225		-Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
226		-Vinicius Cubas Brand <viniciuscb@gmail.com>
227		-Visita <visita@debian.(none)>
228		-Yann Lugrin <yann.lugrin@liquid-concept.ch>
229		-
230		-Ideas, specifications and incentive
231		-===================================
232		-Daniel Tygel <dtygel@fbes.org.br>
233		-Guilherme Rocha <guilherme@gf7.com.br>
234		-Raphael Rousseau <raph@r4f.org>
235		-Théo Bondolfi <move@cooperation.net>
236		-Vicente Aguiar <vicenteaguiar@colivre.coop.br>
237		-
238		-Arts
239		-===================================
240		-Nara Oliveira <narananet@gmail.com>
1		-If you are not listed here, but should be, please write to the noosfero mailing list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev (this list requires subscription to post, but since you are an author of noosfero, that's not a problem).
	1	+If you are not listed here, but should be, please write to the noosfero mailing
	2	+list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
	3	+(this list requires subscription to post, but since you are an author of
	4	+noosfero, that's not a problem).
2	5
3	6	Developers
4	7	==========
5	8
	9	+Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
6	10	Alan Freihof Tygel <alantygel@gmail.com>
	11	+alcampelo <alcampelo@alcampelo.(none)>
7	12	Alessandro Palmeira <alessandro.palmeira@gmail.com>
8	13	Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
9	14	Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
...	...	@@ -35,9 +40,13 @@ Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
35	40	Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
36	41	Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
37	42	Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
	43	+Ana Losnak <analosnak@gmail.com>
	44	+Andre Bernardes <andrebsguedes@gmail.com>
38	45	Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
39	46	Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
40	47	Antonio Terceiro <terceiro@colivre.coop.br>
	48	+Arthur Del Esposte <arthurmde@gmail.com>
	49	+Arthur Del Esposte <arthurmde@yahoo.com.br>
41	50	Aurelio A. Heckert <aurelio@colivre.coop.br>
42	51	Braulio Bhavamitra <brauliobo@gmail.com>
43	52	Bráulio Bhavamitra <brauliobo@gmail.com>
...	...	@@ -65,11 +74,14 @@ Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
65	74	Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
66	75	Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
67	76	Caio SBA <caio@colivre.coop.br>
	77	+Caio Tiago Oliveira <caiotiago@colivre.coop.br>
	78	+Carlos Andre de Souza <carlos.andre.souza@msn.com>
68	79	Carlos Morais <carlos88morais@gmail.com>
69	80	Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
70	81	Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
71	82	Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
72	83	Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
	84	+Daniela Feitosa <dani@dohko.(none)>
73	85	Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
74	86	Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
75	87	Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
...	...	@@ -78,7 +90,9 @@ Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
78	90	Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
79	91	Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
80	92	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
	93	+Daniel Bucher <daniel.bucher88@gmail.com>
81	94	Daniel Cunha <daniel@colivre.coop.br>
	95	+David Carlos <ddavidcarlos1392@gmail.com>
82	96	diegoamc <diegoamc90@gmail.com>
83	97	Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
84	98	Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
...	...	@@ -107,15 +121,26 @@ Diego + Jefferson <diegoamc90@gmail.com>
107	121	Diego Martinez <diegoamc90@gmail.com>
108	122	Diego Martinez <diego@diego-K55A.(none)>
109	123	Diego + Renan <renanteruoc@gmail.com>
	124	+Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
	125	+Evandro Jr <evandrojr@gmail.com>
	126	+Evandro Junior <evandrojr@gmail.com>
	127	+Fabio Teixeira <fabio1079@gmail.com>
110	128	Fernanda Lopes <nanda.listas+psl@gmail.com>
111	129	Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
112	130	Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
	131	+Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
	132	+Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
	133	+Gabriela Navarro <navarro1703@gmail.com>
113	134	Grazieno Pellegrino <grazieno@gmail.com>
	135	+Gust <darksshades@hotmail.com>
	136	+Hebert Douglas <hebertdougl@gmail.com>
	137	+Hugo Melo <hugo@riseup.net>
114	138	Isaac Canan <isaac@intelletto.com.br>
115	139	Italo Valcy <italo@dcc.ufba.br>
116	140	Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
117	141	Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
118	142	Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
	143	+João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
119	144	João da Silva <jaodsilv@linux.ime.usp.br>
120	145	João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
121	146	João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
...	...	@@ -146,17 +171,29 @@ João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
146	171	João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
147	172	Joenio Costa <joenio@colivre.coop.br>
148	173	Josef Spillner <josef.spillner@tu-dresden.de>
	174	+Jose Pedro <1jpsneto@gmail.com>
	175	+Junior Silva <junior@bajor.localhost.localdomain>
	176	+Junior Silva <junior@sedeantigo.colivre.coop.br>
149	177	Junior Silva <juniorsilva1001@gmail.com>
150	178	Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
	179	+Junior Silva <juniorsilva@colivre.coop.br>
	180	+juniorsilva <juniorsilva@QonoS.localhost.localdomain>
151	181	Keilla Menezes <keilla@colivre.coop.br>
152	182	Larissa Reis <larissa@colivre.coop.br>
153	183	Larissa Reis <reiss.larissa@gmail.com>
	184	+Leandro Alves <leandrosustenido@gmail.com>
	185	+Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
	186	+Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
154	187	Leandro Nunes dos Santos <leandronunes@gmail.com>
155	188	Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
156	189	LinguÁgil 2010 <linguagil.bahia@gmail.com>
157	190	Lucas Melo <lucas@colivre.coop.br>
158	191	Lucas Melo <lucaspradomelo@gmail.com>
	192	+Luciano <lucianopcbr@gmail.com>
	193	+Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
159	194	Luis David Aguilar Carlos <ludwig9003@gmail.com>
	195	+Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
	196	+Marcos Ramos <ms.ramos@outlook.com>
160	197	Martín Olivera <molivera@solar.org.ar>
161	198	Moises Machado <moises@colivre.coop.br>
162	199	Naíla Alves <naila@colivre.coop.br>
...	...	@@ -189,14 +226,21 @@ Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
189	226	Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
190	227	Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
191	228	Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
	229	+Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
192	230	Rodrigo Souto <diguliu@gmail.com>
193	231	Rodrigo Souto <rodrigo@colivre.coop.br>
194	232	Ronny Kursawe <kursawe.ronny@googlemail.com>
195	233	root <root@debian.sdr.serpro>
196	234	Samuel R. C. Vale <srcvale@holoscopio.com>
	235	+Tallys Martins <tallysmartins@gmail.com>
	236	+tallys <tallys@tallys.(none)>
	237	+Valessio Brito <contato@valessiobrito.com.br>
	238	+Valessio Brito <contato@valessiobrito.info>
197	239	Valessio Brito <valessio@gmail.com>
198	240	vfcosta <vfcosta@gmail.com>
	241	+Victor Carvalho <victorhugodf.ac@gmail.com>
199	242	Victor Costa <vfcosta@gmail.com>
	243	+Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
200	244	Vinicius Cubas Brand <viniciuscb@gmail.com>
201	245	Visita <visita@debian.(none)>
202	246	Yann Lugrin <yann.lugrin@liquid-concept.ch>
...	...
1	1	source "https://rubygems.org"
2		-gem 'rails'
3		-gem 'fast_gettext'
4		-gem 'acts-as-taggable-on'
5		-gem 'prototype-rails'
6		-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
7		-gem 'rails_autolink'
8		-gem 'pg'
9		-gem 'rmagick'
10		-gem 'RedCloth'
11		-gem 'will_paginate'
12		-gem 'ruby-feedparser'
13		-gem 'daemons'
14		-gem 'thin'
15		-gem 'hpricot'
16		-gem 'nokogiri'
	2	+gem 'rails', '~> 3.2.19'
	3	+gem 'fast_gettext', '~> 0.6.8'
	4	+gem 'acts-as-taggable-on', '~> 3.0.2'
	5	+gem 'prototype-rails', '~> 3.2.1'
	6	+gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
	7	+gem 'rails_autolink', '~> 1.1.5'
	8	+gem 'pg', '~> 0.13.2'
	9	+gem 'rmagick', '~> 2.13.1'
	10	+gem 'RedCloth', '~> 4.2.9'
	11	+gem 'will_paginate', '~> 3.0.3'
	12	+gem 'ruby-feedparser', '~> 0.7'
	13	+gem 'daemons', '~> 1.1.5'
	14	+gem 'thin', '~> 1.3.1'
	15	+gem 'hpricot', '~> 0.8.6'
	16	+gem 'nokogiri', '~> 1.5.5'
17	17	gem 'rake', :require => false
	18	+gem 'rest-client', '~> 1.6.7'
	19	+gem 'exception_notification', '~> 4.0.1'
	20	+gem 'gettext', '~> 2.2.1', :require => false, :group => :development
18	21	gem 'grape', '0.2.1'
19	22
20	23	# FIXME list here all actual dependencies (i.e. the ones in debian/control),
21	24	# with their GEM names (not the Debian package names)
22	25
23	26	group :production do
24		- gem 'dalli'
	27	+ gem 'dalli', '~> 2.7.0'
25	28	end
26	29
27	30	group :test do
28		- gem 'rspec'
29		- gem 'rspec-rails'
	31	+ gem 'rspec', '~> 2.10.0'
	32	+ gem 'rspec-rails', '~> 2.10.1'
	33	+ gem 'mocha', '~> 1.1.0', :require => false
30	34	end
31	35
32	36	group :cucumber do
33		- gem 'rake'
34		- gem 'cucumber-rails', :require => false
35		- gem 'capybara'
36		- gem 'cucumber'
37		- gem 'database_cleaner'
38		- gem 'selenium-webdriver'
	37	+ gem 'cucumber-rails', '~> 1.0.6', :require => false
	38	+ gem 'capybara', '~> 2.1.0'
	39	+ gem 'cucumber', '~> 1.0.6'
	40	+ gem 'database_cleaner', '~> 1.2.0'
	41	+ gem 'selenium-webdriver', '~> 2.39.0'
39	42	end
40	43
41	44	# include plugin gemfiles
...	...
...	...	@@ -1,180 +0,0 @@
1		-PATH
2		- remote: vendor/prototype_legacy_helper
3		- specs:
4		- prototype_legacy_helper (0.0.0)
5		-
6		-GEM
7		- remote: https://rubygems.org/
8		- specs:
9		- RedCloth (4.2.9)
10		- actionmailer (3.2.6)
11		- actionpack (= 3.2.6)
12		- mail (~> 2.4.4)
13		- actionpack (3.2.6)
14		- activemodel (= 3.2.6)
15		- activesupport (= 3.2.6)
16		- builder (~> 3.0.0)
17		- erubis (~> 2.7.0)
18		- journey (~> 1.0.1)
19		- rack (~> 1.4.0)
20		- rack-cache (~> 1.2)
21		- rack-test (~> 0.6.1)
22		- sprockets (~> 2.1.3)
23		- activemodel (3.2.6)
24		- activesupport (= 3.2.6)
25		- builder (~> 3.0.0)
26		- activerecord (3.2.6)
27		- activemodel (= 3.2.6)
28		- activesupport (= 3.2.6)
29		- arel (~> 3.0.2)
30		- tzinfo (~> 0.3.29)
31		- activeresource (3.2.6)
32		- activemodel (= 3.2.6)
33		- activesupport (= 3.2.6)
34		- activesupport (3.2.6)
35		- i18n (~> 0.6)
36		- multi_json (~> 1.0)
37		- acts-as-taggable-on (3.0.2)
38		- rails (>= 3, < 5)
39		- arel (3.0.2)
40		- builder (3.0.0)
41		- capybara (2.1.0)
42		- mime-types (>= 1.16)
43		- nokogiri (>= 1.3.3)
44		- rack (>= 1.0.0)
45		- rack-test (>= 0.5.4)
46		- xpath (~> 2.0)
47		- childprocess (0.3.3)
48		- ffi (~> 1.0.6)
49		- cucumber (1.0.6)
50		- builder (>= 2.1.2)
51		- diff-lcs (>= 1.1.2)
52		- gherkin (~> 2.4.18)
53		- json (>= 1.4.6)
54		- term-ansicolor (>= 1.0.6)
55		- cucumber-rails (1.0.6)
56		- capybara (>= 1.1.1)
57		- cucumber (>= 1.0.6)
58		- nokogiri (>= 1.5.0)
59		- daemons (1.1.5)
60		- dalli (2.7.0)
61		- database_cleaner (1.2.0)
62		- diff-lcs (1.1.3)
63		- erubis (2.7.0)
64		- eventmachine (0.12.11)
65		- fast_gettext (0.6.8)
66		- ffi (1.0.11)
67		- gherkin (2.4.21)
68		- json (>= 1.4.6)
69		- hike (1.2.1)
70		- hpricot (0.8.6)
71		- i18n (0.6.0)
72		- journey (1.0.3)
73		- json (1.7.3)
74		- mail (2.4.4)
75		- i18n (>= 0.4.0)
76		- mime-types (~> 1.16)
77		- treetop (~> 1.4.8)
78		- mime-types (1.19)
79		- multi_json (1.3.6)
80		- nokogiri (1.5.5)
81		- pg (0.13.2)
82		- polyglot (0.3.3)
83		- prototype-rails (3.2.1)
84		- rails (~> 3.2)
85		- rack (1.4.1)
86		- rack-cache (1.2)
87		- rack (>= 0.4)
88		- rack-ssl (1.3.2)
89		- rack
90		- rack-test (0.6.1)
91		- rack (>= 1.0)
92		- rails (3.2.6)
93		- actionmailer (= 3.2.6)
94		- actionpack (= 3.2.6)
95		- activerecord (= 3.2.6)
96		- activeresource (= 3.2.6)
97		- activesupport (= 3.2.6)
98		- bundler (~> 1.0)
99		- railties (= 3.2.6)
100		- rails_autolink (1.1.5)
101		- rails (> 3.1)
102		- railties (3.2.6)
103		- actionpack (= 3.2.6)
104		- activesupport (= 3.2.6)
105		- rack-ssl (~> 1.3.2)
106		- rake (>= 0.8.7)
107		- rdoc (~> 3.4)
108		- thor (>= 0.14.6, < 2.0)
109		- rake (0.9.2.2)
110		- rdoc (3.9.4)
111		- rmagick (2.13.1)
112		- rspec (2.10.0)
113		- rspec-core (~> 2.10.0)
114		- rspec-expectations (~> 2.10.0)
115		- rspec-mocks (~> 2.10.0)
116		- rspec-core (2.10.1)
117		- rspec-expectations (2.10.0)
118		- diff-lcs (~> 1.1.3)
119		- rspec-mocks (2.10.1)
120		- rspec-rails (2.10.1)
121		- actionpack (>= 3.0)
122		- activesupport (>= 3.0)
123		- railties (>= 3.0)
124		- rspec (~> 2.10.0)
125		- ruby-feedparser (0.7)
126		- rubyzip (1.1.2)
127		- selenium-webdriver (2.39.0)
128		- childprocess (>= 0.2.5)
129		- multi_json (~> 1.0)
130		- rubyzip (~> 1.0)
131		- websocket (~> 1.0.4)
132		- sprockets (2.1.3)
133		- hike (~> 1.2)
134		- multi_json (~> 1.0)
135		- rack (~> 1.0)
136		- tilt (~> 1.1, != 1.3.0)
137		- term-ansicolor (1.0.7)
138		- thin (1.3.1)
139		- daemons (>= 1.0.9)
140		- eventmachine (>= 0.12.6)
141		- rack (>= 1.0.0)
142		- thor (0.15.3)
143		- tilt (1.3.3)
144		- treetop (1.4.10)
145		- polyglot
146		- polyglot (>= 0.3.1)
147		- tzinfo (0.3.33)
148		- websocket (1.0.7)
149		- will_paginate (3.0.3)
150		- xpath (2.0.0)
151		- nokogiri (~> 1.3)
152		-
153		-PLATFORMS
154		- ruby
155		-
156		-DEPENDENCIES
157		- RedCloth
158		- acts-as-taggable-on
159		- capybara
160		- cucumber
161		- cucumber-rails
162		- daemons
163		- dalli
164		- database_cleaner
165		- fast_gettext
166		- hpricot
167		- nokogiri
168		- pg
169		- prototype-rails
170		- prototype_legacy_helper (= 0.0.0)!
171		- rails
172		- rails_autolink
173		- rake
174		- rmagick
175		- rspec
176		- rspec-rails
177		- ruby-feedparser
178		- selenium-webdriver
179		- thin
180		- will_paginate
1		-XMPP/Chat Client Setup
2		-======================
	1	+XMPP/Chat Setup
	2	+===============
3	3
4		-To configure XMPP/BOSH in Noosfero you need:
	4	+The samples of config file to configure a XMPP/BOSH server with ejabberd,
	5	+postgresql and apache2 can be found at util/chat directory.
5	6
6		-* REST Client - http://github.com/archiloque/rest-client
7		-* SystemTimer - http://ph7spot.com/musings/system-timer
8		-* Pidgin data files - http://www.pidgin.im/
	7	+This setup supposes that you are using Noosfero installed via Debian package
	8	+in a production environment.
9	9
10		-If you use Debian 6.0 (squeeze):
11		-
12		- # apt-get install librestclient-ruby pidgin-data ruby1.8-dev
13		- # gem install SystemTimer
14		-
15		-The samples of config file to configure a XMPP/BOSH server with ejabberd, postgresql and apache2 can be found at util/chat directory.
16		-
17		-XMPP/Chat Server Setup
18		-======================
	10	+Steps
	11	+=====
19	12
20	13	This is a step-by-step guide to get a XMPP service working, in a Debian system.
21	14
22	15	## 1. Install the required packages
23	16
24		- # apt-get install ejabberd odbc-postgresql
	17	+ # apt-get install ejabberd odbc-postgresql librestclient-ruby pidgin-data ruby1.8-dev
	18	+ # gem install SystemTimer
25	19
26	20	## 2. Ejabberd configuration
27	21
28		-All the following changes must be done in config file: `/etc/ejabberd/ejabberd.cfg`
29		-
30		-### 2.1. Set the default admin user
31		-
32		- { acl, admin, { user, "john", "www.example.com" } }.
33		- { acl, admin, { user, "bart", "www.example.com" } }.
34		-
35		-### 2.2. Set the default host
36		-
37		- { hosts, [ "www.example.com" ] }.
38		-
39		-### 2.3. Http-Bind activation
40		-
41		- { 5280, ejabberd_http, [
42		- http_bind,
43		- web_admin
44		- ]
45		- }
46		-
47		- (...)
48		-
49		- { modules, [
50		- {mod_http_bind, []},
51		- ...
52		- ] }.
53		-
54		-Ejabberd creates semi-anonymous rooms by default, but Noosfero's Jabber client needs non-anonymous room, then we need to change default params of creation rooms in ejabberd to create non-anonymous rooms.
55		-
56		-In non-anonymous rooms the jabber service sends the new occupant's full JID to all occupants in the room [[1]].
	22	+ # cp /usr/share/noosfero/util/chat/ejabberd.cfg /etc/ejabberd/
57	23
58		-Add option "`{default_room_options, [{anonymous, false}]}`" to `/etc/ejabberd/ejabberd.cfg` in mod_muc session. See below:
	24	+Edit the /etc/ejabberd/ejabberd.cfg file and set your domain on the first 2 lines.
59	25
60		- { mod_muc, [
61		- %%{host, "conference.@HOST@"},
62		- {access, muc},
63		- {access_create, muc},
64		- {access_persistent, muc},
65		- {access_admin, muc_admin},
66		- {max_users, 500},
67		- {default_room_options, [{anonymous, false}]}
68		- ]},
69		-
70		-[1]: http://xmpp.org/extensions/xep-0045.html#enter-nonanon
71		-
72		-
73		-### 2.4. Authentication method
74		-
75		-To use Postgresql through ODBC, the following modifications must be done:
76		-
77		- * Disable the default method:
78		- `{auth_method, internal}.`
79		-
80		- * Enable autheticantion through ODBC:
81		- `{auth_method, odbc}.`
	26	+## 3. Configuring Postgresql
82	27
83		- * Set database server name
84		- `{odbc_server, "DSN=PostgreSQLEjabberdNoosfero"}.`
	28	+Give permission to noosfero user create new roles, login as
	29	+postgres user and execute:
85	30
	31	+ $ psql
	32	+ postgres=# GRANT CREATE ON DATABASE noosfero TO noosfero;
86	33
87		-### 2.5. Increase the shaper traffic limit
	34	+Change the postgresql authentication method to md5 instead of ident,
	35	+add the following line to the file /etc/postgresql/8.4/main/pg_hba.conf:
88	36
89		- { shaper, normal, { maxrate, 10000000 } }.
	37	+ # Noosfero user
	38	+ local noosfero noosfero md5
90	39
	40	+(add this line before the following line)
91	41
92		-### 2.6. Disable unused modules
	42	+ # "local" is for Unix domain socket connections only
	43	+ local all all ident
93	44
94		-Unused modules can be disabled, for example:
	45	+Restart postgresql server:
95	46
96		- * s2s
97		- * web_admin
98		- * mod_pubsub
99		- * mod_irc
100		- * mod_offline
101		- * mod_admin_extra
102		- * mod_register
	47	+ # service postgresql restart
103	48
	49	+Login as noosfero user, and execute:
104	50
105		-### 2.7. Enable ODBC modules
	51	+ $ psql -U noosfero -W noosfero < /usr/share/noosfero/util/chat/postgresql/ejabberd.sql
106	52
107		- * mod_privacy -> mod_privacy_odbc
108		- * mod_private -> mod_private_odbc
109		- * mod_roster -> mod_roster_odbc
	53	+(see database password in the /etc/noosfero/database.yml file)
110	54
111		-## 3. Configuring Postgresql
	55	+This will create a new schema inside the noosfero database, called `ejabberd`.
112	56
113		-Login as noosfero user, and execute:
	57	+Note that there should be at least one domain with `is_default = true` in
	58	+`domains` table, otherwise people won't be able to see their friends online.
114	59
115		- $ psql noosfero < /path/to/noosfero/util/chat/postgresql/ejabberd.sql
	60	+## 4. ODBC configuration
116	61
117		-Where `noosfero` may need to be replace by the name of the database used for Noosfero.
	62	+Create the following files:
118	63
119		-This will create a new schema inside the noosfero database, called `ejabberd`.
	64	+ # cp /usr/share/noosfero/util/chat/odbc.ini /etc/
	65	+ # cp /usr/share/noosfero/util/chat/odbcinst.ini /etc/
120	66
121		-Note `noosfero` user should have permission to create Postgresql schemas. Also, there should be at least one domain with `is_default = true` in `domains` table, otherwise people won't be able to see their friends online.
	67	+Edit the odbc.ini file and set the password for the database user, see
	68	+the file /etc/noosfero/database.yml to get the password.
122	69
123		-## 4. ODBC configuration
	70	+Adjust premissions:
124	71
125		-The following files must be created:
126		-
127		-`/etc/odbc.ini`:
128		-
129		- [PostgreSQLEjabberdNoosfero]
130		- Description = PostgreSQL Noosfero ejabberd database
131		- Driver = PostgreSQL Unicode
132		- Trace = No
133		- TraceFile = /tmp/psqlodbc.log
134		- Database = noosfero
135		- Servername = localhost
136		- UserName = <DBUSER>
137		- Password = <DBPASS>
138		- Port =
139		- ReadOnly = No
140		- RowVersioning = No
141		- ShowSystemTables = No
142		- ShowOidColumn = No
143		- FakeOidIndex = No
144		- ConnSettings = SET search_path TO ejabberd
145		-
146		-`/etc/odbcinst.ini`:
147		-
148		- [PostgreSQL Unicode]
149		- Description = PostgreSQL ODBC driver (Unicode version)
150		- Driver = /usr/lib/odbc/psqlodbcw.so
151		- Setup = /usr/lib/odbc/libodbcpsqlS.so
152		- Debug = 0
153		- CommLog = 1
154		- UsageCount = 3
	72	+ # chmod 640 /etc/odbc.ini
	73	+ # chown ejabberd /etc/odbc.ini
155	74
156	75	## 4.1 testing all:
157	76
...	...	@@ -159,7 +78,6 @@ The following files must be created:
159	78
160	79	If the configuration was done right, the message "Connected!" will be displayed.
161	80
162		-
163	81	## 5. Enabling kernel polling and SMP in `/etc/default/ejabberd`
164	82
165	83	POLL=true
...	...	@@ -205,32 +123,45 @@ Note: module proxy_http must be enabled:
205	123
206	124	# a2enmod proxy_http
207	125
208		-## 8. DNS configuration
	126	+Restart services:
209	127
210		-For this point, we assume you are using BIND as your DNS server. You need to add the following entries to the DNS zone file corresponding to the domain of your noosfero site:
	128	+ # service ejabberd restart
	129	+ # service noosfero restart
	130	+ # service apache2 restart
211	131
212		- _xmpp-client._tcp SRV 5 100 5222 master
213		- conference CNAME master
214		- _xmpp-client._tcp.conference SRV 5 100 5222 master
	132	+## 8. Test Apache Configuration
215	133
216		-If you are running a DNS server other than BIND, you will have to figure out how to create equivalente rules for your zone file. Patches to this documentation are welcome.
	134	+Open in your browser the address:
217	135
218		-## 9. Testing this Setup
	136	+ http://<yout domain>/http-bind
219	137
220		-Adjust shell limits to proceed with some benchmarks and load tests:
	138	+You should see a page with a message like that:
221	139
222		- # ulimit −s 256
223		- # ulimit −n 8192
224		- # echo 10 > /proc/sys/net/ipv4/tcp_syn_retries
	140	+ ejabberd mod_http_bind
	141	+ An implementation of XMPP over BOSH (XEP-0206)
	142	+ This web page is only informative. To use HTTP-Bind you need a Jabber/XMPP
	143	+ client that supports it.
225	144
226		-To measure the bandwidth between server and client:
	145	+## 9. Test chat session
227	146
228		- * at server side:
229		- `# iperf −s`
	147	+Open Noosfero console and execute:
230	148
231		- * at client side:
232		- `# iperf −c server_ip`
	149	+>> environment = Environment.default
	150	+>> user = Person['guest']
	151	+>> password = user.user.crypted_password
	152	+>> login = user.jid
	153	+>> RubyBOSH.initialize_session(login, password, "http://#{environment.default_hostname}/http-bind", :wait => 30, :hold => 1, :window => 5
233	154
234		-For heavy load tests, clone and use this software:
	155	+If you have luck, should see something like that:
235	156
236		- $ git clone http://git.holoscopio.com/git/metal/tester.git
	157	+Ruby-BOSH - SEND
	158	+<body window="5" rid="60265" xmlns="http://jabber.org/protocol/httpbind" xmlns:xmpp="urn:xmpp:xbosh" to="vagrant-debian-squeeze.vagrantup.com" wait="30" xmpp:version="1.0" hold="1"/>
	159	+Ruby-BOSH - SEND
	160	+<body rid="60266" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"><auth mechanism="PLAIN" xmlns="urn:ietf:params:xml:ns:xmpp-sasl">Z3Vlc3RAdmFncmFudC1kZWJpYW4tc3F1ZWV6ZS52YWdyYW50dXAuY29tAGd1ZXN0ADEzZTFhYWVlYjRhYjZlMTA0MmRkNWI1YWY0MzM4MjA1OGJiOWZmNzk=</auth></body>
	161	+Ruby-BOSH - SEND
	162	+<body xmpp:restart="true" rid="60267" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"/>
	163	+Ruby-BOSH - SEND
	164	+<body rid="60268" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"><iq type="set" xmlns="jabber:client" id="bind_29330"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><resource>bosh_9631</resource></bind></iq></body>
	165	+Ruby-BOSH - SEND
	166	+<body rid="60269" xmlns="http://jabber.org/protocol/httpbind" sid="24cdfc43646a2af1059a7060b677c2e11b26f34f" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"><iq type="set" xmlns="jabber:client" id="sess_21557"><session xmlns="urn:ietf:params:xml:ns:xmpp-session"/></iq></body>
	167	+=> ["guest@vagrant-debian-squeeze.vagrantup.com", "24cdfc43646a2af1059a7060b677c2e11b26f34f", 60270]
...	...
...	...	@@ -0,0 +1,115 @@
	1	+Setup Noosfero to use HTTPS
	2	+===========================
	3	+
	4	+This document assumes that you have a fully and clean Noosfero
	5	+installation as explained at the `INSTALL.md` file.
	6	+
	7	+SSL certificate
	8	++++++++++++++++
	9	+
	10	+You should get a valid SSL certificate, but if you want to test
	11	+your setup before, you could generate a self-signed certificate
	12	+as below:
	13	+
	14	+ # mkdir /etc/noosfero/ssl
	15	+ # cd /etc/noosfero/ssl
	16	+ # openssl genrsa 1024 > noosfero.key
	17	+ # openssl req -new -x509 -nodes -sha1 -days $[10*365] -key noosfero.key > noosfero.cert
	18	+ # cat noosfero.key noosfero.cert > noosfero.pem
	19	+
	20	+There are two ways of using SSL with Noosfero: 1) If you are not using
	21	+Varnish; and 2) If you are using Varnish.
	22	+
	23	+1) If you are are not using Varnish
	24	++++++++++++++++++++++++++++++++++++
	25	+
	26	+Simply do a redirect in apache to force all connections with SSL:
	27	+
	28	+ <VirtualHost *:8080>
	29	+ ServerName test.stoa.usp.br
	30	+
	31	+ Redirect / https://example.com/
	32	+ </VirtualHost>
	33	+
	34	+And set a vhost to receive then:
	35	+
	36	+ <VirtualHost *:443>
	37	+ ServerName example.com
	38	+
	39	+ SSLEngine On
	40	+ SSLCertificateFile /etc/ssl/certs/cert.pem
	41	+ SSLCertificateKeyFile /etc/ssl/private/cert.key
	42	+
	43	+ Include /etc/noosfero/apache/virtualhost.conf
	44	+ </VirtualHost>
	45	+
	46	+Be aware that if you had configured varnish, the requests won't reach
	47	+it with this configuration.
	48	+
	49	+2) If you are using Varnish
	50	++++++++++++++++++++++++++++
	51	+
	52	+Varnish isn't able to communicate with the SSL protocol, so we will
	53	+need some one who do this and Pound[1] can do the job. In order to
	54	+install it in Debian based systems:
	55	+
	56	+ $ sudo apt-get install pound
	57	+
	58	+Set Varnish to listen in other port than 80:
	59	+
	60	+/etc/defaults/varnish
	61	+---------------------
	62	+
	63	+ DAEMON_OPTS="-a localhost:6081 \
	64	+ -T localhost:6082 \
	65	+ -f /etc/varnish/default.vcl \
	66	+ -S /etc/varnish/secret \
	67	+ -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
	68	+
	69	+Configure Pound:
	70	+
	71	+ # cp /usr/share/noosfero/etc/pound.cfg /etc/pound/
	72	+
	73	+Edit /etc/pound.cfg and set the IP and domain of your server.
	74	+
	75	+Configure Pound to start at system initialization:
	76	+
	77	+/etc/default/pound
	78	+------------------
	79	+
	80	+ startup=1
	81	+
	82	+Set Apache to only listen to localhost:
	83	+
	84	+/etc/apache2/ports.conf
	85	+-----------------------
	86	+
	87	+ Listen 127.0.0.1:8080
	88	+
	89	+Restart the services:
	90	+
	91	+ $ sudo service apache2 restart
	92	+ $ sudo service varnish restart
	93	+
	94	+Start pound:
	95	+
	96	+ $ sudo service pound start
	97	+
	98	+[1] http://www.apsis.ch/pound
	99	+
	100	+Noosfero XMPP chat
	101	+++++++++++++++++++
	102	+
	103	+If you want to use chat over HTTPS, then you should add the domain
	104	+and IP of your server in the /etc/hosts file, example:
	105	+
	106	+/etc/hosts
	107	+----------
	108	+
	109	+ 192.168.1.86 mydomain.example.com
	110	+
	111	+Also, it's recomended that you remove lines above from the file
	112	+`/etc/apache2/sites-enabled/noosfero`:
	113	+
	114	+ RewriteEngine On
	115	+ Include /usr/share/noosfero/util/chat/apache/xmpp.conf
...	...
...	...	@@ -24,10 +24,6 @@ Install the RPAF apache module (or skip this step if not using apache):
24	24
25	25	3b) Edit `/etc/apache2/sites-enabled/`, and change `<VirtualHost :80>` to `<VirtualHost *:8080>`
26	26
27		-3c) Restart apache
28		-
29		- # invoke-rc.d apache2 restart
30		-
31	27	4) Varnish configuration
32	28
33	29	4a) Edit `/etc/default/varnish`
...	...	@@ -44,10 +40,6 @@ On manual installations, change `/etc/noosfero/*` to `{Rails.root}/etc/noosfero/
44	40
45	41	NOTE: it is very important that the `.vcl` files are included in that order, i.e. first* include `varnish-noosfero.vcl`, and after `noosfero-accept-language.cvl`.
46	42
47		-4c) Restart Varnish
48		-
49		- # invoke-rc.d varnish restart
50		-
51	43	5) Enable varnish logging:
52	44
53	45	5a) Edit `/etc/default/varnishncsa` and uncomment the line that contains:
...	...	@@ -56,8 +48,10 @@ On manual installations, change `/etc/noosfero/*` to `{Rails.root}/etc/noosfero/
56	48
57	49	The varnish log will be written to `/var/log/varnish/varnishncsa.log` in an apache-compatible format. You should change your statistics generation software (e.g. awstats) to use that instead of apache logs.
58	50
59		-5b) Restart Varnish Logging service
	51	+Thanks to Cosimo Streppone for varnish-accept-language. See http://github.com/cosimo/varnish-accept-language for more information.
60	52
61		- # invoke-rc.d varnishncsa restart
	53	+6) Restart services
62	54
63		-Thanks to Cosimo Streppone for varnish-accept-language. See http://github.com/cosimo/varnish-accept-language for more information.
	55	+ # service apache2 restart
	56	+ # service varnish restart
	57	+ # service varnishncsa restart
...	...
1	1	#!/usr/bin/env rake
	2	+
2	3	# Add your own tasks in files placed in lib/tasks ending in .rake,
3	4	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4	5
5	6	require File.expand_path('../config/application', __FILE__)
6	7
7	8	Noosfero::Application.load_tasks
	9	+
	10	+[
	11	+ "baseplugins//{tasks,lib/tasks,rails/tasks}//.rake",
	12	+ "config/plugins//{tasks,lib/tasks,rails/tasks}//.rake",
	13	+ "config/plugins//vendor/plugins//{tasks,lib/tasks,rails/tasks}/*/.rake",
	14	+].map do \|pattern\|
	15	+ Dir.glob(pattern).sort
	16	+end.flatten.each do \|taskfile\|
	17	+ load taskfile
	18	+end
...	...
...	...	@@ -3,7 +3,7 @@
3	3
4	4	VAGRANTFILE_API_VERSION = "2"
5	5	Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|
6		- config.vm.box = "debian-wheezy"
	6	+ config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
7	7	config.vm.network :forwarded_port, host: 3000, guest: 3000
8	8	config.vm.provision :shell do \|shell\|
9	9	shell.inline = 'su vagrant -c /vagrant/script/vagrant'
...	...