merge with noosfero api branch

Ábner Silva de Oliveira
2 parents ef5a4c0a e5ecf4b1
Showing 190 changed files with 10340 additions and 8390 deletions Show diff stats
.gitlab-ci.yml
.travis.yml
AUTHORS.md
Gemfile
Gemfile.lock
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/maps_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/api_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/comment_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/dates_helper.rb
app/helpers/events_helper.rb
app/helpers/folder_helper.rb
app/helpers/forum_helper.rb
app/helpers/manage_products_helper.rb
@@ -0,0 +1,23 @@
+before_script:
+  - mkdir -p tmp/pids log
+  - script/noosfero-plugins disableall
+  - bundle check || bundle install
+# database
+  - cp config/database.yml.gitlab-ci config/database.yml
+  - createdb gitlab_ci_test || true
+  - bundle exec rake db:schema:load
+  - bundle exec rake db:migrate
+
+units:
+  script: 'bundle exec rake test:units'
+functionals:
+  script: 'bundle exec rake test:functionals'
+integration:
+  script: 'bundle exec rake test:integration'
+cucumber:
+  script: 'bundle exec rake cucumber'
+selenium:
+  script: 'bundle exec rake selenium'
+plugins:
+  script: 'bundle exec rake test:noosfero_plugins'
+
@@ -0,0 +1,35 @@
+language: ruby
+rvm:
+# for 2.2 support we need to upgrade the pg gem
+  - 2.1.6
+
+before_install:
+# dependencies
+  - sudo apt-get update
+  - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data openjdk-6-jre curl wget
+  - sudo apt-get -y install libmagickwand-dev libpq-dev libreadline-dev libsqlite3-dev libxslt1-dev
+# selenium support
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
+before_script:
+  - mkdir -p tmp/pids log
+  - script/noosfero-plugins disableall
+  - bundle check || bundle install
+# database
+  - cp config/database.yml.travis config/database.yml
+  - psql -c 'create database myapp_test;' -U postgres
+  - bundle exec rake db:schema:load
+  - bundle exec rake db:migrate
+
+env:
+  - TASK=test:units
+  - TASK=test:functionals
+  - TASK=test:integration
+  - TASK=cucumber
+  - TASK=selenium
+  - TASK=test:noosfero_plugins
+
+script:
+  - bundle exec rake $TASK
+
@@ -6,131 +6,132 @@ noosfero, that&#39;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 + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
 Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
-Alessandro Palmeira + 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 + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
+Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
 Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
 Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego 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 + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
+Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
 Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + 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 + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
+Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
-analosnak <analosnak@gmail.com>
+Alessandro Palmeira <alessandro.palmeira@gmail.com>
 Ana Losnak <analosnak@gmail.com>
 Andre Bernardes <andrebsguedes@gmail.com>
+André Bernardes <andrebsguedes@gmail.com>
+André Guedes <andrebsguedes@fedora.local>
+André Guedes <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>
+Athos Ribeiro <athoscribeiro@gmail.com>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
+Braulio Bhavamitra <braulio@eita.org.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
 Bráulio Bhavamitra <brauliobo@gmail.com>
-Braulio Bhavamitra <braulio@eita.org.br>
-Caio <caio.csalgado@gmail.com>
 Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
+Caio <caio.csalgado@gmail.com>
 Caio Formiga <caio.formiga@gmail.com>
-Caio, Pedro <caio.csalgado@gmail.com>
+Caio SBA <caio@colivre.coop.br>
 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 + Diego Araújo <caio.csalgado@gmail.com>
+Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
 Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
 Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
 Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
+Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
 Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
 Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
-Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
 Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
-Caio SBA <caio@colivre.coop.br>
+Caio Salgado <caio.csalgado@gmail.com>
 Caio Tiago Oliveira <caiotiago@colivre.coop.br>
+Caio, Pedro <caio.csalgado@gmail.com>
 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>
+Carlos Morais <carlos88morais@gmail.com>
 Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
 Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
 Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
+Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
+Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
 Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
 Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
-Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
-daniel <dtygel@eita.org.br>
+Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 David Carlos <ddavidcarlos1392@gmail.com>
-diegoamc <diegoamc90@gmail.com>
-Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
+Diego + Jefferson <diegoamc90@gmail.com>
+Diego + Renan <renanteruoc@gmail.com>
+Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
+Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
+Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
+Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
 Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
-Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
+Diego Araújo + Alessandro Palmeira <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 + João M. M. da Silva <diegoamc90@gmail.com>
+Diego Araújo + João Machini <diegoamc90@gmail.com>
+Diego Araújo + João Machini <digoamc90@gmail.com>
 Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
 Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Diego 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 Araújo <diegoamc90@gmail.com>
 Diego Martinez <diegoamc90@gmail.com>
-Diego + Renan <renanteruoc@gmail.com>
-dtygel <dtygel@gmail.com>
 DylanGuedes <djmgguedes@gmail.com>
 Eduardo Passos <eduardo@risa.localdomain.localhost>
 Eduardo Passos <eduardosteps@gmail.com>
 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
+Eduardo Vital <vitaldu@gmail.com>
 Evandro Jr <evandrojr@gmail.com>
 Evandro Junior <evandrojr@gmail.com>
-Fabio Teixeira <fabio1079@gmail.com>
+Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
 FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
+Fabio Teixeira <fabio1079@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
+Filipe Ribeiro <firibeiro77@live.com>
 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
@@ -144,25 +145,29 @@ Hugo Melo &lt;hugo@riseup.net&gt;
 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>
-Jérôme Jutteau <j.jutteau@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>
+Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
+Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
+Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
+Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
+Joenio Costa <joenio@colivre.coop.br>
+Jose Pedro <1jpsneto@gmail.com>
+Josef Spillner <josef.spillner@tu-dresden.de>
+João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
+João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
-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 + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
+João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
 João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + 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>
@@ -170,46 +175,44 @@ João M. M. da Silva + Pedro Leal &lt;jaodsilv@linux.ime.usp.br&gt;
 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>
-Jose Pedro <1jpsneto@gmail.com>
+João M. M. da Silva <jaodsilv@linux.ime.usp.br>
+João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
+João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
+João da Silva <jaodsilv@linux.ime.usp.br>
 Junior Silva <junior@bajor.localhost.localdomain>
 Junior Silva <junior@sedeantigo.colivre.coop.br>
 Junior Silva <juniorsilva1001@gmail.com>
 Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
 Junior Silva <juniorsilva@colivre.coop.br>
-juniorsilva <juniorsilva@QonoS.localhost.localdomain>
+Jérôme Jutteau <j.jutteau@gmail.com>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
 Larissa Reis <reiss.larissa@gmail.com>
 Leandro Alves <leandrosustenido@gmail.com>
-Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
 Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
-Leandro Nunes dos Santos <leandronunes@gmail.com>
+Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
+Leandro Nunes dos Santos <leandronunes@gmail.com>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
 Lucas Kanashiro <kanashiro.duarte@gmail.com>
 Lucas Melo <lucas@colivre.coop.br>
 Lucas Melo <lucaspradomelo@gmail.com>
 Luciano <lucianopcbr@gmail.com>
+Luciano Prestes Cavacanti <lucianopcbr@gmail.com>
 Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
+M for Momo <mo@rtnp.org>
+Marcelo Júnior <maljunior@gmail.com>
 Marcos <marcos.rpj2@gmail.com>
 Marcos Ramos <ms.ramos@outlook.com>
 Martín Olivera <molivera@solar.org.ar>
 Maurilio Atila <cabelotaina@gmail.com>
-M for Momo <mo@rtnp.org>
 Michal Čihař <michal@cihar.com>
+Michel Felipe <mfelipeof@gmail.com>
 Moises Machado <moises@colivre.coop.br>
-Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
+Naíla Alves <naila@colivre.coop.br>
 Niemand Jedermann <predatorix@web.de>
 Parley Martins <parleypachecomartins@gmail.com>
 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
@@ -217,8 +220,8 @@ Paulo Meirelles + Alessandro Palmeira &lt;paulo@softwarelivre.org&gt;
 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>
+Paulo Meirelles <paulo@softwarelivre.org>
 Rafael Gomes <rafaelgomes@techfree.com.br>
 Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
 Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
@@ -233,37 +236,46 @@ Rafael Reggiani Manzo + Diego Araújo &lt;rr.manzo@gmail.com&gt;
 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>
 Raquel <rcordioli@gmail.com>
+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>
+Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
 Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
-root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
+TWS <tablettws@gmail.com>
 Tallys Martins <tallysmartins@gmail.com>
 Tallys Martins <tallysmartins@yahoo.com.br>
-tallys <tallys@tallys>
-tallys <tallys@tallys.(none)>
 Thiago Casotti <thiago.casotti@uol.com.br>
+Thiago Ribeiro <thiagitosouza@hotmail.com>
 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
 Tuux <tuxa@galaxie.eu.org>
-TWS <tablettws@gmail.com>
 Valessio Brito <contato@valessiobrito.com.br>
 Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
-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>
+alcampelo <alcampelo@alcampelo.(none)>
+analosnak <analosnak@gmail.com>
+daniel <dtygel@eita.org.br>
+diegoamc <diegoamc90@gmail.com>
+dtygel <dtygel@gmail.com>
+juniorsilva <juniorsilva@QonoS.localhost.localdomain>
+root <root@17edebf1ae91>
+root <root@debian.sdr.serpro>
+tallys <tallys@tallys.(none)>
+tallys <tallys@tallys>
+vfcosta <vfcosta@gmail.com>
+Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
 Ideas, specifications and incentive
 ===================================
 source "https://rubygems.org"
-gem 'rails',                    '~> 3.2.21'
+gem 'rails',                    '~> 3.2.22'
 gem 'minitest',                 '~> 3.2.0'
 gem 'fast_gettext',             '~> 0.6.8'
 gem 'acts-as-taggable-on',      '~> 3.4.2'
@@ -18,7 +18,7 @@ gem &#39;exception_notification&#39;,   &#39;~&gt; 4.0.1&#39;
 gem 'gettext',                  '~> 2.2.1', :require => false
 gem 'locale',                   '~> 2.0.5'
 gem 'whenever', :require => false
-gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
+gem 'eita-jrails', '= 0.9.5', :require => 'jrails'
 gem 'grape',                    '~> 0.11.0'
 gem 'grape-entity'
 gem 'grape-swagger'
@@ -26,6 +26,10 @@ gem &#39;grape_logging&#39;
 gem 'api-pagination',           '~> 4.1.1'
 gem 'rack-cors'
 gem 'rack-contrib'
+#gem 'grape-swagger-rails'
+
+# FIXME list here all actual dependencies (i.e. the ones in debian/control),
+# with their GEM names (not the Debian package names)
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -0,0 +1,277 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RedCloth (4.2.9)
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
+      mail (~> 2.5.4)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
+      builder (~> 3.0.0)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    acts-as-taggable-on (3.4.4)
+      activerecord (>= 3.2, < 5)
+    api-pagination (4.1.1)
+    arel (3.0.3)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    builder (3.0.4)
+    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.5.6)
+      ffi (~> 1.0, >= 1.0.11)
+    chronic (0.10.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    columnize (0.9.0)
+    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.9)
+    dalli (2.7.4)
+    database_cleaner (1.2.0)
+    debugger (1.6.8)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.5)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.8)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    eita-jrails (0.9.5)
+      actionpack (~> 3.2, >= 3.1.0)
+      activesupport (~> 3.2, >= 3.0.0)
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    eventmachine (1.0.7)
+    exception_notification (4.0.1)
+      actionmailer (>= 3.0.4)
+      activesupport (>= 3.0.4)
+    execjs (2.5.2)
+    fast_gettext (0.6.12)
+    ffi (1.9.10)
+    gettext (2.2.1)
+      locale
+    gherkin (2.4.21)
+      json (>= 1.4.6)
+    git-version-bump (0.15.1)
+    grape (0.11.0)
+      activesupport
+      builder
+      hashie (>= 2.1.0)
+      multi_json (>= 1.3.2)
+      multi_xml (>= 0.5.2)
+      rack (>= 1.3.0)
+      rack-accept
+      rack-mount
+      virtus (>= 1.0.0)
+    grape-entity (0.4.5)
+      activesupport
+      multi_json (>= 1.3.2)
+    grape-swagger (0.10.1)
+      grape (>= 0.8.0)
+      grape-entity
+    grape_logging (1.1.2)
+      grape
+    hashie (3.4.2)
+    hike (1.2.3)
+    i18n (0.7.0)
+    ice_nine (0.11.1)
+    journey (1.0.4)
+    json (1.8.3)
+    locale (2.0.9)
+    magic (0.2.9)
+      ffi (>= 0.6.3)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.4)
+    mime-types (1.25.1)
+    mini_portile (0.6.2)
+    minitest (3.2.0)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    pg (0.13.2)
+    polyglot (0.3.5)
+    rack (1.4.7)
+    rack-accept (0.4.5)
+      rack (>= 0.4)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-contrib (1.3.0)
+      git-version-bump (~> 0.15)
+      rack (~> 1.4)
+    rack-cors (0.4.0)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
+      bundler (~> 1.0)
+      railties (= 3.2.22)
+    rails_autolink (1.1.6)
+      rails (> 3.1)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.4.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rest-client (1.6.9)
+      mime-types (~> 1.16)
+    rmagick (2.13.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    ruby-feedparser (0.9.3)
+      magic
+    rubyzip (1.1.7)
+    sass (3.4.15)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    selenium-webdriver (2.39.0)
+      childprocess (>= 0.2.5)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0.4)
+    sprockets (2.2.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    thin (1.3.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    tins (1.5.4)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.44)
+    uglifier (2.7.1)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+    websocket (1.0.7)
+    whenever (0.9.4)
+      chronic (>= 0.6.3)
+    will_paginate (3.0.7)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth (~> 4.2.9)
+  acts-as-taggable-on (~> 3.4.2)
+  api-pagination (~> 4.1.1)
+  capybara (~> 2.1.0)
+  cucumber (~> 1.0.6)
+  cucumber-rails (~> 1.0.6)
+  daemons (~> 1.1.5)
+  dalli (~> 2.7.0)
+  database_cleaner (~> 1.2.0)
+  debugger
+  eita-jrails (= 0.9.5)
+  exception_notification (~> 4.0.1)
+  fast_gettext (~> 0.6.8)
+  gettext (~> 2.2.1)
+  grape (~> 0.11.0)
+  grape-entity
+  grape-swagger
+  grape_logging
+  locale (~> 2.0.5)
+  minitest (~> 3.2.0)
+  mocha (~> 1.1.0)
+  nokogiri (~> 1.6.0)
+  pg (~> 0.13.2)
+  rack-contrib
+  rack-cors
+  rails (~> 3.2.22)
+  rails_autolink (~> 1.1.5)
+  rake
+  rest-client (~> 1.6.7)
+  rmagick (~> 2.13.1)
+  rspec (~> 2.14.0)
+  rspec-rails (~> 2.14.1)
+  ruby-feedparser (~> 0.7)
+  sass-rails
+  selenium-webdriver (~> 2.39.0)
+  thin (~> 1.3.1)
+  uglifier (>= 1.0.3)
+  whenever
+  will_paginate (~> 3.0.3)
@@ -94,6 +94,11 @@ class CmsController &lt; MyProfileController
     record_coming
     if request.post?
       @article.image = nil if params[:remove_image] == 'true'
+      if @article.image.present? && params[:article][:image_builder] &&
+        params[:article][:image_builder][:label]
+        @article.image.label = params[:article][:image_builder][:label]
+        @article.image.save!
+      end
       @article.last_changed_by = user
       if @article.update_attributes(params[:article])
         if !continue
@@ -105,6 +110,11 @@ class CmsController &lt; MyProfileController
         end
       end
     end
+
+    unless @article.kind_of?(RssFeed)
+      @escaped_body = CGI::escapeHTML(@article.body || '')
+      @escaped_abstract = CGI::escapeHTML(@article.abstract || '')
+    end
   end
   def new
@@ -35,7 +35,7 @@ class ManageProductsController &lt; ApplicationController
   end
   def categories_for_selection
-    @category = Category.find(params[:category_id]) if params[:category_id]
+    @category = environment.categories.find_by_id params[:category_id]
     @object_name = params[:object_name]
     if @category
       @categories = @category.children
@@ -95,6 +95,20 @@ class ManageProductsController &lt; ApplicationController
     end
   end
+  def show_category_tree
+    @category = environment.categories.find params[:category_id]
+    render :partial => 'selected_category_tree'
+  end
+
+  def search_categories
+    @term = params[:term].downcase
+    conditions = ['LOWER(name) LIKE ? OR LOWER(name) LIKE ?', "#{@term}%", "% #{@term}%"]
+    @categories = ProductCategory.all :conditions => conditions, :limit => 10
+    render :json => (@categories.map do |category|
+      {:label => category.name, :value => category.id}
+    end)
+  end
+
   def add_input
     @product = @profile.products.find(params[:id])
     @input = @product.inputs.build
@@ -16,6 +16,7 @@ class MapsController &lt; MyProfileController
         Profile.transaction do
           if profile.update_attributes!(params[:profile_data])
+            BlockSweeper.expire_blocks profile.blocks.select{ |b| b.class == LocationBlock }
             session[:notice] = _('Address was updated successfully!')
             redirect_to :action => 'edit_location'
           end
@@ -98,11 +98,8 @@ class AccountController &lt; ApplicationController
     @block_bot = !!session[:may_be_a_bot]
     @invitation_code = params[:invitation_code]
     begin
-      @user = User.new(params[:user])
-      @user.terms_of_use = environment.terms_of_use
-      @user.environment = environment
+      @user = User.build(params[:user], params[:profile_data], environment)
       @terms_of_use = environment.terms_of_use
-      @user.person_data = params[:profile_data]
       @user.return_to = session[:return_to]
       @person = Person.new(params[:profile_data])
       @person.environment = @user.environment
@@ -0,0 +1,19 @@
+class ApiController < PublicController
+
+  no_design_blocks
+
+  helper_method :endpoints
+
+  def index
+  end
+
+  def playground
+  end
+
+  private
+
+  def endpoints
+    Noosfero::API::API.endpoints(environment)
+  end
+
+end
@@ -15,6 +15,7 @@ class ContentViewerController &lt; ApplicationController
     path = get_path(params[:page], params[:format])
     @version = params[:version].to_i
+    @npage = params[:npage] || '1'
     if path.blank?
       @page = profile.home_page
@@ -131,7 +132,7 @@ class ContentViewerController &lt; ApplicationController
     end
     unless @page.display_to?(user)
-      if !profile.visible? || profile.secret? || (user && user.follows?(profile))
+      if !profile.visible? || profile.secret? || (user && user.follows?(profile)) || user.blank?
         render_access_denied
       else #!profile.public?
         private_profile_partial_parameters
@@ -1195,7 +1195,7 @@ module ApplicationHelper
       pending_tasks_count = link_to("<i class=\"icon-menu-tasks\"></i><span class=\"task-count\">#{count}</span>", user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
-    (_("<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'))) +
+    (_("<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.url, :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
     admin_link +
     manage_enterprises +
@@ -1226,35 +1226,6 @@ module ApplicationHelper
     list.sort.inject(Hash.new(0)){|h,i| h[i] += 1; h }.collect{ |x, n| [n, connector, x].join(" ") }.sort
   end
-  #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+
-  def time_ago_as_sentence(from_time, include_seconds = false)
-    to_time = Time.now
-    from_time = Time.parse(from_time.to_s)
-    from_time = from_time.to_time if from_time.respond_to?(:to_time)
-    to_time = to_time.to_time if to_time.respond_to?(:to_time)
-    distance_in_minutes = (((to_time - from_time).abs)/60).round
-    distance_in_seconds = ((to_time - from_time).abs).round
-    case distance_in_minutes
-      when 0..1
-        return (distance_in_minutes == 0) ? _('less than a minute') : _('1 minute') unless include_seconds
-        case distance_in_seconds
-          when 0..4   then _('less than 5 seconds')
-          when 5..9   then _('less than 10 seconds')
-          when 10..19 then _('less than 20 seconds')
-          when 20..39 then _('half a minute')
-          when 40..59 then _('less than a minute')
-          else             _('1 minute')
-        end
-
-      when 2..44           then _('%{distance} minutes ago') % { :distance => distance_in_minutes }
-      when 45..89          then _('about 1 hour ago')
-      when 90..1439        then _('about %{distance} hours ago') % { :distance => (distance_in_minutes.to_f / 60.0).round }
-      when 1440..2879      then _('1 day ago')
-      when 2880..10079     then _('%{distance} days ago') % { :distance => (distance_in_minutes / 1440).round }
-      else                      show_time(from_time)
-    end
-  end
-
   def comment_balloon(options = {}, &block)
     wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')
     (1..8).to_a.reverse.each { |i| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }
@@ -1273,7 +1244,7 @@ module ApplicationHelper
   def task_information(task)
     values = {}
-    values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor
+    values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
     values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
     values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
     values.merge!(task.information[:variables]) if task.information[:variables]
@@ -22,7 +22,9 @@ module BlogHelper
       :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"}
+      :params => {:action=>"view_page",
+                  :page=>articles.first.parent.path.split('/'),
+                  :controller=>"content_viewer"}
     }) if articles.present? && conf[:paginate]
     content = []
     artic_len = articles.length
@@ -44,7 +46,7 @@ module BlogHelper
   end
   def display_post(article, format = 'full')
-    no_comments = (format == 'full') ? false : true
+    no_comments = (format == 'full' || format == 'compact' ) ? false : true
     title = article_title(article, :no_comments => no_comments)
     method = "display_#{format.split('+')[0]}_format"
     html = send(method, FilePresenter.for(article)).html_safe
@@ -55,8 +57,12 @@ module BlogHelper
       else
         '<div class="post-pic" style="background-image:url('+img+')"></div>'
       end
-    end.to_s +
-    title + html
+    end.to_s + title + html
+  end
+
+  def display_compact_format(article)
+    render :file => 'content_viewer/_display_compact_format',
+           :locals => { :article => article, :format => "compact" }
   end
   def display_full_format(article)
 module CommentHelper
+  include DatesHelper
   def article_title(article, args = {})
     title = article.title
@@ -15,7 +16,7 @@ module CommentHelper
         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', comments, :class => 'comments'),
-        :class => 'created-at'
+        :class => 'publishing-info'
       )
     end
     title
@@ -2,6 +2,7 @@ module ContentViewerHelper
   include BlogHelper
   include ForumHelper
+  include DatesHelper
   def display_number_of_comments(n)
     base_str = "<span class='comment-count hide'>#{n}</span>"
@@ -24,16 +25,35 @@ module ContentViewerHelper
       unless args[:no_comments] || !article.accept_comments
         comments = (" - %s") % link_to_comments(article)
       end
+      date_format = show_with_right_format_date article
       title << content_tag('span',
-        content_tag('span', show_date(article.published_at), :class => 'date') +
+        date_format +
         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'
+        :class => 'publishing-info'
       )
     end
     title
   end
+  def show_with_right_format_date article
+    date_format = article.environment.date_format
+    use_numbers = false
+    year = true
+    left_time = false
+    if date_format ==  'numbers_with_year'
+      use_numbers = true
+    elsif date_format == 'numbers'
+      use_numbers = true
+      year = false
+    elsif date_format == 'month_name'
+      year = false
+    elsif date_format == 'past_time'
+      left_time = true
+    end
+    content_tag('span', show_date(article.published_at, use_numbers , year, left_time), :class => 'date')
+  end
+
   def link_to_comments(article, args = {})
     return '' unless article.accept_comments?
     reference_to_article number_of_comments(article), article, 'comments_list'
@@ -2,6 +2,7 @@ require &#39;noosfero/i18n&#39;
 module DatesHelper
+  include ActionView::Helpers::DateHelper
   def months
     I18n.t('date.month_names')
   end
@@ -15,10 +16,12 @@ module DatesHelper
   end
   # formats a date for displaying.
-  def show_date(date, use_numbers = false, year=true)
+  def show_date(date, use_numbers = false, year = true, left_time = false)
     if date && use_numbers
       date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}')
       date_format % { :day => date.day, :month => date.month, :year => date.year }
+    elsif date && left_time
+      date_format = time_ago_in_words(date)
     elsif date
       date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}')
       date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year }
 module EventsHelper
+  include DatesHelper
   def list_events(date, events)
     title = _('Events for %s') % show_date_month(date)
     content_tag('h2', title) +
-require 'short_filename'
-
 module FolderHelper
-  include ShortFilename
   include ArticleHelper
   def list_contents(configure={})
@@ -10,8 +7,8 @@ module FolderHelper
     configure[:list_type] ||= :folder
     if !configure[:contents].blank?
       configure[:contents] = configure[:contents].paginate(
-        :order => "updated_at DESC",
-        :per_page => 10,
+        :order => "name ASC",
+        :per_page => 30,
         :page => params[:npage]
       )
@@ -25,49 +22,32 @@ module FolderHelper
     articles.select {|article| article.display_to?(user)}
   end
-  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]
+  def display_content_icon(content_item)
+    content = FilePresenter.for content_item
     content_link = if content.image?
-         link_to('&nbsp;' * (level * 4) +
-           image_tag(icon_for_article(content)) + short_filename(content.name),
+         link_to(
+           image_tag(icon_for_article(content, :bigicon)),
            content.url.merge(:view => true)
          )
        else
-         link_to('&nbsp;' * (level * 4) +
-           short_filename(content.name),
-           content.url.merge(:view => true), :class => icon_for_article(content)
+         link_to('',
+          content.url.merge(:view => true),
+          :class => icon_for_article(content, :bigicon)
          )
        end
-    result = content_tag(
-      'tr',
-      content_tag('td', content_link ) +
-      content_tag('td', show_date(content.updated_at), :class => 'last-update'),
-      :class => "#{list_type}-item"
-    )
-    if recursive
-      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
   end
-  def icon_for_article(article)
+  def icon_for_article(article, size = 'icon')
     article = FilePresenter.for article
-    icon = article.respond_to?(:icon_name) ?
-             article.icon_name :
-             article.class.icon_name(article)
-    if (icon =~ /\//)
-      icon
+    if article.respond_to?(:sized_icon)
+      article.sized_icon(size)
     else
-      klasses = 'icon ' + [icon].flatten.map{|name| 'icon-'+name}.join(' ')
+      icon = article.respond_to?(:icon_name) ?
+              article.icon_name :
+              article.class.icon_name(article)
+      klasses = "#{size} " + [icon].flatten.map{|name| "#{size}-"+name}.join(' ')
       if article.kind_of?(UploadedFile) || article.kind_of?(FilePresenter)
-        klasses += ' icon-upload-file'
+        klasses += " #{size}-upload-file"
       end
       klasses
     end
 module ForumHelper
+  include ActionView::Helpers::DateHelper
   def cms_label_for_new_children
     _('New discussion topic')
@@ -42,9 +43,9 @@ module ForumHelper
   def last_topic_update(article)
     info = article.info_from_last_update
     if info[:author_url]
-      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
+      time_ago_in_words(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
     else
-      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
+      time_ago_in_words(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
     end
   end
@@ -75,9 +75,12 @@ module ManageProductsHelper
   end
   def categories_container(categories_selection_html, hierarchy_html = '')
-    hidden_field_tag('selected_category_id') +
-    content_tag('div', hierarchy_html, :id => 'hierarchy_navigation') +
-    content_tag('div', categories_selection_html, :id => 'categories_container_wrapper')
+    content_tag 'div',
+      render('categories_autocomplete') +
+      hidden_field_tag('selected_category_id') +
+      content_tag('div', hierarchy_html, :id => 'hierarchy_navigation') +
+      content_tag('div', categories_selection_html, :id => 'categories_container_wrapper'),
+    :id => 'categories-container'
   end
   def select_for_categories(categories, level = 0)
@@ -28,7 +28,7 @@ class Article &lt; ActiveRecord::Base
   def initialize(*params)
     super
-    if !params.blank? && params.first.has_key?(:profile)
+    if !params.blank? && params.first.has_key?(:profile) && !params.first[:profile].blank?
       profile = params.first[:profile]
       self.published = false unless profile.public?
     end
@@ -133,15 +133,7 @@ class Article &lt; ActiveRecord::Base
     {:include => 'categories_including_virtual', :conditions => { 'categories.id' => category.id }}
   }
-  #FIXME make this test
-  scope :newer_than, lambda { |reference_id|
-    {:conditions => ["articles.id > #{reference_id}"]}
-  }
-
-  #FIXME make this test
-  scope :older_than, lambda { |reference_id|
-    {:conditions => ["articles.id < #{reference_id}"]}
-  }
+  include TimeScopes
   scope :by_range, lambda { |range| {
     :conditions => [
@@ -748,8 +740,9 @@ class Article &lt; ActiveRecord::Base
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
-  def lead
-    abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
+  def lead(length = nil)
+    content = abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
+    length.present? ? content.truncate(length) : content
   end
   def short_lead
@@ -76,9 +76,12 @@ class Blog &lt; Folder
   end
   settings_items :visualization_format, :type => :string, :default => 'full'
-  validates_inclusion_of :visualization_format, :in => [ 'full', 'short', 'short+pic' ], :if => :visualization_format
+  validates_inclusion_of :visualization_format,
+                         :in => [ 'full', 'short', 'short+pic', 'compact'],
+                         :if => :visualization_format
-  settings_items :display_posts_in_current_language, :type => :boolean, :default => false
+  settings_items :display_posts_in_current_language,
+                 :type => :boolean, :default => false
   alias :display_posts_in_current_language? :display_posts_in_current_language
@@ -20,16 +20,7 @@ class Comment &lt; ActiveRecord::Base
   scope :without_reply, :conditions => ['reply_of_id IS NULL']
-  #FIXME make this test
-  scope :newer_than, lambda { |reference_id|
-    {:conditions => ["comments.id > #{reference_id}"]}
-  }
-
-  #FIXME make this test
-  scope :older_than, lambda { |reference_id|
-    {:conditions => ["comments.id < #{reference_id}"]}
-  }
-
+  include TimeScopes
   # unauthenticated authors:
   validates_presence_of :name, :if => (lambda { |record| !record.email.blank? })
@@ -3,7 +3,17 @@
 # domains.
 class Environment < ActiveRecord::Base
-  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist, :highlighted_news_amount, :portal_news_amount
+  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, :highlighted_news_amount,
+                  :portal_news_amount, :date_format
   has_many :users
@@ -14,6 +24,12 @@ class Environment &lt; ActiveRecord::Base
   IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
+  validates_inclusion_of :date_format,
+                         :in => [ 'numbers_with_year', 'numbers',
+                                  'month_name_with_year', 'month_name',
+                                  'past_time'],
+                         :if => :date_format
+
   def self.verify_filename(filename)
     filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
     filename
@@ -98,47 +98,19 @@ class Event &lt; Article
     start_date..(end_date||start_date)
   end
-  # FIXME this shouldn't be needed
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-  include DatesHelper
+  def first_paragraph
+    paragraphs = Nokogiri::HTML.fragment(self.body).css('p')
+    paragraphs.empty? ? '' : paragraphs.first.to_html
+  end
   def to_html(options = {})
+    event = self
+    format = options[:format]
-    result = ''
-    html = ::Builder::XmlMarkup.new(:target => result)
-
-    html.div(:class => 'event-info' ) {
-      html.ul(:class => 'event-data' ) {
-        html.li(:class => 'event-dates' ) {
-          html.span _('When:')
-          html.text! show_period(start_date, end_date)
-        } if start_date.present? || end_date.present?
-        html.li {
-          html.span _('URL:')
-          html.a(self.link || "", 'href' => self.link || "")
-        } if self.link.present?
-        html.li {
-          html.span _('Address:')
-          html.text! self.address || ""
-        } if self.address.present?
-      }
-
-      # TODO: some good soul, please clean this ugly hack:
-      if self.body
-        html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description')
-      end
-    }
-
-    if self.body
-      if options[:format] == 'short'
-        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self))
-      else
-        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
-      end
+    proc do
+      render :file => 'content_viewer/event_page', :locals => { :event => event,
+        :format => format }
     end
-
-    result
   end
   def duration
@@ -23,7 +23,7 @@ class Image &lt; ActiveRecord::Base
   postgresql_attachment_fu
-  attr_accessible :uploaded_data
+  attr_accessible :uploaded_data, :label
   def current_data
     File.file?(full_filename) ? File.read(full_filename) : nil
@@ -8,13 +8,30 @@ class Organization &lt; Profile
     :display => %w[compact]
   }
-  scope :visible_for_person, lambda { |person|
-    joins('LEFT JOIN "role_assignments" ON "role_assignments"."resource_id" = "profiles"."id" AND "role_assignments"."resource_type" = \'Profile\'')
+  # An Organization is considered visible to a given person if one of the
+# following conditions are met:
+#   1) The user is an environment administrator.
+#   2) The user is an administrator of the organization.
+#   3) The user is a member of the organization and the organization is
+#   visible.
+#   4) The user is not a member of the organization but the organization is
+#   visible, public and enabled.
+  def self.visible_for_person(person)
+    joins('LEFT JOIN "role_assignments" ON ("role_assignments"."resource_id" = "profiles"."id"
+          AND "role_assignments"."resource_type" = \'Profile\') OR (
+          "role_assignments"."resource_id" = "profiles"."environment_id" AND
+          "role_assignments"."resource_type" = \'Environment\' )')
+    .joins('LEFT JOIN "roles" ON "role_assignments"."role_id" = "roles"."id"')
     .where(
-      ['( ( role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR 
-          (profiles.public_profile = ?)) AND (profiles.visible = ?)', Profile.name, person.id,  true, true]
+      ['( (roles.key = ? OR roles.key = ?) AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? )
+        OR
+        ( ( ( role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR
+            ( profiles.public_profile = ? AND profiles.enabled = ? ) ) AND
+          ( profiles.visible = ? ) )',
+      'profile_admin', 'environment_administrator', Profile.name, person.id,
+      Profile.name, person.id,  true, true, true]
     ).uniq
-  }
+  end
   settings_items :closed, :type => :boolean, :default => false
   def closed?
@@ -154,6 +171,12 @@ class Organization &lt; Profile
     ]
   end
+  def short_name chars = 40
+    s = self.display_name
+    s = super(chars) if s.blank?
+    s
+  end
+
   def notification_emails
     emails = [contact_email].select(&:present?) + admins.map(&:email)
     if emails.empty?
 # 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, :cell_phone, 
-    :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, 
-    :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, 
+  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, :following_articiles
   SEARCH_FILTERS = {
@@ -45,13 +45,17 @@ roles] }
   }
   scope :visible_for_person, lambda { |person|
-    joins('LEFT JOIN "friendships" ON "friendships"."friend_id" = "profiles"."id"')
-    .where(
-      ['( ( friendships.person_id = ? ) OR (profiles.public_profile = ?)) AND (profiles.visible = ?)', person.id,  true, true]
-    ).uniq
+   joins('LEFT JOIN "role_assignments" ON
+         "role_assignments"."resource_id" = "profiles"."environment_id" AND
+         "role_assignments"."resource_type" = \'Environment\'')
+   .joins('LEFT JOIN "roles" ON "role_assignments"."role_id" = "roles"."id"')
+   .joins('LEFT JOIN "friendships" ON "friendships"."friend_id" = "profiles"."id"')
+   .where(
+     ['( roles.key = ? AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR (
+       ( ( friendships.person_id = ? ) OR (profiles.public_profile = ?)) AND (profiles.visible = ?) )', 'environment_administrator', Profile.name, person.id, person.id,  true, true]
+   ).uniq
   }
-
   def has_permission_with_admin?(permission, resource)
     return true if resource.blank? || resource.admins.include?(self)
     return true if resource.kind_of?(Profile) && resource.environment.admins.include?(self)
@@ -51,6 +51,25 @@ class Product &lt; ActiveRecord::Base
     {:joins => :product_category, :conditions => ['categories.path LIKE ?', "%#{category.slug}%"]} if category
   }
+  scope :visible_for_person, lambda { |person|
+    joins('INNER JOIN "profiles" enterprises ON enterprises."id" = "products"."profile_id"')
+    .joins('LEFT JOIN "role_assignments" ON ("role_assignments"."resource_id" = enterprises."id"
+          AND "role_assignments"."resource_type" = \'Profile\') OR (
+          "role_assignments"."resource_id" = enterprises."environment_id" AND
+          "role_assignments"."resource_type" = \'Environment\' )')
+    .joins('LEFT JOIN "roles" ON "role_assignments"."role_id" = "roles"."id"')
+    .where(
+      ['( (roles.key = ? OR roles.key = ?) AND role_assignments.accessor_type = \'Profile\' AND role_assignments.accessor_id = ? )
+        OR
+        ( ( ( role_assignments.accessor_type = \'Profile\' AND
+              role_assignments.accessor_id = ? ) OR
+            ( enterprises.public_profile = ? AND enterprises.enabled = ? ) ) AND
+          ( enterprises.visible = ? ) )',
+      'profile_admin', 'environment_administrator', person.id, person.id,
+      true, true, true]
+    ).uniq
+  }
+
   after_update :save_image
   def lat
@@ -128,15 +128,49 @@ class Profile &lt; ActiveRecord::Base
   }
   scope :no_templates, {:conditions => {:is_template => false}}
-  #FIXME make this test
-  scope :newer_than, lambda { |reference_id|
-    {:conditions => ["profiles.id > #{reference_id}"]}
-  }
+  # Returns a scoped object to select profiles in a given location or in a radius
+  # distance from the given location center.
+  # The parameter can be the `request.params` with the keys:
+  # * `country`: Country code string.
+  # * `state`: Second-level administrative country subdivisions.
+  # * `city`: City full name for center definition, or as set by users.
+  # * `lat`: The latitude to define the center of georef search.
+  # * `lng`: The longitude to define the center of georef search.
+  # * `distance`: Define the search radius in kilometers.
+  # NOTE: This method may return an exception object, to inform filter error.
+  # When chaining scopes, is hardly recommended you to add this as the last one,
+  # if you can't be sure about the provided parameters.
+  def self.by_location(params)
+    params = params.with_indifferent_access
+    if params[:distance].blank?
+      where_code = []
+      [ :city, :state, :country ].each do |place|
+        unless params[place].blank?
+          # ... So we must to find on this named location
+          # TODO: convert location attrs to a table collumn
+          where_code << "(profiles.data like '%#{place}: #{params[place]}%')"
+        end
+      end
+      self.where where_code.join(' AND ')
+    else # Filter in a georef circle
+      unless params[:lat].blank? && params[:lng].blank?
+        lat, lng = [ params[:lat].to_f, params[:lng].to_f ]
+      end
+      if !lat
+        location = [ params[:city], params[:state], params[:country] ].compact.join(', ')
+        if location.blank?
+          return Exception.new (
+            _('You must to provide `lat` and `lng`, or `city` and `country` to define the center of the search circle, defined by `distance`.')
+          )
+        end
+        lat, lng = Noosfero::GeoRef.location_to_georef location
+      end
+      dist = params[:distance].to_f
+      self.where "#{Noosfero::GeoRef.sql_dist lat, lng} <= #{dist}"
+    end
+  end
-  #FIXME make this test
-  scope :older_than, lambda { |reference_id|
-    {:conditions => ["profiles.id < #{reference_id}"]}
-  }
+  include TimeScopes
   def members
     scopes = plugins.dispatch_scopes(:organization_members, self)
@@ -1006,19 +1040,11 @@ private :generate_url, :url_options
     self.save
   end
-  def disabled?
-    !visible
-  end
-
   def enable
     self.visible = true
     self.save
   end
-  def enabled?
-    visible
-  end
-
   def control_panel_settings_button
     {:title => _('Edit Profile'), :icon => 'edit-profile'}
   end
@@ -11,6 +11,12 @@ class Qualifier &lt; ActiveRecord::Base
   has_many :qualifier_certifiers, :dependent => :destroy
   has_many :certifiers, :through => :qualifier_certifiers
+  def used_certs
+    Certifier.joins('INNER JOIN product_qualifiers' +
+                    ' ON certifiers.id = product_qualifiers.certifier_id')
+             .where(product_qualifiers: {qualifier_id: self.id})
+  end
+
   has_many :product_qualifiers, :dependent => :destroy
   has_many :products, :through => :product_qualifiers, :source => :product
@@ -41,6 +41,7 @@ class SuggestArticle &lt; Task
       return type if type < Article
     end
     TinyMceArticle
+    (article[:type] || 'TinyMceArticle').constantize
   end
   def perform
-require 'short_filename'
-
 # Article type that handles uploaded files.
 #
 # Limitation: only file metadata are versioned. Only the latest version
@@ -14,8 +12,6 @@ class UploadedFile &lt; Article
   track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :parent
-  include ShortFilename
-
   def title
     if self.name.present? then self.name else self.filename end
   end
@@ -65,7 +61,7 @@ class UploadedFile &lt; Article
   #  :min_size => 2.megabytes
   #  :max_size => 5.megabytes
   has_attachment :storage => :file_system,
-    :thumbnails => { :icon => [24,24], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
+    :thumbnails => { :icon => [24,24], :bigicon => [50,50], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
     :thumbnail_class => Thumbnail,
     :max_size => self.max_size
@@ -34,6 +34,14 @@ class User &lt; ActiveRecord::Base
     alias_method_chain :human_attribute_name, :customization
   end
+  def self.build(user_data, person_data, environment)
+    user = User.new(user_data)
+    user.terms_of_use = environment.terms_of_use
+    user.environment = environment
+    user.person_data = person_data
+    user
+  end
+
   before_create do |user|
     if user.environment.nil?
       user.environment = Environment.default
@@ -120,17 +128,15 @@ class User &lt; ActiveRecord::Base
     self.update_attribute :last_login_at, Time.now
   end
-  #FIXME make this test
   def generate_private_token!
     self.private_token = SecureRandom.hex
     self.private_token_generated_at = DateTime.now
     save(:validate => false)
   end
-  #FIXME make this test
-   def private_token_expired?
-    return true if self.private_token_generated_at.nil?
-    self.generate_private_token! if self.private_token.nil? || (self.private_token_generated_at + 2.weeks < DateTime.now)
+  TOKEN_VALIDITY = 2.weeks
+  def private_token_expired?
+    self.private_token.nil? || (self.private_token_generated_at + TOKEN_VALIDITY < DateTime.now)
   end
   # Activates the user in the database.
@@ -334,6 +340,8 @@ class User &lt; ActiveRecord::Base
     {
       'login' => self.login,
+      'name' => self.person.name,
+      'email' => self.email,
       'avatar' => self.person.profile_custom_icon(gravatar_default),
       'is_admin' => self.person.is_admin?,
       'since_month' => self.person.created_at.month,
@@ -4,6 +4,10 @@ class FilePresenter::Image &lt; FilePresenter
     f.image? ? 10 : nil
   end
+  def sized_icon(size)
+    public_filename size
+  end
+
   def icon_name
     public_filename :icon
   end
@@ -3,6 +3,21 @@
 <%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>
 <% themes_options = Theme.system_themes.map {|theme| [theme.name, theme.id] }.sort %>
 <%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
+
+<%= labelled_form_field(
+  _("Article's date format"),
+  select(:environment, :date_format,
+    options_for_select([
+      [ _('mm/dd/yyyy'), 'numbers_with_year'],
+      [ _('mm/dd'), 'numbers'],
+      [ _('Month dd, yyyy'), 'month_name_with_year'],
+      [ _('Month dd'), 'month_name'],
+      [ _('X minutes/hours/days/months/years ago'), 'past_time']
+      ], environment.date_format
+    )
+  )
+) %>
+
 <%= required f.text_field(:reports_lower_bound, :size => 3) %>
 <%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
 <%= label_tag :languages, _('Available languages') %>
@@ -0,0 +1,20 @@
+<h1>EndPoints</h1>
+
+<div style="float: right">
+<%= s_('api-playground|Try the %s') % link_to('API Playground', '/api/playground') %>
+</div>
+
+<%= endpoints.map do |endpoint|
+  app = endpoint.options[:app].to_s
+  unless app.blank?
+    content_tag(:h2, app.split('::').last.to_s, title: app) +
+    (content_tag :ul do
+      endpoint.routes.map do |route|
+        content_tag :li do
+          content_tag(:strong, route.route_method) + ' ' +
+          route.route_path.gsub(':version', content_tag(:b, route.route_version))
+        end
+      end.join "\n"
+    end)
+  end
+end.join "\n" %>
@@ -0,0 +1,32 @@
+<h1>API Playground</h1>
+
+<script>
+var endpoints = <%=
+endpoints.map do |endpoint|
+  app = endpoint.options[:app].to_s
+  unless app.blank?
+    endpoint.routes.map do |route|
+      {
+        method: route.route_method,
+        path: route.route_path.gsub(':version', route.route_version).split('(').first
+      }
+    end
+  end
+end.flatten.compact.sort{|a,b| a[:path]=='/api/v1/login' ? -1:1}.to_json %>;
+</script>
+
+<form id="api-form">
+  <label id="endpoint">Endpoint:
+    <select name="endpoint" onchange="playground.selEndpoint()"></select>
+  </label>
+  <label id="api-token">Token:
+    <%= tag :input, size: 32, placeholder: _('Use the login endpoint') %>
+  </label>
+</form>
+<div id="playground-ctrl">
+  <button onclick="playground.addFormParam()"><%=_('Add parameter')%></button>
+  <button onclick="playground.run()" style="font-weight:bold">&nbsp; <%=_('Run')%> &nbsp;</button>
+</div>
+<pre id="api-response" class="empty"></pre>
+
+<script src="/javascripts/api-playground.js"></script>
@@ -67,7 +67,8 @@
 <%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [
   [ _('Full post'), 'full'],
   [ _('First paragraph'), 'short'],
-  [ _('First paragraph, with post picture'), 'short+pic']
+  [ _('First paragraph, with post picture'), 'short+pic'],
+  [ _("Title, Image, Lead"), 'compact']
 ])) %>
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Blog.posts_per_page_options)) %>
@@ -0,0 +1,29 @@
+<% @articles.each do |article| article = FilePresenter.for article %>
+  <tr title="<%= article.title%>" >
+    <td class="article-name">
+      <%= link_to_article(article) %>
+    </td>
+    <% short_description =  article.respond_to?(:short_description) ?
+          article.short_description :
+          article.class.short_description %>
+    <td class="article-mime" title=<%= short_description.to_json %>>
+      <%= short_description %>
+    </td>
+  <td class="last-update">
+    <%= time_ago_in_words article.updated_at %>
+  </td>
+    <td class="article-controls">
+      <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit, article) %>
+      <%= button_without_text :eyes, _('Public view'), article.view_url %>
+      <%= display_spread_button(article) unless remove_content_button(:spread, article) %>
+      <% if user.can_change_homepage? && !remove_content_button(:home, article) %>
+        <% if profile.home_page != article %>
+          <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+        <% else %>
+          <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+        <% end %>
+      <% end %>
+      <%= display_delete_button(article) if !remove_content_button(:delete, article) %>
+    </td>
+  </tr>
+<% end %>
@@ -37,6 +37,7 @@
   <tr>
     <th><%= _('Name') %></th>
     <th><%= _('Type') %></th>
+    <th><%= _('Last update') %></th>
     <th><%= _('Actions') %></th>
   </tr>
@@ -54,32 +55,7 @@
     </tr>
   <% end %>
-  <% @articles.each do |article| article = FilePresenter.for article %>
-    <tr title="<%= article.title%>" >
-      <td class="article-name">
-        <%= link_to_article(article) %>
-      </td>
-      <% short_description =  article.respond_to?(:short_description) ?
-            article.short_description :
-            article.class.short_description %>
-      <td class="article-mime" title=<%= short_description.to_json %>>
-        <%= short_description %>
-      </td>
-      <td class="article-controls">
-        <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit, article) %>
-        <%= button_without_text :eyes, _('Public view'), article.view_url %>
-        <%= display_spread_button(article) unless remove_content_button(:spread, article) %>
-        <% if user.can_change_homepage? && !remove_content_button(:home, article) %>
-          <% if profile.home_page != article %>
-            <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
-          <% else %>
-            <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
-          <% end %>
-        <% end %>
-        <%= display_delete_button(article) if !remove_content_button(:delete, article) %>
-      </td>
-    </tr>
-  <% end %>
+  <%= render 'view_items' %>
 </table>
@@ -0,0 +1,20 @@
+<% if @page.belongs_to_blog? || @page.belongs_to_forum?%>
+  <h1 class="title">
+    <% if no_link %>
+      <%= h(@page.title) %>
+    <% else %>
+      <%= link_to(@page.name, @page.url) %>
+    <% end %>
+  </h1>
+  <%= render :partial => "publishing_info" %>
+  <% unless @page.abstract.blank? %>
+    <div class="preview">
+      <%= @page.lead %>
+    </div>
+  <% end %>
+<% else %>
+  <h1 class="title">
+    <%= h(@page.title) %>
+  </h1>
+  <%= render :partial => "publishing_info" %>
+<% end %>
@@ -64,7 +64,7 @@
     <% end %>
     <%= link_to(image_tag('/images/icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
     <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
-    <%= article_title(@page, :no_link => true) %>
+    <%= render :partial => 'article_title', :locals => {:no_link => true} %>
     <%= article_translations(@page) %>
   </div>
 </div>
@@ -0,0 +1,21 @@
+<% if article.image %>
+  <% className = "article-compact-abstract-with-image" %>
+  <% if article.image.thumbnails_processed? %>
+    <% image_file = article.image.public_filename(:big) %>
+  <% else %>
+    <% image_file = "/images/icons-app/image-loading-thumb.png" %>
+  <% end %>
+<% else %>
+  <% className = "article-compact-abstract" %>
+<% end %>
+
+<div>
+  <% if article.image %>
+    <div class = "article-compact-image">
+      <%= image_tag(image_file) %>
+    </div>
+  <% end %>
+  <div class = <%= className %> >
+      <%= article.lead(400) %>
+  </div>
+</div>
@@ -0,0 +1,29 @@
+<span class="publishing-info">
+  <span class="date">
+    <%= show_date(@page.published_at) %>
+  </span>
+  <span class="author">
+    <%= _(", by %s") % (@page.author ? link_to(@page.author_name, @page.author_url) : @page.author_name) %>
+  </span>
+<% unless @no_comments %>
+  <span class="comments">
+    <%= (" - %s") % link_to_comments(@page)%>
+  </span>
+<% end %>
+</span>
+
+<% if @page.display_hits? || @page.license.present? %>
+  <div id='article-sub-header'>
+    <% if @page.display_hits? %>
+      <div id="article-hits">
+        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
+      </div>
+    <% end %>
+
+    <% if @page.license.present? %>
+      <div id="article-license">
+        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
@@ -8,7 +8,7 @@
   </div>
 </div>
 <hr class="pre-posts"/>
-<div class="blog-posts">
+<div class="blog-posts page-<%= @npage %>">
   <% paginate = true %>
   <%=
    posts = @posts
@@ -0,0 +1,41 @@
+<div class="event-card">
+  <div class="event-image">
+    <% if event.image %>
+      <%= image_tag(event.image.public_filename(:big)) %>
+    <% end %>
+  </div>
+  <div class="about-event">
+    <% if event.start_date.present? || event.end_date.present? %>
+      <span class="event-date">
+        <%= show_period(event.start_date, event.end_date) %>
+      </span>
+    <% end %>
+    <% if event.link.present? %>
+      <span class="event-link">
+        <%= link_to event.link, event.link %>
+      </span>
+    <% end %>
+    <% if event.address.present? %>
+      <span class="event-address">
+        <span>
+          <%= event.address %>
+        </span>
+      </span>
+    <% end %>
+  </div>
+</div>
+
+<div class="event-body">
+  <% if format == 'short' %>
+    <%= display_short_format event, :comments_link => false, :read_more_link => false %>
+  <% else %>
+    <% unless event.abstract.blank? %>
+      <div class="event-lead">
+        <%= event.article_lead %>
+      </div>
+    <% end %>
+    <div class="event-content">
+      <%= event.body %>
+    </div>
+  <% end %>
+</div>
 <% unless folder.body.blank? %>
-  <div>
+  <div class="folder-description">
     <%= folder.body %>
   </div>
-  <hr/>
 <% end %>
 <% if folder.children.empty? %>
@@ -24,22 +24,6 @@
   <%= render :partial => 'article_toolbar' %>
 </div>
-<% if @page.display_hits? || @page.license.present? %>
-  <div id='article-sub-header'>
-    <% if @page.display_hits? %>
-      <div id="article-hits">
-        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
-      </div>
-    <% end %>
-
-    <% if @page.license.present? %>
-      <div id="article-license">
-        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
-
 <% if NOOSFERO_CONF['addthis_enabled'] %>
   <%= render :partial => 'addthis' %>
 <% end %>
@@ -47,6 +31,12 @@
 <% cache(@page.cache_key(params, user, language)) do %>
   <div class="<%="article-body article-body-" + @page.css_class_name %>">
     <% options = @page.image? ? {:gallery_view => true} : {} %>
+    <% if @page.image.present? && !@page.event? %>
+      <div class="article-body-img">
+        <%= image_tag(@page.image.public_filename) %>
+        <p><%= @page.image.label%></p>
+      </div>
+    <% end %>
     <%= article_to_html(@page, options) %>
     <br style="clear:both" />
   </div> <!-- end class="article-body" -->
@@ -27,6 +27,7 @@
     <script type="text/javascript">
       DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
+      noosfero.profile = <%= (@profile.identifier if @profile).to_json %>
     </script>
   </head>
@@ -0,0 +1,8 @@
+<%= text_field_tag 'product_category_id', '', :placeholder => _('type a category for the product') %>
+
+<%= javascript_include_tag '/javascripts/product_categories.js' %>
+<%= javascript_tag do %>
+  product_categories.autocomplete.search_url = <%= url_for(:controller => :manage_products, :action => :search_categories).to_json %>
+  product_categories.autocomplete.select_url = <%= url_for(:controller => :manage_products, :action => :show_category_tree).to_json %>
+  product_categories.autocomplete.load('#product_category_id')
+<% end %>
@@ -0,0 +1,2 @@
+<%= categories_container selects_for_all_ancestors(@category), hierarchy_category_navigation(@category, :make_links => true) %>
+
@@ -16,7 +16,7 @@
     <h3><%= _('Edit category of this product:') %></h3>
-    <%= categories_container(selects_for_all_ancestors(@category), hierarchy_category_navigation(@category, :make_links => true)) %>
+    <%= render 'manage_products/selected_category_tree' %>
     <div id='categories_selection_actionbar'>
       <%= button(:back, _('Back to product'), :action => 'show', :id => @product) %>
@@ -19,7 +19,7 @@
         <span style="font-size: 12px;"><%= comment.title %></span><br/>
       <% end %>
       <span style="font-size: 10px;"><%= txt2html comment.body %></span><br/>
-      <span style="font-size: 8px; color: #929292"><%= time_ago_as_sentence(comment.created_at) %></span>
+      <span style="font-size: 8px; color: #929292"><%= time_ago_in_words(comment.created_at) %></span>
   <br style="clear: both;" />
   <% unless comment.replies.blank? %>
@@ -6,7 +6,7 @@
     <p>
     <span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>
     <span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>
-    <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+    <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span>
     </p>
     <p>
     <span style="font-size: 14px;"><%= link_to(activity.params['name'], activity.params['url'], :style => "color: #333; font-weight: bold; text-decoration: none;") %></span>
@@ -5,7 +5,7 @@
   <td>
     <p>
       <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
-      <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+      <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(activity.created_at) %></span>
     </p>
   </td>
 </tr>
@@ -12,7 +12,7 @@
           <span style="font-size: 14px">
             <%= task_information(task) %>
           </span>
-          <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_as_sentence(task.created_at) %></span>
+          <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(task.created_at) %></span>
         </div>
       </td>
     </tr>
@@ -5,7 +5,7 @@
     <td>
       <p>
         <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
-        <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+        <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span>
       </p>
   </td>
 </tr>
@@ -40,7 +40,7 @@
       <%= txt2html comment.body %>
     </div>
     <div class="profile-activity-time">
-      <%= time_ago_as_sentence(comment.created_at) %>
+      <%= time_ago_in_words(comment.created_at) %>
     </div>
   </div>
@@ -12,7 +12,7 @@
     <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0|\s)+/, ' ').gsub(/^\s+/, '') unless activity.params['lead'].blank? %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
   </div>
   <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :only_hide => true, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
@@ -3,7 +3,7 @@
 </div>
 <div class='profile-activity-description'>
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
@@ -3,7 +3,7 @@
 </div>
 <div class='profile-activity-description'>
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
   </div>
@@ -5,7 +5,7 @@
   <div class='profile-activity-description'>
     <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
     <p class='profile-activity-text'><%= txt2html scrap.content %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(scrap.created_at) %></p>
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
@@ -22,5 +22,5 @@
     <% end %>
   </ul>
   <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
-  <hr />  
+  <hr />
 </li>
@@ -5,7 +5,7 @@
   <div class='profile-activity-description'>
     <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
     <p class='profile-activity-text'><%= txt2html scrap.content %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(scrap.created_at) %></p>
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
@@ -4,7 +4,7 @@
   </div>
   <div class='profile-activity-description'>
     <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
     <div class='profile-wall-actions'>
       <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
     </div>
-  <%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
-  <%= button_to_function(:cancel,_('Cancel'),"jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :style => 'display: none')%>
+<%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
+<%= labelled_form_field(_("Image Label:"), i.text_field(:label)) %>
+<%= button_to_function(:cancel,_('Cancel'),"jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :style => 'display: none')%>
@@ -0,0 +1,11 @@
+<div id="list-item">
+  <div class="item-info">
+    <div class="item-icon" >
+      <%= display_content_icon(content) %>
+    </div>
+    <span class="item-description">
+      <%= link_to(content.name, content.url) %>
+    </span>
+    <span class="item-date"><%= _("Published at: #{show_date(content.updated_at)}") %></span>
+  </div>
+</div>
@@ -19,17 +19,27 @@
 <div class='article-lead' id="article-lead-<%=lead_id.to_s%>">
+  <% abstract_options = {:style => 'width: 100%; height: 200px;', :class => editor_type} %>
   <% if f %>
-    <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 100%; height: 200px;', :class => editor_type)) %>
+    <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, abstract_options)) %>
   <% else %>
-    <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, :style => 'width: 100%; height: 200px;', :class => editor_type)) %>
+    <% if @article.kind_of?(Article) %>
+      <%= labelled_form_field(_(abstract_label), text_area_tag("article[abstract]", @escaped_abstract, abstract_options)) %>
+    <% else %>
+      <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, abstract_options)) %>
+    <% end %>
   <% end %>
 </div>
 <div style="margin-top: 10px;">
+  <% body_options = {:style => 'width: 100%; height: 400px;', :class => editor_type} %>
   <% if f %>
-    <%= labelled_form_field(_(body_label), f.text_area(body_method, :style => 'width: 100%; height: 400px;', :class => editor_type)) %>
+    <%= labelled_form_field(_(body_label), f.text_area(body_method, body_options)) %>
   <% else %>
-    <%= labelled_form_field(_(body_label), text_area(object, body_method, :style => 'width: 100%; height: 400px;', :class => editor_type)) %>
+    <% if @article.kind_of?(Article) %>
+      <%= labelled_form_field(_(body_label), text_area_tag("article[body]", @escaped_body, body_options)) %>
+    <% else %>
+      <%= labelled_form_field(_(body_label), text_area(object, body_method, body_options)) %>
+    <% end %>
   <% end %>
 </div>
-<table class="<%= list_type %>-content">
-  <tr>
-    <th><%= _('Title') %></th>
-    <th><%= _('Last update') %></th>
-  </tr>
+<ul class="<%= list_type %>-content">
   <% contents.each do |content| %>
-    <% if content.display_to?(user) %>
-      <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>
-    <% end %>
+    <li class="<%= list_type %>-item">
+      <% if content.display_to?(user) %>
+        <%= render :partial => 'shared/content_item', :locals => { :content => content } %>
+      <% end %>
+    </li>
   <% end %>
-</table>
+</ul>
 <p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>
@@ -2,7 +2,7 @@
 <% task.abuse_reports.each do |abuse_report| %>
   <div>
     <strong style="word-wrap: break-word; display: block; padding-right: 40px">"<%= abuse_report.reason %>"</strong> <br />
-    <i><%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_as_sentence(abuse_report.created_at) }%></i> <br />
+    <i><%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_in_words(abuse_report.created_at) }%></i> <br />
     <% if !abuse_report.content.blank? %>
       <button class="display-abuse-report-details" data-report="<%=abuse_report.id%>"><%=_('View details')%></button>
       <div style='display: none' id=<%= 'abuse-report-details-'+abuse_report.id.to_s %> class="abuse-report-details">
@@ -14,6 +14,5 @@
   <%= labelled_form_field(_('Highlight this article'), a.check_box(:highlighted)) %>
   <%= a.hidden_field(:type) %>
-
   <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => a, :lead_id => task.id} %>
 <% end %>
@@ -138,7 +138,7 @@ module Noosfero
     config.middleware.use Rack::Cors do
       allow do
         origins '*'
-        resource 'api/*', :headers => :any, :methods => [:get, :post]
+        resource '/api/*', :headers => :any, :methods => [:get, :post]
       end
     end
@@ -0,0 +1,6 @@
+test: &TEST
+  adapter: postgresql
+  database: gitlab_ci_test
+  username: gitlab_ci_runner
+development:
+  <<: *TEST
@@ -0,0 +1,5 @@
+# From http://about.travis-ci.org/docs/user/database-setup/
+test:
+  adapter: postgresql
+  database: myapp_test
+  username: postgres
@@ -0,0 +1,13 @@
+# inherit from production
+require_relative 'production'
+
+Noosfero::Application.configure do
+
+  # expose errors
+  config.consider_all_requests_local = true
+
+  # ease debug
+  config.assets.compress = false
+
+end
+
 require 'noosfero/role_assignment_ext'
 require 'noosfero/action_tracker_ext'
+require 'noosfero/vote_ext'
@@ -11,6 +11,9 @@ development:
   max_upload_size: 5MB
   hours_until_user_activation_check: 72
   exclude_profile_identifier_pattern: index(\..*)?|home(\..*)?
+  api_recaptcha_site_key:      '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-'
+  api_recaptcha_private_key:   '6LdsWAcTAAAAAB6maB_HalVyCc4asDAxPxloIMvY'
+  api_recaptcha_verify_uri:    'https://www.google.com/recaptcha/api/siteverify'
 #Google Recaptcha setup
   api_captcha_enabled: true
@@ -22,6 +22,7 @@ Noosfero::Application.routes.draw do
   root :to => 'home#index', :constraints => EnvironmentDomainConstraint.new
   match 'site(/:action)', :controller => 'home'
+  match 'api(/:action)', :controller => 'api'
   match 'images(/*stuff)' => 'not_found#nothing'
   match 'stylesheets(/*stuff)' => 'not_found#nothing'
@@ -1,11 +0,0 @@
-class AddPrivateTokenInfoToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :private_token, :string
-    add_column :users, :private_token_generated_at, :datetime
-  end
-
-  def self.down
-    remove_column :users, :private_token
-    remove_column :users, :private_token_generated_at
-  end
-end
@@ -0,0 +1,15 @@
+class IndexRoleAssignmentsFilteredFields < ActiveRecord::Migration
+
+  def self.up
+    add_index :role_assignments, [:accessor_id, :accessor_type]
+    add_index :role_assignments, [:accessor_id, :accessor_type, :role_id], name: :index_on_role_assigments_accessor_role
+    add_index :role_assignments, [:resource_id, :resource_type]
+    add_index :role_assignments, [:resource_id, :resource_type, :role_id], name: :index_on_role_assigments_resource_role
+    add_index :role_assignments, [:accessor_id, :accessor_type, :resource_id, :resource_type], name: :index_on_role_assigments_accessor_resource_role
+    add_index :profiles, [:type]
+    add_index :profiles, [:visible]
+    add_index :profiles, [:enabled]
+    add_index :profiles, [:validated]
+  end
+
+end
@@ -0,0 +1,11 @@
+class AddPrivateTokenInfoToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :private_token, :string
+    add_column :users, :private_token_generated_at, :datetime
+  end
+
+  def self.down
+    remove_column :users, :private_token
+    remove_column :users, :private_token_generated_at
+  end
+end
@@ -0,0 +1,19 @@
+class FixTagsCaseDifferences < ActiveRecord::Migration
+  def up
+    tags = ActsAsTaggableOn::Tag.joins('LEFT JOIN tags as b on LOWER(tags.name) = b.name').where('b.id is null')
+    tags.find_each do |tag|
+      unless ActsAsTaggableOn::Tag.exists?(:name => tag.name.mb_chars.downcase)
+        ActsAsTaggableOn::Tag.create(:name => tag.name.mb_chars.downcase)
+      end
+    end
+
+    execute("UPDATE taggings SET tag_id = new.id FROM taggings AS t INNER JOIN tags AS old ON t.tag_id = old.id INNER JOIN tags AS new ON LOWER(old.name) = new.name WHERE old.id != new.id AND taggings.id = t.id")
+
+    execute("UPDATE tags SET taggings_count = (SELECT COUNT(*) FROM taggings WHERE taggings.tag_id = tags.id)")
+    execute("DELETE FROM tags WHERE taggings_count = 0")
+  end
+
+  def down
+    say 'This migration is irreversible.'
+  end
+end
@@ -0,0 +1,9 @@
+class AddDateFormatToEnvironment < ActiveRecord::Migration
+  def up
+    add_column :environments, :date_format, :string, :default => 'month_name_with_year'
+  end
+
+  def down
+    remove_column :environments, :date_format
+  end
+end
@@ -0,0 +1,8 @@
+class AddLabelToImage < ActiveRecord::Migration
+  def up
+    add_column :images, :label, :string, :default => ""
+  end
+  def down
+    remove_column :images, :label
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150525101430) do
+ActiveRecord::Schema.define(:version => 20150603182105) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -321,17 +321,18 @@ ActiveRecord::Schema.define(:version =&gt; 20150525101430) do
     t.text     "design_data"
     t.text     "custom_header"
     t.text     "custom_footer"
-    t.string   "theme",                        :default => "default",           :null => false
+    t.string   "theme",                        :default => "default",              :null => false
     t.text     "terms_of_use_acceptance_text"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "reports_lower_bound",          :default => 0,                   :null => false
+    t.integer  "reports_lower_bound",          :default => 0,                      :null => false
     t.string   "redirection_after_login",      :default => "keep_on_same_page"
     t.text     "signup_welcome_text"
     t.string   "languages"
     t.string   "default_language"
     t.string   "noreply_email"
     t.string   "redirection_after_signup",     :default => "keep_on_same_page"
+    t.string   "date_format",                  :default => "month_name_with_year"
   end
   create_table "external_feeds", :force => true do |t|
@@ -376,6 +377,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150525101430) do
     t.integer "width"
     t.integer "height"
     t.boolean "thumbnails_processed", :default => false
+    t.string  "label",                :default => ""
   end
   add_index "images", ["parent_id"], :name => "index_images_on_parent_id"
@@ -692,6 +694,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150525101430) do
     t.integer  "image_id"
     t.boolean  "spam",                         :default => false
     t.integer  "responsible_id"
+    t.integer  "closed_by_id"
   end
   add_index "tasks", ["requestor_id"], :name => "index_tasks_on_requestor_id"
@@ -6,7 +6,10 @@ noosfero (1.2~1) UNRELEASED; urgency=medium
   [ Joenio Costa ]
   * Build noosfero-chat package
- -- Joenio Costa <joenio@colivre.coop.br>  Mon, 18 May 2015 14:32:21 -0300
+  [ root ]
+  * Api test
+
+ -- root <root@17edebf1ae91>  Mon, 06 Jul 2015 14:39:06 +0000
 noosfero (1.1) wheezy; urgency=low
@@ -62,7 +62,8 @@ Feature: approve article
     And I press "Spread this"
     And I follow "Delete"
     And I confirm the browser dialog
-    When I am logged in as "joaosilva"
+    And I follow "Logout"
+    And I am logged in as "joaosilva"
     And I go to sample-community's control panel
     And I follow "Process requests"
     And I choose "Reject"
@@ -0,0 +1,30 @@
+Feature: article visualization
+  As a user
+  I want to change view modes
+  In order to see articles in fullscreen or not in fullscreen
+
+  Background:
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And "joaosilva" has no articles
+    And the following articles
+      | owner     | name           | body               |
+      | joaosilva | Sample Article | This is an article |
+    And I am logged in as "joaosilva"
+
+  @selenium
+  Scenario: viewing the article in fullscreen by default
+    Given I go to /joaosilva/sample-article?fullscreen=1
+    Then I should see "Exit full screen"
+
+  @selenium
+  Scenario: viewing the article not in fullscreen by default
+    Given I go to /joaosilva/sample-article
+    Then I should see "Full screen"
+
+  @selenium
+  Scenario: changing the view mode from not in fullscreen to fullscreen
+    Given I go to /joaosilva/sample-article
+    And I follow "Full screen"
+    Then I should see "Exit full screen"
@@ -41,19 +41,19 @@ Feature: balloon
   @selenium
   Scenario: I should not see trigger if not enabled on page
     Given feature "show_balloon_with_profile_links_when_clicked" is disabled on environment
-    When I go to /assets/people
+    When I go to /search/people
     Then I should not see "Profile links"
   @selenium
   Scenario: I should not see trigger by default on page
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to /assets/communities
+    When I go to /search/communities
     Then I should not see "Members"
   @selenium
   Scenario: I should see balloon when clicked on page trigger
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    And I go to /assets/communities
+    And I go to /search/communities
     And display ".community-trigger"
     When I follow "Profile links"
     Then I should see "Members"
@@ -13,20 +13,20 @@ Scenario: show all enterprises
   Given the following enterprises
     | identifier | name        |
     | shop2      | Fruits Shop |
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   Then I should see "Enterprises"
   And I should see "Shoes Shop"
   And I should see "Fruits Shop"
 Scenario: show profile links button
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   Then I should see "Profile links" within "a.enterprise-trigger"
   And I should not see "Members"
   And I should not see "Agenda"
 @selenium-fixme
 Scenario: show profile links when clicked
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   When I follow "Profile links"
   Then I should see "Products" within "ul.menu-submenu-list"
   And I should see "Members" within "ul.menu-submenu-list"
@@ -34,7 +34,7 @@ Scenario: show profile links when clicked
 @selenium-fixme
 Scenario: go to catalog when click on products link
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   When I follow "Profile links"
   And I follow "Products" and wait
   Then I should be exactly on /catalog/shop1
@@ -14,7 +14,7 @@ Feature: Change appearance
     And I should not see an element ".box-4"
     And I go to joaosilva's control panel
     And I follow "Edit Appearance"
-    And I follow "Left Top and Right"
+    And I follow "Top and Side Bars"
     And I go to joaosilva's control panel
     And I follow "Edit sideboxes"
     And I should see an element ".box-4"
@@ -17,7 +17,7 @@ Feature: events
     Then I should see "November 2009" within ".current-month"
   Scenario: go to next month in global agenda
-    Given I am on /assets/events?year=2009&month=11
+    Given I am on /search/events?year=2009&month=11
     When I follow "December"
     Then I should see "December 2009" within ".current-month"
@@ -27,7 +27,7 @@ Feature: events
     Then I should see "September 2009" within ".current-month"
   Scenario: go to previous month in global agenda
-    Given I am on /assets/events?year=2009&month=11
+    Given I am on /search/events?year=2009&month=11
     When I follow "October"
     Then I should see "October 2009" within ".current-month"
@@ -43,7 +43,7 @@ Feature: events
   Scenario: go to specific day in global agenda
     Given I am on the homepage
-    When I am on /assets/events?year=2009&month=11&day=12
+    When I am on /search/events?year=2009&month=11&day=12
     Then I should see "Events for November, 2009"
   Scenario: list events for specific day
@@ -88,7 +88,7 @@ Feature: events
     And the following events
       | owner      | name            | start_date |
       | josemanuel | Manuel Birthday | 2009-10-24 |
-    When I am on /assets/events?year=2009&month=10&day=24
+    When I am on /search/events?year=2009&month=10&day=24
     Then I should see "Another Conference"
     And I should see "Manuel Birthday"
@@ -157,9 +157,10 @@ Feature: events
     Then I should not see "New events" link
   Scenario: display environment name in global agenda
-    When I am on /assets/events
+    When I am on /search/events
     Then I should see "Colivre.net's Events"
+
   @selenium
   Scenario: published events should be listed in the agenda too
     Given the following community
@@ -21,9 +21,7 @@ Feature: domain for profile
   Scenario: access profile control panel through profile blocks
     Given I am logged in as "joaosilva"
     When I go to joaosilva's homepage
-    And I follow "Control panel" within ".profile-info-block"
-    Then I should see "Joao Silva" within "span.control-panel-title"
-    When I follow "Control panel" within ".profile-image-block"
+    And I follow "Control panel" within ".profile-image-block"
     Then I should see "Joao Silva" within "span.control-panel-title"
   @selenium
@@ -36,7 +36,7 @@ Feature: search inside a profile
       | joaosilva | ProfileSearchBlock  |
     When I go to joaosilva's profile
     And I fill in "q" with "bees" within ".profile-search-block"
-    And I press "Search"
+    And I press "Search" within ".profile-search-block"
     Then I should see "bees and butterflies" within ".main-block"
   Scenario: not display unpublished articles
@@ -203,5 +203,5 @@ Feature: register enterprise
   Scenario: a user cant see button to register new enterprise if enterprise_registration disabled
     Given feature "enterprise_registration" is disabled on environment
-    When I am on /assets/enterprises
+    When I am on /search/enterprises
     Then I should not see "New enterprise" link
@@ -56,7 +56,7 @@ Feature: search enterprises
       | owner | name | body | homepage |
       | shop1 | Shoes home | This is the <i>homepage</i> of Shoes shop! It has a very long and pretty vague description, just so we can test wether the system will correctly create an excerpt of this text. We should probably talk about shoes. | true |
     When I search enterprises for "shoes"
-    And I choose the search filter "Full"
+    And I select "Full" from "display"
     Then I should see "This is the homepage of" within ".search-enterprise-description"
     And I should see "about sho..." within ".search-enterprise-description"
@@ -66,7 +66,7 @@ Feature: search enterprises
       | identifier | name | description |
       | shop4 | Clothes shop | This <b>clothes</b> shop also sells shoes! This too has a very long and pretty vague description, just so we can test wether the system will correctly create an excerpt of this text. Clothes are a really important part of our lives. |
     When I search enterprises for "clothes"
-    And I choose the search filter "Full"
+    And I select "Full" from "display"
     And I should see "This clothes shop" within ".search-enterprise-description"
     And I should see "really import..." within ".search-enterprise-description"
@@ -94,7 +94,7 @@ Given /^the following blocks$/ do |table|
       owner.boxes<< Box.new
       owner.boxes.first.blocks << MainBlock.new
     end
-    box = owner.boxes.where(:position => 3).first
+    box = owner.boxes.first
     klass.constantize.create!(item.merge(:box => box))
   end
 end
@@ -14,9 +14,12 @@ Feature: suggest article
   @selenium
   Scenario: highlight an article before approval of a suggested article
-    Given someone suggested the following article to be published
-      | target           | article_name        | article_body                    | name | email            |
-      | sample-community | A suggested article | this is an article about whales | jose | jose@example.org |
+    Given I am on Sample Community's blog
+    And I follow "Suggest an article"
+    And I fill in "Title" with "Suggestion"
+    And I fill in "Your name" with "Some Guy"
+    And I fill in "Email" with "someguy@somewhere.com"
+    And I press "Save"
     When I am logged in as "joaosilva"
     And I go to sample-community's control panel
     And I follow "Process requests"
 require 'grape'
 #require 'rack/contrib'
-Dir["#{Rails.root}/lib/noosfero/api/*.rb"].each {|file| require_dependency file unless file =~ /api\.rb/}
+Dir["#{Rails.root}/lib/noosfero/api/*.rb"].each {|file| require file unless file =~ /api\.rb/}
 module Noosfero
   module API
@@ -12,36 +12,29 @@ module Noosfero
       use GrapeLogging::Middleware::RequestLogger, { logger: logger }
       rescue_from :all do |e|
-        # Many brave warriors have fallen in the battle for fixing the API log
-        # Please, don't remove these 2 lines until the API log problem has
-        # been PROPERLY fixed by our savior!!!
-        # Otherwise we will have no clue of what went wrong in the API
-          puts "API error during processing: #{$!}"
-          puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
-        # Thanks!  
         logger.error e
       end
       @@NOOSFERO_CONF = nil
-      
       def self.NOOSFERO_CONF
-        if @@NOOSFERO_CONF 
+        if @@NOOSFERO_CONF
           @@NOOSFERO_CONF
         else
           file = Rails.root.join('config', 'noosfero.yml')
           @@NOOSFERO_CONF = File.exists?(file) ? YAML.load_file(file)[Rails.env] || {} : {}
-        end    
+        end
       end
       before { setup_multitenancy }
       before { detect_stuff_by_domain }
+      before { filter_disabled_plugins_endpoints }
       after { set_session_cookie }
       version 'v1'
       prefix "api"
       format :json
       content_type :txt, "text/plain"
-      
+
       helpers APIHelpers
       mount V1::Articles
@@ -54,6 +47,7 @@ module Noosfero
       mount V1::Tasks
       mount V1::Tags
       mount V1::Environments
+
       mount Session
       # hook point which allow plugins to add Grape::API extensions to API::API
@@ -66,6 +60,26 @@ module Noosfero
           end
         end
       end
+
+      def self.endpoint_unavailable?(endpoint, environment)
+        api_class = endpoint.options[:app] || endpoint.options[:for]
+        if api_class.present?
+          klass = api_class.name.deconstantize.constantize
+          return klass < Noosfero::Plugin && !environment.plugin_enabled?(klass)
+        end
+      end
+
+      class << self
+        def endpoints_with_plugins(environment = nil)
+          if environment.present?
+            cloned_endpoints = endpoints_without_plugins.dup
+            cloned_endpoints.delete_if { |endpoint| endpoint_unavailable?(endpoint, environment) }
+          else
+            endpoints_without_plugins
+          end
+        end
+        alias_method_chain :endpoints, :plugins
+      end
     end
   end
-end
 \ No newline at end of file
+end
 module Noosfero
   module API
     module Entities
-  
+
       Entity.format_with :timestamp do |date|
         date.strftime('%Y/%m/%d %H:%M:%S') if date
       end
-  
+
       class Image < Entity
         root 'images', 'image'
         expose  :url do |image, options|
           image.public_filename
         end
-  
+
         expose  :icon_url do |image, options|
           image.public_filename(:icon)
         end
-  
+
         expose  :minor_url do |image, options|
           image.public_filename(:minor)
         end
-  
+
         expose  :portrait_url do |image, options|
           image.public_filename(:portrait)
         end
-  
+
         expose  :thumb_url do |image, options|
           image.public_filename(:thumb)
         end
       end
-  
+
       class Profile < Entity
         expose :identifier, :name, :id
         expose :created_at, :format_with => :timestamp
         expose :image, :using => Image
       end
-  
+
+      class UserBasic < Entity
+        expose :id
+        expose :login
+      end
+
       class Person < Profile
         root 'people', 'person'
+        expose :user, :using => UserBasic
       end
+
       class Enterprise < Profile
         root 'enterprises', 'enterprise'
       end
+      
       class Community < Profile
         root 'communities', 'community'
         expose :description
       end
-  
-      class Category < Entity
+
+      class CategoryBase < Entity
+        root 'categories', 'category'
+        expose :name, :id
+      end
+
+      class Category < CategoryBase
         root 'categories', 'category'
-        expose :name, :id, :slug
+        expose :slug
+        expose :full_name do |category, options|
+          category.full_name
+        end
+        expose :parent, :using => CategoryBase, if: { parent: true }
+        expose :children, :using => CategoryBase, if: { children: true }
         expose :image, :using => Image
       end
-  
+
       class ArticleBase < Entity
         root 'articles', 'article'
         expose :id
@@ -87,8 +105,8 @@ module Noosfero
         expose :created_at, :format_with => :timestamp
         expose :author, :using => Profile
       end
-  
-  
+
+
       class User < Entity
         root 'users', 'user'
         expose :id
@@ -98,13 +116,13 @@ module Noosfero
           output = {}
           user.person.role_assignments.map do |role_assigment|
             if role_assigment.resource.respond_to?(:identifier)
-              output[role_assigment.resource.identifier] = role_assigment.role.permissions 
+              output[role_assigment.resource.identifier] = role_assigment.role.permissions
             end
           end
           output
         end
       end
-  
+
       class UserLogin < User
         expose :private_token
       end
@@ -119,6 +137,12 @@ module Noosfero
         expose :name
       end
+      class Tag < Entity
+        root 'tags', 'tag'
+        expose :name
+      end
+
+
     end
   end
 end
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+before_script:
	2	+ - mkdir -p tmp/pids log
	3	+ - script/noosfero-plugins disableall
	4	+ - bundle check \|\| bundle install
	5	+# database
	6	+ - cp config/database.yml.gitlab-ci config/database.yml
	7	+ - createdb gitlab_ci_test \|\| true
	8	+ - bundle exec rake db:schema:load
	9	+ - bundle exec rake db:migrate
	10	+
	11	+units:
	12	+ script: 'bundle exec rake test:units'
	13	+functionals:
	14	+ script: 'bundle exec rake test:functionals'
	15	+integration:
	16	+ script: 'bundle exec rake test:integration'
	17	+cucumber:
	18	+ script: 'bundle exec rake cucumber'
	19	+selenium:
	20	+ script: 'bundle exec rake selenium'
	21	+plugins:
	22	+ script: 'bundle exec rake test:noosfero_plugins'
	23	+
@@ -0,0 +1,35 @@		@@ -0,0 +1,35 @@
	1	+language: ruby
	2	+rvm:
	3	+# for 2.2 support we need to upgrade the pg gem
	4	+ - 2.1.6
	5	+
	6	+before_install:
	7	+# dependencies
	8	+ - sudo apt-get update
	9	+ - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data openjdk-6-jre curl wget
	10	+ - sudo apt-get -y install libmagickwand-dev libpq-dev libreadline-dev libsqlite3-dev libxslt1-dev
	11	+# selenium support
	12	+ - export DISPLAY=:99.0
	13	+ - sh -e /etc/init.d/xvfb start
	14	+
	15	+before_script:
	16	+ - mkdir -p tmp/pids log
	17	+ - script/noosfero-plugins disableall
	18	+ - bundle check \|\| bundle install
	19	+# database
	20	+ - cp config/database.yml.travis config/database.yml
	21	+ - psql -c 'create database myapp_test;' -U postgres
	22	+ - bundle exec rake db:schema:load
	23	+ - bundle exec rake db:migrate
	24	+
	25	+env:
	26	+ - TASK=test:units
	27	+ - TASK=test:functionals
	28	+ - TASK=test:integration
	29	+ - TASK=cucumber
	30	+ - TASK=selenium
	31	+ - TASK=test:noosfero_plugins
	32	+
	33	+script:
	34	+ - bundle exec rake $TASK
	35	+
@@ -0,0 +1,277 @@		@@ -0,0 +1,277 @@
	1	+GEM
	2	+ remote: https://rubygems.org/
	3	+ specs:
	4	+ RedCloth (4.2.9)
	5	+ actionmailer (3.2.22)
	6	+ actionpack (= 3.2.22)
	7	+ mail (~> 2.5.4)
	8	+ actionpack (3.2.22)
	9	+ activemodel (= 3.2.22)
	10	+ activesupport (= 3.2.22)
	11	+ builder (~> 3.0.0)
	12	+ erubis (~> 2.7.0)
	13	+ journey (~> 1.0.4)
	14	+ rack (~> 1.4.5)
	15	+ rack-cache (~> 1.2)
	16	+ rack-test (~> 0.6.1)
	17	+ sprockets (~> 2.2.1)
	18	+ activemodel (3.2.22)
	19	+ activesupport (= 3.2.22)
	20	+ builder (~> 3.0.0)
	21	+ activerecord (3.2.22)
	22	+ activemodel (= 3.2.22)
	23	+ activesupport (= 3.2.22)
	24	+ arel (~> 3.0.2)
	25	+ tzinfo (~> 0.3.29)
	26	+ activeresource (3.2.22)
	27	+ activemodel (= 3.2.22)
	28	+ activesupport (= 3.2.22)
	29	+ activesupport (3.2.22)
	30	+ i18n (~> 0.6, >= 0.6.4)
	31	+ multi_json (~> 1.0)
	32	+ acts-as-taggable-on (3.4.4)
	33	+ activerecord (>= 3.2, < 5)
	34	+ api-pagination (4.1.1)
	35	+ arel (3.0.3)
	36	+ axiom-types (0.1.1)
	37	+ descendants_tracker (~> 0.0.4)
	38	+ ice_nine (~> 0.11.0)
	39	+ thread_safe (~> 0.3, >= 0.3.1)
	40	+ builder (3.0.4)
	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.5.6)
	48	+ ffi (~> 1.0, >= 1.0.11)
	49	+ chronic (0.10.2)
	50	+ coercible (1.0.0)
	51	+ descendants_tracker (~> 0.0.1)
	52	+ columnize (0.9.0)
	53	+ cucumber (1.0.6)
	54	+ builder (>= 2.1.2)
	55	+ diff-lcs (>= 1.1.2)
	56	+ gherkin (~> 2.4.18)
	57	+ json (>= 1.4.6)
	58	+ term-ansicolor (>= 1.0.6)
	59	+ cucumber-rails (1.0.6)
	60	+ capybara (>= 1.1.1)
	61	+ cucumber (>= 1.0.6)
	62	+ nokogiri (>= 1.5.0)
	63	+ daemons (1.1.9)
	64	+ dalli (2.7.4)
	65	+ database_cleaner (1.2.0)
	66	+ debugger (1.6.8)
	67	+ columnize (>= 0.3.1)
	68	+ debugger-linecache (~> 1.2.0)
	69	+ debugger-ruby_core_source (~> 1.3.5)
	70	+ debugger-linecache (1.2.0)
	71	+ debugger-ruby_core_source (1.3.8)
	72	+ descendants_tracker (0.0.4)
	73	+ thread_safe (~> 0.3, >= 0.3.1)
	74	+ diff-lcs (1.2.5)
	75	+ eita-jrails (0.9.5)
	76	+ actionpack (~> 3.2, >= 3.1.0)
	77	+ activesupport (~> 3.2, >= 3.0.0)
	78	+ equalizer (0.0.11)
	79	+ erubis (2.7.0)
	80	+ eventmachine (1.0.7)
	81	+ exception_notification (4.0.1)
	82	+ actionmailer (>= 3.0.4)
	83	+ activesupport (>= 3.0.4)
	84	+ execjs (2.5.2)
	85	+ fast_gettext (0.6.12)
	86	+ ffi (1.9.10)
	87	+ gettext (2.2.1)
	88	+ locale
	89	+ gherkin (2.4.21)
	90	+ json (>= 1.4.6)
	91	+ git-version-bump (0.15.1)
	92	+ grape (0.11.0)
	93	+ activesupport
	94	+ builder
	95	+ hashie (>= 2.1.0)
	96	+ multi_json (>= 1.3.2)
	97	+ multi_xml (>= 0.5.2)
	98	+ rack (>= 1.3.0)
	99	+ rack-accept
	100	+ rack-mount
	101	+ virtus (>= 1.0.0)
	102	+ grape-entity (0.4.5)
	103	+ activesupport
	104	+ multi_json (>= 1.3.2)
	105	+ grape-swagger (0.10.1)
	106	+ grape (>= 0.8.0)
	107	+ grape-entity
	108	+ grape_logging (1.1.2)
	109	+ grape
	110	+ hashie (3.4.2)
	111	+ hike (1.2.3)
	112	+ i18n (0.7.0)
	113	+ ice_nine (0.11.1)
	114	+ journey (1.0.4)
	115	+ json (1.8.3)
	116	+ locale (2.0.9)
	117	+ magic (0.2.9)
	118	+ ffi (>= 0.6.3)
	119	+ mail (2.5.4)
	120	+ mime-types (~> 1.16)
	121	+ treetop (~> 1.4.8)
	122	+ metaclass (0.0.4)
	123	+ mime-types (1.25.1)
	124	+ mini_portile (0.6.2)
	125	+ minitest (3.2.0)
	126	+ mocha (1.1.0)
	127	+ metaclass (~> 0.0.1)
	128	+ multi_json (1.11.2)
	129	+ multi_xml (0.5.5)
	130	+ nokogiri (1.6.6.2)
	131	+ mini_portile (~> 0.6.0)
	132	+ pg (0.13.2)
	133	+ polyglot (0.3.5)
	134	+ rack (1.4.7)
	135	+ rack-accept (0.4.5)
	136	+ rack (>= 0.4)
	137	+ rack-cache (1.2)
	138	+ rack (>= 0.4)
	139	+ rack-contrib (1.3.0)
	140	+ git-version-bump (~> 0.15)
	141	+ rack (~> 1.4)
	142	+ rack-cors (0.4.0)
	143	+ rack-mount (0.8.3)
	144	+ rack (>= 1.0.0)
	145	+ rack-ssl (1.3.4)
	146	+ rack
	147	+ rack-test (0.6.3)
	148	+ rack (>= 1.0)
	149	+ rails (3.2.22)
	150	+ actionmailer (= 3.2.22)
	151	+ actionpack (= 3.2.22)
	152	+ activerecord (= 3.2.22)
	153	+ activeresource (= 3.2.22)
	154	+ activesupport (= 3.2.22)
	155	+ bundler (~> 1.0)
	156	+ railties (= 3.2.22)
	157	+ rails_autolink (1.1.6)
	158	+ rails (> 3.1)
	159	+ railties (3.2.22)
	160	+ actionpack (= 3.2.22)
	161	+ activesupport (= 3.2.22)
	162	+ rack-ssl (~> 1.3.2)
	163	+ rake (>= 0.8.7)
	164	+ rdoc (~> 3.4)
	165	+ thor (>= 0.14.6, < 2.0)
	166	+ rake (10.4.2)
	167	+ rdoc (3.12.2)
	168	+ json (~> 1.4)
	169	+ rest-client (1.6.9)
	170	+ mime-types (~> 1.16)
	171	+ rmagick (2.13.4)
	172	+ rspec (2.14.1)
	173	+ rspec-core (~> 2.14.0)
	174	+ rspec-expectations (~> 2.14.0)
	175	+ rspec-mocks (~> 2.14.0)
	176	+ rspec-core (2.14.8)
	177	+ rspec-expectations (2.14.5)
	178	+ diff-lcs (>= 1.1.3, < 2.0)
	179	+ rspec-mocks (2.14.6)
	180	+ rspec-rails (2.14.2)
	181	+ actionpack (>= 3.0)
	182	+ activemodel (>= 3.0)
	183	+ activesupport (>= 3.0)
	184	+ railties (>= 3.0)
	185	+ rspec-core (~> 2.14.0)
	186	+ rspec-expectations (~> 2.14.0)
	187	+ rspec-mocks (~> 2.14.0)
	188	+ ruby-feedparser (0.9.3)
	189	+ magic
	190	+ rubyzip (1.1.7)
	191	+ sass (3.4.15)
	192	+ sass-rails (3.2.6)
	193	+ railties (~> 3.2.0)
	194	+ sass (>= 3.1.10)
	195	+ tilt (~> 1.3)
	196	+ selenium-webdriver (2.39.0)
	197	+ childprocess (>= 0.2.5)
	198	+ multi_json (~> 1.0)
	199	+ rubyzip (~> 1.0)
	200	+ websocket (~> 1.0.4)
	201	+ sprockets (2.2.3)
	202	+ hike (~> 1.2)
	203	+ multi_json (~> 1.0)
	204	+ rack (~> 1.0)
	205	+ tilt (~> 1.1, != 1.3.0)
	206	+ term-ansicolor (1.3.2)
	207	+ tins (~> 1.0)
	208	+ thin (1.3.1)
	209	+ daemons (>= 1.0.9)
	210	+ eventmachine (>= 0.12.6)
	211	+ rack (>= 1.0.0)
	212	+ thor (0.19.1)
	213	+ thread_safe (0.3.5)
	214	+ tilt (1.4.1)
	215	+ tins (1.5.4)
	216	+ treetop (1.4.15)
	217	+ polyglot
	218	+ polyglot (>= 0.3.1)
	219	+ tzinfo (0.3.44)
	220	+ uglifier (2.7.1)
	221	+ execjs (>= 0.3.0)
	222	+ json (>= 1.8.0)
	223	+ virtus (1.0.5)
	224	+ axiom-types (~> 0.1)
	225	+ coercible (~> 1.0)
	226	+ descendants_tracker (~> 0.0, >= 0.0.3)
	227	+ equalizer (~> 0.0, >= 0.0.9)
	228	+ websocket (1.0.7)
	229	+ whenever (0.9.4)
	230	+ chronic (>= 0.6.3)
	231	+ will_paginate (3.0.7)
	232	+ xpath (2.0.0)
	233	+ nokogiri (~> 1.3)
	234	+
	235	+PLATFORMS
	236	+ ruby
	237	+
	238	+DEPENDENCIES
	239	+ RedCloth (~> 4.2.9)
	240	+ acts-as-taggable-on (~> 3.4.2)
	241	+ api-pagination (~> 4.1.1)
	242	+ capybara (~> 2.1.0)
	243	+ cucumber (~> 1.0.6)
	244	+ cucumber-rails (~> 1.0.6)
	245	+ daemons (~> 1.1.5)
	246	+ dalli (~> 2.7.0)
	247	+ database_cleaner (~> 1.2.0)
	248	+ debugger
	249	+ eita-jrails (= 0.9.5)
	250	+ exception_notification (~> 4.0.1)
	251	+ fast_gettext (~> 0.6.8)
	252	+ gettext (~> 2.2.1)
	253	+ grape (~> 0.11.0)
	254	+ grape-entity
	255	+ grape-swagger
	256	+ grape_logging
	257	+ locale (~> 2.0.5)
	258	+ minitest (~> 3.2.0)
	259	+ mocha (~> 1.1.0)
	260	+ nokogiri (~> 1.6.0)
	261	+ pg (~> 0.13.2)
	262	+ rack-contrib
	263	+ rack-cors
	264	+ rails (~> 3.2.22)
	265	+ rails_autolink (~> 1.1.5)
	266	+ rake
	267	+ rest-client (~> 1.6.7)
	268	+ rmagick (~> 2.13.1)
	269	+ rspec (~> 2.14.0)
	270	+ rspec-rails (~> 2.14.1)
	271	+ ruby-feedparser (~> 0.7)
	272	+ sass-rails
	273	+ selenium-webdriver (~> 2.39.0)
	274	+ thin (~> 1.3.1)
	275	+ uglifier (>= 1.0.3)
	276	+ whenever
	277	+ will_paginate (~> 3.0.3)
	@@ -35,7 +35,7 @@ class ManageProductsController < ApplicationController		@@ -35,7 +35,7 @@ class ManageProductsController < ApplicationController
35	end	35	end
36		36
37	def categories_for_selection	37	def categories_for_selection
38	- @category = Category.find(params[:category_id]) if params[:category_id]	38	+ @category = environment.categories.find_by_id params[:category_id]
39	@object_name = params[:object_name]	39	@object_name = params[:object_name]
40	if @category	40	if @category
41	@categories = @category.children	41	@categories = @category.children
	@@ -95,6 +95,20 @@ class ManageProductsController < ApplicationController		@@ -95,6 +95,20 @@ class ManageProductsController < ApplicationController
95	end	95	end
96	end	96	end
97		97
		98	+ def show_category_tree
		99	+ @category = environment.categories.find params[:category_id]
		100	+ render :partial => 'selected_category_tree'
		101	+ end
		102	+
		103	+ def search_categories
		104	+ @term = params[:term].downcase
		105	+ conditions = ['LOWER(name) LIKE ? OR LOWER(name) LIKE ?', "#{@term}%", "% #{@term}%"]
		106	+ @categories = ProductCategory.all :conditions => conditions, :limit => 10
		107	+ render :json => (@categories.map do \|category\|
		108	+ {:label => category.name, :value => category.id}
		109	+ end)
		110	+ end
		111	+
98	def add_input	112	def add_input
99	@product = @profile.products.find(params[:id])	113	@product = @profile.products.find(params[:id])
100	@input = @product.inputs.build	114	@input = @product.inputs.build
	@@ -16,6 +16,7 @@ class MapsController < MyProfileController		@@ -16,6 +16,7 @@ class MapsController < MyProfileController
16		16
17	Profile.transaction do	17	Profile.transaction do
18	if profile.update_attributes!(params[:profile_data])	18	if profile.update_attributes!(params[:profile_data])
		19	+ BlockSweeper.expire_blocks profile.blocks.select{ \|b\| b.class == LocationBlock }
19	session[:notice] = _('Address was updated successfully!')	20	session[:notice] = _('Address was updated successfully!')
20	redirect_to :action => 'edit_location'	21	redirect_to :action => 'edit_location'
21	end	22	end
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+class ApiController < PublicController
	2	+
	3	+ no_design_blocks
	4	+
	5	+ helper_method :endpoints
	6	+
	7	+ def index
	8	+ end
	9	+
	10	+ def playground
	11	+ end
	12	+
	13	+ private
	14	+
	15	+ def endpoints
	16	+ Noosfero::API::API.endpoints(environment)
	17	+ end
	18	+
	19	+end
	@@ -1195,7 +1195,7 @@ module ApplicationHelper		@@ -1195,7 +1195,7 @@ module ApplicationHelper
1195	pending_tasks_count = link_to("<i class=\"icon-menu-tasks\"></i><span class=\"task-count\">#{count}</span>", user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))	1195	pending_tasks_count = link_to("<i class=\"icon-menu-tasks\"></i><span class=\"task-count\">#{count}</span>", user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
1196	end	1196	end
1197		1197
1198	- (_("<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'))) +	1198	+ (_("<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.url, :id => "homepage-link", :title => _('Go to your homepage'))) +
1199	render_environment_features(:usermenu) +	1199	render_environment_features(:usermenu) +
1200	admin_link +	1200	admin_link +
1201	manage_enterprises +	1201	manage_enterprises +
	@@ -1226,35 +1226,6 @@ module ApplicationHelper		@@ -1226,35 +1226,6 @@ module ApplicationHelper
1226	list.sort.inject(Hash.new(0)){\|h,i\| h[i] += 1; h }.collect{ \|x, n\| [n, connector, x].join(" ") }.sort	1226	list.sort.inject(Hash.new(0)){\|h,i\| h[i] += 1; h }.collect{ \|x, n\| [n, connector, x].join(" ") }.sort
1227	end	1227	end
1228		1228
1229	- #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+
1230	- def time_ago_as_sentence(from_time, include_seconds = false)
1231	- to_time = Time.now
1232	- from_time = Time.parse(from_time.to_s)
1233	- from_time = from_time.to_time if from_time.respond_to?(:to_time)
1234	- to_time = to_time.to_time if to_time.respond_to?(:to_time)
1235	- distance_in_minutes = (((to_time - from_time).abs)/60).round
1236	- distance_in_seconds = ((to_time - from_time).abs).round
1237	- case distance_in_minutes
1238	- when 0..1
1239	- return (distance_in_minutes == 0) ? _('less than a minute') : _('1 minute') unless include_seconds
1240	- case distance_in_seconds
1241	- when 0..4 then _('less than 5 seconds')
1242	- when 5..9 then _('less than 10 seconds')
1243	- when 10..19 then _('less than 20 seconds')
1244	- when 20..39 then _('half a minute')
1245	- when 40..59 then _('less than a minute')
1246	- else _('1 minute')
1247	- end
1248	-
1249	- when 2..44 then _('%{distance} minutes ago') % { :distance => distance_in_minutes }
1250	- when 45..89 then _('about 1 hour ago')
1251	- when 90..1439 then _('about %{distance} hours ago') % { :distance => (distance_in_minutes.to_f / 60.0).round }
1252	- when 1440..2879 then _('1 day ago')
1253	- when 2880..10079 then _('%{distance} days ago') % { :distance => (distance_in_minutes / 1440).round }
1254	- else show_time(from_time)
1255	- end
1256	- end
1257	-
1258	def comment_balloon(options = {}, &block)	1229	def comment_balloon(options = {}, &block)
1259	wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')	1230	wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')
1260	(1..8).to_a.reverse.each { \|i\| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }	1231	(1..8).to_a.reverse.each { \|i\| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }
	@@ -1273,7 +1244,7 @@ module ApplicationHelper		@@ -1273,7 +1244,7 @@ module ApplicationHelper
1273		1244
1274	def task_information(task)	1245	def task_information(task)
1275	values = {}	1246	values = {}
1276	- values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor	1247	+ values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
1277	values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject	1248	values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
1278	values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject	1249	values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
1279	values.merge!(task.information[:variables]) if task.information[:variables]	1250	values.merge!(task.information[:variables]) if task.information[:variables]
1	module EventsHelper	1	module EventsHelper
2		2
		3	+ include DatesHelper
3	def list_events(date, events)	4	def list_events(date, events)
4	title = _('Events for %s') % show_date_month(date)	5	title = _('Events for %s') % show_date_month(date)
5	content_tag('h2', title) +	6	content_tag('h2', title) +
	@@ -20,16 +20,7 @@ class Comment < ActiveRecord::Base		@@ -20,16 +20,7 @@ class Comment < ActiveRecord::Base
20		20
21	scope :without_reply, :conditions => ['reply_of_id IS NULL']	21	scope :without_reply, :conditions => ['reply_of_id IS NULL']
22		22
23	- #FIXME make this test
24	- scope :newer_than, lambda { \|reference_id\|
25	- {:conditions => ["comments.id > #{reference_id}"]}
26	- }
27	-
28	- #FIXME make this test
29	- scope :older_than, lambda { \|reference_id\|
30	- {:conditions => ["comments.id < #{reference_id}"]}
31	- }
32	-	23	+ include TimeScopes
33		24
34	# unauthenticated authors:	25	# unauthenticated authors:
35	validates_presence_of :name, :if => (lambda { \|record\| !record.email.blank? })	26	validates_presence_of :name, :if => (lambda { \|record\| !record.email.blank? })
	@@ -3,7 +3,17 @@		@@ -3,7 +3,17 @@
3	# domains.	3	# domains.
4	class Environment < ActiveRecord::Base	4	class Environment < ActiveRecord::Base
5		5
6	- 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, :highlighted_news_amount, :portal_news_amount	6	+ attr_accessible :name, :is_default, :signup_welcome_text_subject,
		7	+ :signup_welcome_text_body, :terms_of_use,
		8	+ :message_for_disabled_enterprise, :news_amount_by_folder,
		9	+ :default_language, :languages, :description,
		10	+ :organization_approval_method, :enabled_plugins,
		11	+ :enabled_features, :redirection_after_login,
		12	+ :redirection_after_signup, :contact_email, :theme,
		13	+ :reports_lower_bound, :noreply_email,
		14	+ :signup_welcome_screen_body, :members_whitelist_enabled,
		15	+ :members_whitelist, :highlighted_news_amount,
		16	+ :portal_news_amount, :date_format
7		17
8	has_many :users	18	has_many :users
9		19
	@@ -14,6 +24,12 @@ class Environment < ActiveRecord::Base		@@ -14,6 +24,12 @@ class Environment < ActiveRecord::Base
14		24
15	IDENTIFY_SCRIPTS = /(php[0-9s]?\|[sp]htm[l]?\|pl\|py\|cgi\|rb)/	25	IDENTIFY_SCRIPTS = /(php[0-9s]?\|[sp]htm[l]?\|pl\|py\|cgi\|rb)/
16		26
		27	+ validates_inclusion_of :date_format,
		28	+ :in => [ 'numbers_with_year', 'numbers',
		29	+ 'month_name_with_year', 'month_name',
		30	+ 'past_time'],
		31	+ :if => :date_format
		32	+
17	def self.verify_filename(filename)	33	def self.verify_filename(filename)
18	filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS	34	filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
19	filename	35	filename