Merge branch 'master' of https://gitlab.com/noosfero/noosfero into responsive

Braulio Bhavamitra
2 parents 8e515c3e 55c00636
Showing 163 changed files with 2555 additions and 5808 deletions Show diff stats
.gitlab-ci.yml
.travis.yml
AUTHORS.md
Gemfile
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/helpers/application_helper.rb
app/helpers/comment_helper.rb
app/helpers/content_viewer_helper.rb
app/models/article.rb
app/models/event.rb
app/models/highlights_block.rb
app/models/image.rb
app/models/organization.rb
app/models/user.rb
app/views/content_viewer/_article_title.html.erb
app/views/content_viewer/_article_toolbar.html.erb
app/views/content_viewer/_display_compact_format.html.erb
app/views/content_viewer/_publishing_info.html.erb
app/views/content_viewer/event_page.html.erb
@@ -0,0 +1,26 @@
+before_script:
+  - mkdir -p tmp/pids log
+  - bundle check || bundle install
+# workaround for plugins with Gemfile
+  - perl -pi -e 's/--local //' script/noosfero-plugins
+  - script/noosfero-plugins disableall
+  - bundle exec rake makemo &>/dev/null
+# database
+  - cp config/database.yml.gitlab-ci config/database.yml
+  - createdb gitlab_ci_test || true
+  - bundle exec rake db:schema:load &>/dev/null
+  - bundle exec rake db:migrate &>/dev/null
+
+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,53 @@
+language: ruby
+rvm:
+# for 2.2 support we need to upgrade the pg gem
+  - 2.1.6
+
+sudo: false
+addons:
+  apt:
+    packages:
+      - po4a
+      - iso-codes
+      - tango-icon-theme
+      - pidgin-data
+      # for gem extensions
+      - libmagickwand-dev
+      - libpq-dev
+      - libreadline-dev
+      - libsqlite3-dev
+      - libxslt1-dev
+
+before_install:
+  - gem env
+
+# workaround for https://github.com/travis-ci/travis-ci/issues/4536
+before_install:
+  - export GEM_HOME=$PWD/vendor/bundle/ruby/2.1.0
+  - gem install bundler
+cache: bundler
+
+before_script:
+  - mkdir -p tmp/pids log
+# workaround for plugins with Gemfile
+  - perl -pi -e 's/cat .+ > \$gemfile/echo "source \\"https:\/\/rubygems.org\\"" > \$gemfile && cat \$source\/Gemfile >> \$gemfile/' script/noosfero-plugins
+  - perl -pi -e 's/--local --quiet/install --jobs=3 --retry=3/' script/noosfero-plugins
+  - script/noosfero-plugins disableall
+  - bundle exec rake makemo &>/dev/null
+# database
+  - cp config/database.yml.travis config/database.yml
+  - psql -c 'create database myapp_test;' -U postgres
+  - bundle exec rake db:schema:load &>/dev/null
+  - bundle exec rake db:migrate &>/dev/null
+
+env:
+  - TASK=test:units
+  - TASK=test:functionals
+  - TASK=test:integration
+  - TASK=cucumber
+  - TASK=selenium
+  - TASK=test:noosfero_plugins
+
+script:
+  - bundle exec rake $TASK
+
+This list is automatically generated at release time. Please do not change it.
+
 If you are not listed here, but should be, please write to the noosfero mailing
 list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
 (this list requires subscription to post, but since you are an author of
@@ -8,261 +10,118 @@ Developers
 Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
 Alan Freihof Tygel <alantygel@gmail.com>
-alcampelo <alcampelo@alcampelo.(none)>
 Alessandro Palmeira <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
-Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
-Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
-Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
-Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
-Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
-analosnak <analosnak@gmail.com>
+Alex Campelo <campelo.al1@gmail.com>
+Álvaro Fernando <alvarofernandoms@gmail.com>
 Ana Losnak <analosnak@gmail.com>
-Andre Bernardes <andrebsguedes@gmail.com>
-Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
-Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
+Ana Paula Vargas <anapaulavnoronha@gmail.com>
+Andre Bedran <bedran.fleck@gmail.com>
+André Guedes <andrebsguedes@gmail.com>
 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 <brauliobo@gmail.com>
-Bráulio Bhavamitra <brauliobo@gmail.com>
 Braulio Bhavamitra <braulio@eita.org.br>
-Caio <caio.csalgado@gmail.com>
-Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
 Caio Formiga <caio.formiga@gmail.com>
-Caio, Pedro <caio.csalgado@gmail.com>
-Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
 Caio Salgado <caio.csalgado@gmail.com>
-Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
-Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
-Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
-Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
-Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
-Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
-Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
-Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
 Caio SBA <caio@colivre.coop.br>
 Caio Tiago Oliveira <caiotiago@colivre.coop.br>
 Carlos Andre de Souza <carlos.andre.souza@msn.com>
 Carlos Morais <carlos88morais@gmail.com>
-Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
-Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
-Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
-Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
-Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
-Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
-Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
-Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
-Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
-Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
-Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
+Christophe DANIEL <papaeng@gmail.com>
+Daniela Feitosa <alessandro.palmeira@gmail.com>
+Daniel Alves <danpaulalves@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>
+Daniel Tygel <dtygel@eita.org.br>
 David Carlos <ddavidcarlos1392@gmail.com>
-diegoamc <diegoamc90@gmail.com>
-Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
-Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
-Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
-Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
-Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
-Diego Araújo <diegoamc90@gmail.com>
-Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
-Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
-Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
-Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Diego Araújo + João Machini <diegoamc90@gmail.com>
-Diego Araújo + João Machini <digoamc90@gmail.com>
-Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
-Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
-Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
-Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
-Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
-Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
-Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
-Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
-Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
-Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
-Diego + Jefferson <diegoamc90@gmail.com>
-Diego Martinez <diegoamc90@gmail.com>
-Diego + Renan <renanteruoc@gmail.com>
-dtygel <dtygel@gmail.com>
-DylanGuedes <djmgguedes@gmail.com>
-Eduardo Passos <eduardo@risa.localdomain.localhost>
+Diego Araujo <diegoamc90@gmail.com>
+Dylan Guedes <djmgguedes@gmail.com>
+Eduardo Morais
 Eduardo Passos <eduardosteps@gmail.com>
 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
-Evandro Jr <evandrojr@gmail.com>
-Evandro Junior <evandrojr@gmail.com>
+Eduardo Vital <vitaldu@gmail.com>
+Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
 Fabio Teixeira <fabio1079@gmail.com>
 FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
-Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
-Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
+Filipe Ribeiro <firibeiro77@live.com>
 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
-Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
 Gabriela Navarro <navarro1703@gmail.com>
 Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
-Gust <darksshades@hotmail.com>
+Guilherme C. Muniz <guilherme.cmuniz@gmail.com>
+Guilherme Rojas <guilhermehrojas@gmail.com>
+Gustavo Jaruga <darksshades@gmail.com>
 Hebert Douglas <hebertdougl@gmail.com>
 Hugo Melo <hugo@riseup.net>
+Iolane Andrade <andrade.icaa@gmail.com>
 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>
+Jefferson Fernandes <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>
-João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
-Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
-João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
+João Machini
 João M. M. da Silva <jaodsilv@linux.ime.usp.br>
-Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
-João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
-Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
-João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
 Jose Pedro <1jpsneto@gmail.com>
-Junior Silva <junior@bajor.localhost.localdomain>
-Junior Silva <junior@sedeantigo.colivre.coop.br>
 Junior Silva <juniorsilva1001@gmail.com>
-Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
-Junior Silva <juniorsilva@colivre.coop.br>
-juniorsilva <juniorsilva@QonoS.localhost.localdomain>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
-Larissa Reis <reiss.larissa@gmail.com>
 Leandro Alves <leandrosustenido@gmail.com>
-Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
-Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
-Leandro Nunes dos Santos <leandronunes@gmail.com>
 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
+Leandro Veloso <leandrovelosorodrigues@gmail.com>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
+Lucas Couto <loc.unb@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 Cavalcanti <lucianopcbr@gmail.com>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
-Marcos <marcos.rpj2@gmail.com>
+Luiz Matos <luizff.matos@gmail.com>
 Marcos Ramos <ms.ramos@outlook.com>
+Marcos Ronaldo <marcos.rpj2@gmail.com>
+Mariel Zasso <noosfero-br@listas.softwarelivre.org>
 Martín Olivera <molivera@solar.org.ar>
+Matheus Faria <matheus.sousa.faria@gmail.com>
 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>
 Niemand Jedermann <predatorix@web.de>
 Parley Martins <parleypachecomartins@gmail.com>
-Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
-Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
-Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
-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>
+Pedro de Lyra <pedrodelyra@gmail.com>
+Pedro Leal
+Rafael de Souza Queiroz <querafael@live.com>
 Rafael Gomes <rafaelgomes@techfree.com.br>
-Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
-Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
-Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
-Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
-Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
 Rafael Martins <rmmartins@gmail.com>
-Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
-Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
-Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
-Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
-Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
 Rafael Reggiani Manzo <rr.manzo@gmail.com>
 Raphaël Rousseau <raph@r4f.org>
 Raquel Lira <raquel.lira@gmail.com>
 Raquel <rcordioli@gmail.com>
-Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
-Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
-Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
-Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
-Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
-Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
-Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
+Renan Costa <renan2727@hotmail.com>
+Renan Teruo <renanteruoc@gmail.com>
+Rodrigo Medeiros <rodrigo.mss01@gmail.com>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
-root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
-Tallys Martins <tallysmartins@gmail.com>
 Tallys Martins <tallysmartins@yahoo.com.br>
-tallys <tallys@tallys>
-tallys <tallys@tallys.(none)>
 Thiago Casotti <thiago.casotti@uol.com.br>
+Thiago Kairala <thiagor.kairala@gmail.com>
+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)>
+Wilton Rodrigues <braynwilton@gmail.com>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
 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'
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -32,6 +32,7 @@ group :test do
   gem 'rspec',                  '~> 2.14.0'
   gem 'rspec-rails',            '~> 2.14.1'
   gem 'mocha',                  '~> 1.1.0', :require => false
+  gem 'test-unit' if RUBY_VERSION >= '2.2.0'
 end
 group :cucumber do
@@ -72,8 +72,8 @@ class ApplicationController &lt; ActionController::Base
     FastGettext.available_locales = environment.available_locales
     FastGettext.default_locale = environment.default_locale
     FastGettext.locale = (params[:lang] || session[:lang] || environment.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
-    I18n.locale = FastGettext.locale
-    I18n.default_locale = FastGettext.default_locale
+    I18n.locale = FastGettext.locale.to_s.gsub '_', '-'
+    I18n.default_locale = FastGettext.default_locale.to_s.gsub '_', '-'
     if params[:lang]
       session[:lang] = params[:lang]
     end
@@ -6,7 +6,7 @@ class CmsController &lt; MyProfileController
   def search_tags
     arg = params[:term].downcase
-    result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    result = ActsAsTaggableOn::Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
     render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
   end
@@ -101,6 +101,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
@@ -1185,7 +1185,7 @@ module ApplicationHelper
       pending_tasks_count = link_to(count.to_s, 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 +
@@ -1233,7 +1233,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]
@@ -16,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
@@ -30,7 +30,7 @@ module ContentViewerHelper
         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
@@ -131,7 +131,7 @@ class Article &lt; ActiveRecord::Base
   scope :by_range, lambda { |range| {
     :conditions => [
-      'published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
+      'articles.published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
     ]
   }}
@@ -504,9 +504,9 @@ class Article &lt; ActiveRecord::Base
     where(
       [
        "published = ? OR last_changed_by_id = ? OR profile_id = ? OR ?
-        OR  (show_to_followers = ? AND ? AND profile_id = ?)", true, user.id, user.id,
+        OR  (show_to_followers = ? AND ? AND profile_id IN (?))", true, user.id, user.id,
         profile.nil? ?  false : user.has_permission?(:view_private_content, profile),
-        true, user.follows?(profile), (profile.nil? ? nil : profile.id)
+        true, (profile.nil? ? true : user.follows?(profile)),  ( profile.nil? ? (user.friends.select('profiles.id')) : [profile.id])
       ]
     )
   }
@@ -724,8 +724,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
@@ -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
@@ -12,6 +12,7 @@ class HighlightsBlock &lt; Block
     block.images.each do |i|
       i[:image_id] = i[:image_id].to_i
       i[:position] = i[:position].to_i
+      i[:address] = Noosfero.root + i[:address]  unless Noosfero.root.nil?
       begin
         file = UploadedFile.find(i[:image_id])
         i[:image_src] = file.public_filename
@@ -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
@@ -147,6 +147,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?
@@ -67,7 +67,8 @@ class User &lt; ActiveRecord::Base
   attr_writer :person_data
   def person_data
-    @person_data || {}
+    @person_data = {} if @person_data.nil?
+    @person_data
   end
   def email_domain
@@ -320,6 +321,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,
@@ -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>
@@ -16,6 +16,6 @@
     </div>
   <% end %>
   <div class = <%= className %> >
-      <%= article.abstract.truncate(400) %>
+      <%= 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 %>
@@ -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>
@@ -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>
 <%= text_field_tag 'product_category_id', '', :placeholder => _('type a category for the product') %>
 <%= javascript_include_tag '/javascripts/product_categories.js' %>
-<% javascript_tag do %>
+<%= 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')
-  <%= 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,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
+
@@ -0,0 +1,8 @@
+require_dependency 'scheduler/defer'
+
+if defined? Unicorn
+  ObjectSpace.each_object Unicorn::HttpServer do |s|
+    s.extend Scheduler::Defer::Unicorn
+  end
+end
+
@@ -3,7 +3,7 @@
 # contributors:
 #  - Alexander Dreher - http://github.com/alexdreher - Rails 3 update
-de:
+de: &de
   date:
     formats:
       default: "%d.%m.%Y"
@@ -221,3 +221,6 @@ de:
       full_messages:
         format: "%{attribute} %{message}"
+
+de-DE:
+  <<: *de
@@ -2,7 +2,7 @@
 #
 # Use this as the base for the locale file of your language.
-"en-US":
+"en-US": &en-US
   date:
     formats:
       default: "%Y-%m-%d"
@@ -220,4 +220,7 @@
       template:
         <<: *errors_template
       full_messages:
-        format: "%{attribute} %{message}"
 \ No newline at end of file
+        format: "%{attribute} %{message}"
+
+en:
+  <<: *en-US
@@ -0,0 +1 @@
+en-US.yml
 \ No newline at end of file
@@ -4,7 +4,7 @@
 #  - Tsutomu Kuroda - http://github.com/kuroda (t-kuroda@oiax.jp)
 # Corrected by Eloy Serra Labán: http://goo.gl/i9Kts, /nQ928, /XfKaX
-"es":
+es: &es
   date:
     formats:
       default: "%d/%m/%Y"
@@ -223,3 +223,6 @@
       full_messages:
         format: "%{attribute} %{message}"
+
+es_ES:
+  <<: *es
@@ -0,0 +1 @@
+fr.yml
 \ No newline at end of file
@@ -5,7 +5,7 @@
 #  - Bruno Michel - http://github.com/nono
 #  - Tsutomu Kuroda - http://github.com/kuroda (t-kuroda@oiax.jp)
-fr:
+fr: &fr
   date:
     formats:
       default: "%d/%m/%Y"
@@ -222,3 +222,7 @@ fr:
         <<: *errors_template
       full_messages:
         format: "%{attribute} %{message}"
+
+fr-FR:
+  <<: *fr
+
@@ -176,4 +176,4 @@
       template:
         <<: *errors_template
       full_messages:
-        format: "%{attribute} %{message}"
 \ No newline at end of file
+        format: "%{attribute} %{message}"
@@ -0,0 +1 @@
+hy.yml
 \ No newline at end of file
@@ -3,7 +3,7 @@
 # FIXME: This is a copy of en-US.yml. Armenian translators, please translate
 # this into Armenian.
-"hy":
+hy: &hy
   date:
     formats:
       default: "%Y-%m-%d"
@@ -222,3 +222,6 @@
         <<: *errors_template
       full_messages:
         format: "%{attribute} %{message}"
+
+hy-AM:
+  <<: *hy
@@ -5,7 +5,7 @@
 # - Simone Carletti (weppos@weppos.net)
 # - Davide Guerri (d.guerri@caspur.it)
-it:
+it: &it
   number:
     format:
       delimiter: ","
@@ -234,3 +234,6 @@ it:
       full_messages:
         format: "%{attribute} %{message}"
+
+it_IT:
+  <<: *it
 # encoding: UTF-8
 # pt-BR translations for Ruby on Rails
-"pt-BR":
+
+"pt-BR": &pt-BR
   # formatos de data e hora
   date:
     formats:
@@ -231,3 +232,6 @@
       full_messages:
         format: "%{attribute} %{message}"
+
+pt:
+  <<: *pt-BR
@@ -1,233 +0,0 @@
-# encoding: UTF-8
-# pt-BR translations for Ruby on Rails
-"pt":
-  # formatos de data e hora
-  date:
-    formats:
-      default: "%d/%m/%Y"
-      short: "%d de %B"
-      long: "%d de %B de %Y"
-
-    day_names:
-      - Domingo
-      - Segunda
-      - Terça
-      - Quarta
-      - Quinta
-      - Sexta
-      - Sábado
-    abbr_day_names:
-      - Dom
-      - Seg
-      - Ter
-      - Qua
-      - Qui
-      - Sex
-      - Sáb
-
-    month_names:
-      - ~
-      - Janeiro
-      - Fevereiro
-      - Março
-      - Abril
-      - Maio
-      - Junho
-      - Julho
-      - Agosto
-      - Setembro
-      - Outubro
-      - Novembro
-      - Dezembro
-    abbr_month_names:
-      - ~
-      - Jan
-      - Fev
-      - Mar
-      - Abr
-      - Mai
-      - Jun
-      - Jul
-      - Ago
-      - Set
-      - Out
-      - Nov
-      - Dez
-    order:
-      - :day
-      - :month
-      - :year
-
-  time:
-    formats:
-      default: "%A, %d de %B de %Y, %H:%M h"
-      short: "%d/%m, %H:%M h"
-      long: "%A, %d de %B de %Y, %H:%M h"
-    am: ''
-    pm: ''
-
-  # Usado no Array.to_sentence
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " e "
-      last_word_connector: " e "
-
-    select:
-      prompt: "Por favor selecione"
-
-  number:
-    format:
-      separator: ','
-      delimiter: '.'
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-
-    currency:
-      format:
-        format: '%u %n'
-        unit: 'R$'
-        separator: ','
-        delimiter: '.'
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-
-    percentage:
-      format:
-        delimiter: '.'
-
-    precision:
-      format:
-        delimiter: '.'
-
-    human:
-      format:
-        delimiter: '.'
-        precision: 2
-        significant: true
-        strip_insignificant_zeros: true
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      # number_to_human()
-      # new in rails 3: please add to other locales
-      decimal_units:
-        format: "%n %u"
-        units:
-          unit: ""
-          thousand: "mil"
-          million:
-            one: milhão
-            other: milhões
-          billion:
-            one: bilhão
-            other: bilhões
-          trillion:
-            one: trilhão
-            other: trilhões
-          quadrillion:
-            one: quatrilhão
-            other: quatrilhões
-
-  # distancia do tempo em palavras
-  datetime:
-    distance_in_words:
-      half_a_minute: 'meio minuto'
-      less_than_x_seconds:
-        one: 'menos de 1 segundo'
-        other: 'menos de %{count} segundos'
-      x_seconds:
-        one: '1 segundo'
-        other: '%{count} segundos'
-      less_than_x_minutes:
-        one: 'menos de um minuto'
-        other: 'menos de %{count} minutos'
-      x_minutes:
-        one: '1 minuto'
-        other: '%{count} minutos'
-      about_x_hours:
-        one: 'aproximadamente 1 hora'
-        other: 'aproximadamente %{count} horas'
-      x_days:
-        one: '1 dia'
-        other: '%{count} dias'
-      about_x_months:
-        one: 'aproximadamente 1 mês'
-        other: 'aproximadamente %{count} meses'
-      x_months:
-        one: '1 mês'
-        other: '%{count} meses'
-      about_x_years:
-        one: 'aproximadamente 1 ano'
-        other: 'aproximadamente %{count} anos'
-      over_x_years:
-        one: 'mais de 1 ano'
-        other: 'mais de %{count} anos'
-      almost_x_years:
-        one: 'quase 1 ano'
-        other: 'quase %{count} anos'
-    prompts:
-      year:   "Ano"
-      month:  "Mês"
-      day:    "Dia"
-      hour:   "Hora"
-      minute: "Minuto"
-      second: "Segundo"
-
-  helpers:
-    select:
-      prompt: "Por favor selecione"
-
-    submit:
-      create: 'Criar %{model}'
-      update: 'Atualizar %{model}'
-      submit: 'Salvar %{model}'
-
-  errors:
-    format: "%{attribute} %{message}"
-    messages: &errors_messages
-      inclusion: "não está incluído na lista"
-      exclusion: "não está disponível"
-      invalid: "não é válido"
-      confirmation: "não está de acordo com a confirmação"
-      accepted: "deve ser aceito"
-      empty: "não pode ficar vazio"
-      blank: "não pode ficar em branco"
-      too_long: "é muito longo (máximo: %{count} caracteres)"
-      too_short: "é muito curto (mínimo: %{count} caracteres)"
-      wrong_length: "não possui o tamanho esperado (%{count} caracteres)"
-      not_a_number: "não é um número"
-      not_an_integer: "não é um número inteiro"
-      greater_than: "deve ser maior que %{count}"
-      greater_than_or_equal_to: "deve ser maior ou igual a %{count}"
-      equal_to: "deve ser igual a %{count}"
-      less_than: "deve ser menor que %{count}"
-      less_than_or_equal_to: "deve ser menor ou igual a %{count}"
-      odd: "deve ser ímpar"
-      even: "deve ser par"
-      taken: "já está em uso"
-      record_invalid: "A validação falhou: %{errors}"
-    template: &errors_template
-      header:
-        one: "Não foi possível gravar %{model}: 1 erro"
-        other: "Não foi possível gravar %{model}: %{count} erros."
-      body: "Por favor, verifique o(s) seguinte(s) campo(s):"
-
-  activerecord:
-    errors:
-      messages:
-        <<: *errors_messages
-      template:
-        <<: *errors_template
-
-      full_messages:
-        format: "%{attribute} %{message}"
@@ -0,0 +1 @@
+pt-BR.yml
 \ No newline at end of file
@@ -10,7 +10,7 @@
 # (http://github.com/yaroslav/russian). Следующие данные -- выдержка их него, чтобы
 # была возможность минимальной локализации приложения на русский язык.
-ru:
+ru: &ru
   date:
     formats:
       default: "%d.%m.%Y"
@@ -300,3 +300,7 @@ ru:
       words_connector: ", "
       two_words_connector: " и "
       last_word_connector: " и "
+
+ru_RU:
+  <<: *ru
+
@@ -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 => 20150602142030) do
+ActiveRecord::Schema.define(:version => 20150603182105) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -376,6 +376,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150602142030) 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"
-noosfero (1.2~1) UNRELEASED; urgency=medium
-
-  [ Antonio Terceiro ]
-  * Temporary version in heavy development
+noosfero (1.2~rc1) wheezy; urgency=medium
   [ Joenio Costa ]
   * Build noosfero-chat package
- -- Joenio Costa <joenio@colivre.coop.br>  Mon, 18 May 2015 14:32:21 -0300
+  [ Antonio Terceiro ]
+  * Noosfero 1.2 RC1
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Mon, 13 Jul 2015 15:44:17 -0300
 noosfero (1.1) wheezy; urgency=low
@@ -37,7 +37,7 @@ Feature: comment
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
-    Then I should see "Hey ho, let's go"
+    Then I should see "Hey ho, let"
   @selenium-fixme
   Scenario: redirect to right place after comment a picture
@@ -160,6 +160,7 @@ Feature: 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
@@ -138,11 +138,12 @@ class Noosfero::Plugin
         filters = [filters]
       end
       filters.each do |plugin_filter|
+        plugin_filter[:options] ||= {}
+        plugin_filter[:options][:if] = -> { environment.plugin_enabled? plugin.module_name }
+
         filter_method = "#{plugin.identifier}_#{plugin_filter[:method_name]}".to_sym
-        controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
-        controller_class.send(:define_method, filter_method) do
-          instance_exec(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)
-        end
+        controller_class.send plugin_filter[:type], filter_method, plugin_filter[:options]
+        controller_class.send :define_method, filter_method, &plugin_filter[:block]
       end
     end
@@ -11,6 +11,10 @@ class Noosfero::Plugin
       @identifier ||= (if self.parents.first.instance_of? Module then self.parents.first else self end).name.underscore
     end
+    def module_name
+      @name ||= (if self.parents.first != Object then self.parents.first else self end).to_s
+    end
+
     def public_name
       @public_name ||= self.identifier.gsub '_plugin', ''
     end
@@ -0,0 +1,95 @@
+# based on https://github.com/discourse/discourse/blob/master/lib/scheduler/defer.rb
+
+module Scheduler
+  module Deferrable
+    def initialize
+      # FIXME: do some other way when not using Unicorn
+      @async = (not Rails.env.test?) and defined? Unicorn
+      @queue = Queue.new
+      @mutex = Mutex.new
+      @paused = false
+      @thread = nil
+    end
+
+    def pause
+      stop!
+      @paused = true
+    end
+
+    def resume
+      @paused = false
+    end
+
+    # for test
+    def async= val
+      @async = val
+    end
+
+    def later desc = nil, &blk
+      if @async
+        start_thread unless (@thread && @thread.alive?) || @paused
+        @queue << [blk, desc]
+      else
+        blk.call
+      end
+    end
+
+    def stop!
+      @thread.kill if @thread and @thread.alive?
+      @thread = nil
+    end
+
+    # test only
+    def stopped?
+      !(@thread and @thread.alive?)
+    end
+
+    def do_all_work
+      while !@queue.empty?
+        do_work _non_block=true
+      end
+    end
+
+    private
+
+    def start_thread
+      @mutex.synchronize do
+        return if @thread && @thread.alive?
+        @thread = Thread.new do
+          while true
+            do_work
+          end
+        end
+        @thread.priority = -2
+      end
+    end
+
+    # using non_block to match Ruby #deq
+    def do_work non_block=false
+      job, desc = @queue.deq non_block
+      begin
+        job.call
+      rescue => ex
+        ExceptionNotifier.notify_exception ex, message: "Running deferred code '#{desc}'"
+      end
+    rescue => ex
+      ExceptionNotifier.notify_exception ex, message: "Processing deferred code queue"
+    end
+  end
+
+  class Defer
+
+    module Unicorn
+      def process_client client
+        ::Scheduler::Defer.pause
+        super client
+        ::Scheduler::Defer.do_all_work
+        ::Scheduler::Defer.resume
+      end
+    end
+
+    extend Deferrable
+    initialize
+  end
+
+end
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.2~0'
+  VERSION = '1.2~rc1'
 end
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
@@ -53,6 +53,8 @@ namespace :noosfero do
   end
   AUTHORS_HEADER = <<EOF
+This list is automatically generated at release time. Please do not change it.
+
 If you are not listed here, but should be, please write to the noosfero mailing
 list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
 (this list requires subscription to post, but since you are an author of
@@ -82,7 +84,7 @@ EOF
     begin
       File.open("AUTHORS.md", 'w') do |output|
         output.puts AUTHORS_HEADER
-        output.puts `git log --no-merges --pretty=format:'%aN <%aE>' | sort | uniq`
+        output.puts `./script/authors`
         output.puts AUTHORS_FOOTER
       end
       commit_changes(['AUTHORS.md'], 'Updating authors file') if !pendencies_on_authors[:ok]
@@ -0,0 +1,2 @@
+gem 'slim'
+
@@ -0,0 +1,30 @@
+class AnalyticsPlugin::TimeOnPageController < ProfileController
+
+  before_filter :skip_page_view
+
+  def page_load
+    # to avoid concurrency problems with the original deferred request, also defer this
+    Scheduler::Defer.later do
+      page_view = profile.page_views.where(request_id: params[:id]).first
+      page_view.request = request
+      page_view.page_load!
+    end
+
+    render nothing: true
+  end
+
+  def report
+    page_view = profile.page_views.where(request_id: params[:id]).first
+    page_view.request = request
+    page_view.increase_time_on_page!
+
+    render nothing: true
+  end
+
+  protected
+
+  def skip_page_view
+    @analytics_skip_page_view = true
+  end
+
+end
@@ -0,0 +1,47 @@
+class InitAnalyticsPlugin < ActiveRecord::Migration
+
+  def up
+    create_table :analytics_plugin_visits do |t|
+      t.integer :profile_id
+    end
+
+    create_table :analytics_plugin_page_views do |t|
+      t.string :type
+      t.integer :visit_id
+      t.integer :track_id
+      t.integer :referer_page_view_id
+      t.string :request_id
+
+      t.integer :user_id
+      t.integer :session_id
+      t.integer :profile_id
+
+      t.text :url
+      t.text :referer_url
+
+      t.text :user_agent
+      t.string :remote_ip
+
+      t.datetime :request_started_at
+      t.datetime :request_finished_at
+      t.datetime :page_loaded_at
+      t.integer :time_on_page, default: 0
+
+      t.text :data, default: {}.to_yaml
+    end
+    add_index :analytics_plugin_page_views, :request_id
+    add_index :analytics_plugin_page_views, :referer_page_view_id
+
+    add_index :analytics_plugin_page_views, :user_id
+    add_index :analytics_plugin_page_views, :session_id
+    add_index :analytics_plugin_page_views, :profile_id
+    add_index :analytics_plugin_page_views, :url
+    add_index :analytics_plugin_page_views, [:user_id, :session_id, :profile_id, :url], name: :analytics_plugin_referer_find
+  end
+
+  def down
+    drop_table :analytics_plugin_visits
+    drop_table :analytics_plugin_page_views
+  end
+
+end
@@ -0,0 +1,15 @@
+module AnalyticsPlugin
+
+  TimeOnPageUpdateInterval = 2.minutes * 1000
+
+  extend Noosfero::Plugin::ParentMethods
+
+  def self.plugin_name
+    I18n.t'analytics_plugin.lib.plugin.name'
+  end
+
+  def self.plugin_description
+    I18n.t'analytics_plugin.lib.plugin.description'
+  end
+
+end
@@ -0,0 +1,43 @@
+
+class AnalyticsPlugin::Base < Noosfero::Plugin
+
+  def body_ending
+    return unless profile and profile.analytics_enabled?
+    lambda do
+      render 'analytics_plugin/body_ending'
+    end
+  end
+
+  def js_files
+    ['analytics'].map{ |j| "javascripts/#{j}" }
+  end
+
+  def application_controller_filters
+    [{
+      type: 'around_filter', options: {}, block: -> &block do
+        request_started_at = Time.now
+        block.call
+        request_finished_at = Time.now
+
+        return if @analytics_skip_page_view
+        return unless profile and profile.analytics_enabled?
+
+        Scheduler::Defer.later 'analytics: register page view' do
+          page_view = profile.page_views.build request: request, profile_id: profile,
+            request_started_at: request_started_at, request_finished_at: request_finished_at
+
+          unless profile.analytics_anonymous?
+            # FIXME: use session.id in Rails 4
+            session_id = Marshal.load(Base64.decode64 request['_session_id'])['session_id'] rescue nil
+            #session_id = request.session_options[:id]
+            page_view.user = user
+            page_view.session_id = session_id
+          end
+
+          page_view.save!
+        end
+      end,
+    }]
+  end
+
+end
@@ -0,0 +1,30 @@
+require_dependency 'profile'
+require_dependency 'community'
+
+([Profile] + Profile.descendants).each do |subclass|
+subclass.class_eval do
+
+  has_many :visits, foreign_key: :profile_id, class_name: 'AnalyticsPlugin::Visit'
+  has_many :page_views, foreign_key: :profile_id, class_name: 'AnalyticsPlugin::PageView'
+
+end
+end
+
+class Profile
+
+  def analytics_settings attrs = {}
+    @analytics_settings ||= Noosfero::Plugin::Settings.new self, AnalyticsPlugin, attrs
+    attrs.each{ |a, v| @analytics_settings.send "#{a}=", v }
+    @analytics_settings
+  end
+  alias_method :analytics_settings=, :analytics_settings
+
+  def analytics_enabled?
+    self.analytics_settings.enabled
+  end
+
+  def analytics_anonymous?
+    self.analytics_settings.anonymous
+  end
+
+end
@@ -0,0 +1,11 @@
+
+en: &en
+  analytics_plugin:
+    lib:
+      plugin:
+        name: 'Access tracking'
+        description: 'Register the access of selected profiles'
+
+en-US:
+  <<: *en
+
@@ -0,0 +1,10 @@
+
+pt: &pt
+  analytics_plugin:
+    lib:
+      plugin:
+        name: 'Rastreio de accesso'
+        description: 'Registra o acesso de perfis selecionados'
+
+pt-BR:
+  <<: *pt
@@ -0,0 +1,67 @@
+class AnalyticsPlugin::PageView < ActiveRecord::Base
+
+  serialize :data
+
+  attr_accessible *self.column_names
+  attr_accessible :user, :profile
+
+  attr_accessor :request
+  attr_accessible :request
+
+  acts_as_having_settings field: :options
+
+  belongs_to :visit, class_name: 'AnalyticsPlugin::Visit'
+  belongs_to :referer_page_view, class_name: 'AnalyticsPlugin::PageView'
+
+  belongs_to :user, class_name: 'Person'
+  belongs_to :session, primary_key: :session_id, foreign_key: :session_id, class_name: 'Session'
+  belongs_to :profile
+
+  validates_presence_of :visit
+  validates_presence_of :request, on: :create
+  validates_presence_of :url
+
+  before_validation :extract_request_data, on: :create
+  before_validation :fill_referer_page_view, on: :create
+  before_validation :fill_visit, on: :create
+
+  def request_duration
+    self.request_finished_at - self.request_started_at
+  end
+
+  def page_load!
+    self.page_loaded_at = Time.now
+    self.update_column :page_loaded_at, self.page_loaded_at
+  end
+
+  def increase_time_on_page!
+    now = Time.now
+    initial_time = self.page_loaded_at || self.request_finished_at
+    return unless now > initial_time
+
+    self.time_on_page = now - initial_time
+    self.update_column :time_on_page, self.time_on_page
+  end
+
+  protected
+
+  def extract_request_data
+    self.url = self.request.url.sub /\/+$/, ''
+    self.referer_url = self.request.referer
+    self.user_agent = self.request.headers['User-Agent']
+    self.request_id = self.request.env['action_dispatch.request_id']
+    self.remote_ip = self.request.remote_ip
+  end
+
+  def fill_referer_page_view
+    self.referer_page_view = AnalyticsPlugin::PageView.order('request_started_at DESC').
+      where(url: self.referer_url, session_id: self.session_id, user_id: self.user_id, profile_id: self.profile_id).first if self.referer_url.present?
+  end
+
+  def fill_visit
+    self.visit = self.referer_page_view.visit if self.referer_page_view
+    self.visit ||= AnalyticsPlugin::Visit.new profile: profile
+  end
+
+end
+
@@ -0,0 +1,11 @@
+class AnalyticsPlugin::Visit < ActiveRecord::Base
+
+  attr_accessible *self.column_names
+  attr_accessible :profile
+
+  default_scope -> { includes :page_views }
+
+  belongs_to :profile
+  has_many :page_views, class_name: 'AnalyticsPlugin::PageView', dependent: :destroy
+
+end
@@ -0,0 +1,29 @@
+# translation of analytic.po to portuguese
+# Krishnamurti Lelis Lima Vieira Nunes <krishna@colivre.coop.br>, 2007.
+# noosfero - Brazilian Portuguese translation
+# Copyright (C) 2007,
+# Forum Brasileiro de Economia Solidaria <http://www.fbes.org.br/>
+# Copyright (C) 2007,
+# Ynternet.org Foundation <http://www.ynternet.org/>
+# This file is distributed under the same license as noosfero itself.
+# Joenio Costa <joenio@colivre.coop.br>, 2008.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"PO-Revision-Date: 2015-07-21 09:23-0300\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-solr/pt/>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.3-dev\n"
+
+msgid "Select the set of communities and users to track"
+msgstr "Seleciona o conjunto de comunidades e usuários para rastrear"
+
@@ -0,0 +1,39 @@
+analytics = {
+  requestId: '',
+
+  timeOnPage: {
+    updateInterval: 0,
+    baseUrl: '',
+
+    report: function() {
+      $.ajax(analytics.timeOnPage.baseUrl+'/report', {
+        type: 'POST', data: {id: analytics.requestId},
+        success: function(data) {
+
+          analytics.timeOnPage.poll()
+        },
+      })
+    },
+
+    poll: function() {
+      if (analytics.timeOnPage.updateInterval)
+        setTimeout(analytics.timeOnPage.report, analytics.timeOnPage.updateInterval)
+    },
+  },
+
+  init: function() {
+    analytics.timeOnPage.poll()
+  },
+
+  pageLoad: function() {
+    $.ajax(analytics.timeOnPage.baseUrl+'/page_load', {
+      type: 'POST', data: {id: analytics.requestId},
+      success: function(data) {
+      },
+    });
+  }
+
+};
+
+$(document).ready(analytics.pageLoad)
+
@@ -0,0 +1,48 @@
+require 'test_helper'
+require 'content_viewer_controller'
+
+class ContentViewerControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ContentViewerController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @environment = Environment.default
+    @environment.enabled_plugins += ['AnalyticsPlugin']
+    @environment.save!
+
+    @user = create_user('testinguser').person
+    login_as @user.identifier
+
+    @community = build Community, identifier: 'testcomm', name: 'test'
+    @community.analytics_settings.enabled = true
+    @community.analytics_settings.anonymous = false
+    @community.save!
+    @community.add_member @user
+  end
+
+  should 'register page view correctly' do
+    @request.env['HTTP_REFERER'] = 'http://google.com'
+    first_url = 'http://test.host'
+    get :view_page, profile: @community.identifier, page: []
+    assert_equal 1, @community.page_views.count
+    assert_equal 1, @community.visits.count
+
+    first_page_view = @community.page_views.order(:id).first
+    assert_equal @request.referer, first_page_view.referer_url
+
+    @request.env['HTTP_REFERER'] = first_url
+    get :view_page, profile: @community.identifier, page: @community.articles.last.path.split('/')
+    assert_equal 2, @community.page_views.count
+    assert_equal 1, @community.visits.count
+
+    second_page_view = @community.page_views.order(:id).last
+    assert_equal first_page_view, second_page_view.referer_page_view
+
+    assert_equal @user, second_page_view.user
+
+    assert second_page_view.request_duration > 0 and second_page_view.request_duration < 1
+  end
+
+end
@@ -0,0 +1,6 @@
+javascript:
+  analytics.timeOnPage.baseUrl = #{url_for(controller: 'analytics_plugin/time_on_page').to_json}
+  analytics.timeOnPage.updateInterval = #{AnalyticsPlugin::TimeOnPageUpdateInterval.to_json}
+  analytics.requestId = #{request.env['action_dispatch.request_id'].to_json}
+  analytics.init()
+
@@ -7,8 +7,8 @@ msgstr &quot;&quot;
 "Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-01 17:26-0300\n"
-"PO-Revision-Date: 2015-03-07 12:26+0200\n"
-"Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
+"PO-Revision-Date: 2015-07-03 00:34+0200\n"
+"Last-Translator: Christophe DANIEL <papaeng@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
 "comment-classification/fr/>\n"
 "Language: fr\n"
@@ -16,7 +16,7 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 #: plugins/comment_classification/lib/comment_classification_plugin.rb:11
 msgid "A plugin that allow classification of comments."
@@ -80,7 +80,7 @@ msgstr &quot;Statuts&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/_status_form.html.erb:7
 msgid "Reason:"
-msgstr "Raison:"
+msgstr "Raison :"
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:1
 msgid "Status for comment"
@@ -121,7 +121,7 @@ msgstr &quot;Couleur&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:8
 msgid "Enable this label?"
-msgstr "Activer ce label?"
+msgstr "Activer ce label ?"
 #: plugins/comment_classification/views/comment_classification_plugin_labels/edit.html.erb:1
 msgid "Editing label %s"
@@ -149,7 +149,7 @@ msgstr &quot;Label&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:11
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:10
 msgid "Enabled"
-msgstr "Activé"
+msgstr "Activé(e)"
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:12
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:12
@@ -162,7 +162,7 @@ msgstr &quot;Êtes-vous sûr(e) que vous voulez retirer ce label ?&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:7
 msgid "Enable this status?"
-msgstr "Activer ce statut?"
+msgstr "Activer ce statut ?"
 #: plugins/comment_classification/views/comment_classification_plugin_status/edit.html.erb:1
 msgid "Editing status %s"
@@ -177,13 +177,12 @@ msgid &quot;(no status registered yet)&quot;
 msgstr "(il n'y a pas de statut enregistré pour le moment)"
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:11
-#, fuzzy
 msgid "Reason enabled?"
-msgstr "%s n'était pas activé(e)"
+msgstr "Raison activée ?"
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:21
 msgid "Are you sure you want to remove this status?"
-msgstr "Êtes-vous sûr(e) de vouloir supprimer ce statut?"
+msgstr "Êtes-vous sûr(e) de vouloir supprimer ce statut ?"
 #: plugins/comment_classification/views/comment/comments_labels_select.html.erb:3
 msgid "[Select ...]"
 class CommunityTrackPluginMyprofileController < MyProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
   before_filter :allow_edit_track, :only => :save_order
 class CommunityTrackPluginPublicController < PublicController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
   no_design_blocks
@@ -65,7 +65,8 @@ class CommunityTrackPlugin::Track &lt; Folder
   def category_name
     category = categories.first
-    category ? category.top_ancestor.name : ''
+    category = category.top_ancestor unless category.nil?
+    category.nil? ? '' : category.name
   end
   def to_html(options = {})
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 # Re-raise errors caught by the controller.
 class CmsController; def rescue_action(e) raise e end; end
-require File.dirname(__FILE__) + '/../test_helper'
-
-class ContentViewerController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e)
-    raise e
-  end
-end
+require_relative '../test_helper'
+class ContentViewerController; def rescue_action(e) raise e end; end
 class ContentViewerControllerTest < ActionController::TestCase
   def setup
@@ -87,32 +81,32 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
   should 'render a div with block id for track list block' do
-    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => @profile.boxes.last)
+    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => @profile.boxes.first)
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :class => 'track_list', :id => "track_list_#{@block.id}" }
   end
   should 'render a div with block id for track card list block' do
-    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.first)
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :class => 'track_list', :id => "track_list_#{@block.id}" }
   end
   should 'render tracks in track list block' do
-    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => @profile.boxes.last)
+    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => @profile.boxes.first)
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :class => "item category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'steps' }, :descendant => { :tag => 'span', :attributes => { :class => "step #{@block.status_class(@step)}" } } }
   end
   should 'render tracks in track card list block' do
-    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.first)
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :class => "item_card category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'track_content' } }
     assert_tag :tag => 'div', :attributes => { :class => "item_card category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'track_stats' } }
   end
   should 'render link to display more tracks in track list block' do
-    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.first)
     (@block.limit+1).times { |i| create_track("track#{i}", @profile) }
     get :view_page, @step.url
@@ -120,7 +114,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
   should 'render link to show all tracks in track list block' do
-    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.first)
     @block.more_another_page = true
     @block.save!
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 # Re-raise errors caught by the controller.
 class EnvironmentDesignController; def rescue_action(e) raise e end; end
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../../controllers/myprofile/community_track_plugin_myprofile_controller'
+require_relative '../test_helper'
+require_relative '../../controllers/myprofile/community_track_plugin_myprofile_controller'
 # Re-raise errors caught by the controller.
 class CommunityTrackPluginMyprofileController; def rescue_action(e) raise e end; end
@@ -7,10 +7,6 @@ class CommunityTrackPluginMyprofileController; def rescue_action(e) raise e end;
 class CommunityTrackPluginMyprofileControllerTest < ActionController::TestCase
   def setup
-    @controller = CommunityTrackPluginMyprofileController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
     @profile = fast_create(Community)
     @track = create_track('track', @profile)
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../../controllers/public/community_track_plugin_public_controller'
+require_relative '../test_helper'
+require_relative '../../controllers/public/community_track_plugin_public_controller'
 # Re-raise errors caught by the controller.
 class CommunityTrackPluginPublicController; def rescue_action(e) raise e end; end
-require File.dirname(__FILE__) + '/../../../test/test_helper'
+require_relative '../../../test/test_helper'
 def create_track(name, profile)
   track = CommunityTrackPlugin::Track.new(:abstract => 'abstract', :body => 'body', :name => name, :profile => profile)
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 class ArticleTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../test_helper'
+require_relative '../../test_helper'
 class ActivationJobTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../test_helper'
+require_relative '../../test_helper'
 class StepHelperTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../test_helper'
+require_relative '../../test_helper'
 class StepTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../test_helper'
+require_relative '../../test_helper'
 class TrackCardListBlockTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../test_helper'
+require_relative '../../test_helper'
 class TrackHelperTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../test_helper'
+require_relative '../../test_helper'
 class TrackListBlockTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../test_helper'
+require_relative '../../test_helper'
 class TrackTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 class CommunityTrackPluginTest < ActiveSupport::TestCase
@@ -7,8 +7,8 @@ msgstr &quot;&quot;
 "Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-01 17:26-0300\n"
-"PO-Revision-Date: 2015-02-23 11:38+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2015-07-03 00:36+0200\n"
+"Last-Translator: Christophe DANIEL <papaeng@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
 "custom-forms/fr/>\n"
 "Language: fr\n"
@@ -16,17 +16,16 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
 msgid "Invalid string format of access."
-msgstr ""
+msgstr "Format de chaîne d'accès non valide."
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:71
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:76
-#, fuzzy
 msgid "There is no profile with the provided id."
-msgstr "Il y a un problème avec les lignes suivantes : "
+msgstr "Il n'y a pas le profil avec l'ID fourni."
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:81
 msgid "Invalid type format of access."
@@ -64,9 +63,8 @@ msgstr &quot;%{fn} est obligatoire&quot;
 #: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:14
 #: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:47
-#, fuzzy
 msgid "Logged users"
-msgstr "Connecté en tant que %s"
+msgstr "Utilisateurs connectés"
 #: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:19
 #, fuzzy
@@ -213,7 +211,7 @@ msgstr &quot;Une entreprise&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
 #, fuzzy
@@ -7,8 +7,8 @@ msgstr &quot;&quot;
 "Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-01 17:26-0300\n"
-"PO-Revision-Date: 2015-03-07 02:11+0200\n"
-"Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
+"PO-Revision-Date: 2015-07-03 00:31+0200\n"
+"Last-Translator: Christophe DANIEL <papaeng@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
 "display-content/fr/>\n"
 "Language: fr\n"
@@ -16,14 +16,14 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 #: plugins/display_content/lib/display_content_plugin.rb:10
 msgid ""
 "A plugin that adds a block where you could choose any of your content and "
 "display it."
 msgstr ""
-"Un greffon qui permet d'ajouter une zone ou vous pourrez y afficher le "
+"Un plugin qui permet d'ajouter une zone ou vous pourrez y afficher le "
 "contenue de votre choix."
 #: plugins/display_content/lib/display_content_block.rb:34
@@ -48,33 +48,33 @@ msgstr &quot;Résumé&quot;
 #: plugins/display_content/lib/display_content_block.rb:151
 msgid "Read more"
-msgstr "En lire plus"
+msgstr "Lire plus"
 #: plugins/display_content/lib/display_content_block.rb:194
 msgid "%{month}/%{day}/%{year}"
-msgstr "%{mois}/%{jour}/%{année}"
+msgstr "%{day}/%{month}/%{year}"
 #: plugins/display_content/lib/display_content_block.rb:194
 msgid "%{month}/%{day}"
-msgstr "%{mois}/%{jour}"
+msgstr "%{day}/%{month}"
 #: plugins/display_content/lib/display_content_block.rb:197
 msgid "%{month_name} %{day}, %{year}"
-msgstr "%{nom_du_mois} %{jour}, %{année}"
+msgstr "%{day} %{month_name} %{year}"
 #: plugins/display_content/lib/display_content_block.rb:197
 msgid "%{month_name} %{day}"
-msgstr "%{nom_du_mois} %{jour}"
+msgstr "%{day} %{month_name}"
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:5
 msgid "Choose which attributes should be displayed and drag to reorder them:"
 msgstr ""
 "Choisissez quels attribues doivent êtres afficher et glisser/déposer pour "
-"les réorganiser:"
+"les réorganiser :"
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:21
 msgid "Choose which content should be displayed:"
-msgstr "Choisissez le contenu à afficher:"
+msgstr "Choisissez le contenu à afficher :"
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:23
 msgid "Choose directly"
@@ -86,7 +86,7 @@ msgstr &quot;Choisir par type de contenu&quot;
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:28
 msgid "Order by:"
-msgstr "Trier par:"
+msgstr "Trier par :"
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:29
 msgid "Most recent"
@@ -98,7 +98,7 @@ msgstr &quot;Le plus ancien&quot;
 #: plugins/display_content/views/box_organizer/_choose_by_content_type.html.erb:1
 msgid "Display content types:"
-msgstr "Afficher le types de contenue:"
+msgstr "Afficher le type de contenu :"
 #: plugins/display_content/views/box_organizer/_choose_by_content_type.html.erb:7
 msgid "more"
@@ -106,9 +106,8 @@ msgstr &quot;plus&quot;
 #: plugins/display_content/views/box_organizer/_choose_directly.html.erb:5
 msgid "Dinamically load children of selected folders"
-msgstr ""
-"Dynamiquement charger les sous répertoires des répertoires sélectionnés"
+msgstr "charger dynamiquement les sous répertoires des répertoires sélectionnés"
 #: plugins/display_content/views/box_organizer/_choose_directly.html.erb:9
 msgid "Limit:"
-msgstr "Limite:"
+msgstr "Limite :"
@@ -26,8 +26,8 @@ class EventPlugin::EventBlock &lt; Block
   end
   def events(user = nil)
-    events = events_source.events
-    events = events.published.order('start_date')
+    events = events_source.events.order('start_date')
+    events = user.nil? ? events.public : events.display_filter(user,nil)
     if future_only
       events = events.where('start_date >= ?', Date.today)
@@ -0,0 +1 @@
+require_relative '../../../test/test_helper'
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require_relative '../test_helper'
-class EventPlugin::EventBlockTest < ActiveSupport::TestCase
+class EventBlockTest < ActiveSupport::TestCase
   def setup
     @env = Environment.default
@@ -165,7 +165,7 @@ class EventPlugin::EventBlockTest &lt; ActiveSupport::TestCase
   def visibility_content_test_from_a_profile(profile)
     @block.box.owner = @env
-    ev = fast_create Event, :name => '2 de Julho', :profile_id => profile.id
+    ev = Event.create!(:name => '2 de Julho', :profile => profile)
     @block.all_env_events = true
     # Do not list event from private profile for non logged visitor
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require_relative '../test_helper'
 class EventPluginTest < ActiveSupport::TestCase
@@ -29,7 +29,7 @@ Feature: import lattes information
     And I fill in "Lattes URL" with "http://lattes.cnpq.br/2864976228727880"
     And I press "Save"
     And I go to /profile/admin_user#lattes_tab
-    Then I should see "Endereço para acessar este CV: http://lattes.cnpq.br/2864976228727880"
+    Then I should see "Lattes"
   Scenario: Don't show lattes informations for blank lattes urls
     Given I am on admin_user's control panel
@@ -19,6 +19,8 @@ class Html_parser
       page = _("Lattes not found. Please, make sure the informed URL is correct.")
     rescue Timeout::Error => e
       page = _("Lattes Platform is unreachable. Please, try it later.")
+    rescue
+      page = _("Could not import the lattes")
     end
   end
@@ -12,13 +12,4 @@ class HtmlParserTest &lt; ActiveSupport::TestCase
   should 'be not nil the instance' do
     assert_not_nil @parser
   end
-
-  should 'be not nil the return get_html' do
-    result = @parser.get_html("http://lattes.cnpq.br/2193972715230641")
-    assert result.include?("Endereço para acessar este CV")
-  end
-
-  should 'inform that lattes was not found' do
-    assert_equal "Lattes not found. Please, make sure the informed URL is correct.", @parser.get_html("http://lattes.cnpq.br/123")
-  end
 end
@@ -7,7 +7,7 @@ class Product
     url: proc{ |p, plugin| plugin.og_url_for p.url },
     gr_hascurrencyvalue: proc{ |p, plugin| p.price.to_f },
     gr_hascurrency: proc{ |p, plugin| p.environment.currency_unit },
-    title: proc{ |a, plugin| "#{p.name} - #{p.profile.name}" },
+    title: proc{ |p, plugin| "#{p.name} - #{p.profile.name}" if p },
     description: proc{ |p, plugin| ActionView::Base.full_sanitizer.sanitize p.description },
     image: proc{ |p, plugin| "#{p.environment.top_url}#{p.image.public_filename}" if p.image },
@@ -17,7 +17,7 @@ class Product
     see_also: [],
     site_name: proc{ |p, plugin| plugin.og_url_for p.profile.url },
-    updated_time: proc{ |p, plugin| p.updated_at.iso8601 },
+    updated_time: proc{ |p, plugin| p.updated_at.iso8601 if p.updated_at },
     'locale:locale' => proc{ |p, plugin| p.environment.default_language },
     'locale:alternate' => proc{ |p, plugin| p.environment.languages - [p.environment.default_language] if p.environment.languages },
@@ -12,7 +12,7 @@ class HomeControllerTest &lt; ActionController::TestCase
     @response   = ActionController::TestResponse.new
     Noosfero::Plugin.stubs(:all).returns([MetadataPlugin.name])
-    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([MetadataPlugin.new])
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([MetadataPlugin.new(@controller)])
   end
   should 'display meta tags for social media' do
@@ -0,0 +1,27 @@
+require 'test_helper'
+require 'home_controller'
+
+# Re-raise errors caught by the controller.
+class ManageProductsController; def rescue_action(e) raise e end; end
+
+class ManageProductsControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ManageProductsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @enterprise = fast_create(Enterprise, name: 'test', identifier: 'test_ent')
+    @user = create_user_with_permission('test_user', 'manage_products', @enterprise)
+    @environment = @enterprise.environment
+    @environment.enable('products_for_enterprises')
+    login_as :test_user
+
+    Noosfero::Plugin.stubs(:all).returns([MetadataPlugin.name])
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([MetadataPlugin.new(@controller)])
+  end
+
+  should "not crash on new products" do
+    get :new, profile: @enterprise.identifier
+  end
+
+end
@@ -17,7 +17,7 @@ class FriendsBlock &lt; PeopleBlockBase
   end
   def suggestions
-    owner.profile_suggestions.of_person.enabled.limit(3).includes(:suggestion)
+    owner.suggested_profiles.of_person.enabled.limit(3).includes(:suggestion)
   end
   def footer
@@ -7,63 +7,55 @@ msgstr &quot;&quot;
 "Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-01 17:26-0300\n"
-"PO-Revision-Date: 2014-12-12 14:22+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
-"fr/>\n"
+"PO-Revision-Date: 2015-07-03 00:41+0200\n"
+"Last-Translator: Christophe DANIEL <papaeng@gmail.com>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
+"people-block/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.2-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 #: plugins/people_block/lib/friends_block.rb:8
-#, fuzzy
 msgid "Clicking a friend takes you to his/her homepage"
 msgstr "Cliquer sur une personne vous amène à sa page personnelle"
 #: plugins/people_block/lib/friends_block.rb:12
-#, fuzzy
 msgid "{#} friend"
 msgid_plural "{#} friends"
-msgstr[0] "contacts"
-msgstr[1] "contacts"
+msgstr[0] "{#} ami"
+msgstr[1] "{#} amis"
 #: plugins/people_block/lib/people_block_base.rb:9
-#, fuzzy
 msgid "Random people"
-msgstr "Trouver des personnes"
+msgstr "Personnes au hasard"
 #: plugins/people_block/lib/people_block_base.rb:17
 #: plugins/people_block/lib/people_block.rb:12
-#, fuzzy
 msgid "{#} People"
-msgstr "Personnes"
+msgstr "{#} Personne"
 #: plugins/people_block/lib/members_block.rb:11
-#, fuzzy
 msgid "Clicking a member takes you to his/her homepage"
-msgstr "Cliquer sur une personne vous amène à sa page personnelle"
+msgstr "Cliquer sur un membre vous amène à sa page personnelle"
 #: plugins/people_block/lib/members_block.rb:15
-#, fuzzy
 msgid "members"
-msgstr "Membres"
+msgstr "membres"
 #: plugins/people_block/lib/members_block.rb:16
-#, fuzzy
 msgid "{#} %s"
-msgstr "%{num} groupes"
+msgstr "{#} %s"
 #: plugins/people_block/lib/members_block.rb:42
 msgid "Show join leave button"
-msgstr ""
+msgstr "Afficher le bouton quitter"
 #: plugins/people_block/lib/people_block_plugin.rb:8
-#, fuzzy
 msgid "A plugin that adds a people block"
-msgstr "Un bloc qui affiche vos groupes"
+msgstr "Un plugin qui ajoute un bloc de personnes"
 #: plugins/people_block/lib/people_block.rb:8
 msgid "Clicking a person takes you to his/her homepage"
@@ -71,17 +63,16 @@ msgstr &quot;Cliquer sur une personne vous amène à sa page personnelle&quot;
 #: plugins/people_block/views/box_organizer/_people_block_base.html.erb:6
 msgid "Filter by role:"
-msgstr ""
+msgstr "Filtrer par rôle :"
 #: plugins/people_block/views/blocks/friends.html.erb:1
-#, fuzzy
 msgid "friends|View all"
 msgstr "Voir tout"
 #: plugins/people_block/views/blocks/friends.html.erb:5
 msgid "Some suggestions for you"
-msgstr ""
+msgstr "Quelques suggestions pour vous"
 #: plugins/people_block/views/blocks/friends.html.erb:10
 msgid "See all suggestions"
-msgstr ""
+msgstr "Voir toutes les suggestions"
@@ -17,8 +17,8 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(user.login)
     owner = user.person
-    suggestion1 = owner.profile_suggestions.create(:suggestion => fast_create(Person))
-    suggestion2 = owner.profile_suggestions.create(:suggestion => fast_create(Person))
+    suggestion1 = ProfileSuggestion.create!(:suggestion => fast_create(Person), :person => owner)
+    suggestion2 = ProfileSuggestion.create!(:suggestion => fast_create(Person), :person => owner)
     FriendsBlock.delete_all
     block = FriendsBlock.new
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+before_script:
	2	+ - mkdir -p tmp/pids log
	3	+ - bundle check \|\| bundle install
	4	+# workaround for plugins with Gemfile
	5	+ - perl -pi -e 's/--local //' script/noosfero-plugins
	6	+ - script/noosfero-plugins disableall
	7	+ - bundle exec rake makemo &>/dev/null
	8	+# database
	9	+ - cp config/database.yml.gitlab-ci config/database.yml
	10	+ - createdb gitlab_ci_test \|\| true
	11	+ - bundle exec rake db:schema:load &>/dev/null
	12	+ - bundle exec rake db:migrate &>/dev/null
	13	+
	14	+units:
	15	+ script: bundle exec rake test:units
	16	+functionals:
	17	+ script: bundle exec rake test:functionals
	18	+integration:
	19	+ script: bundle exec rake test:integration
	20	+cucumber:
	21	+ script: bundle exec rake cucumber
	22	+selenium:
	23	+ script: bundle exec rake selenium
	24	+plugins:
	25	+ script: bundle exec rake test:noosfero_plugins
	26	+
@@ -0,0 +1,53 @@		@@ -0,0 +1,53 @@
	1	+language: ruby
	2	+rvm:
	3	+# for 2.2 support we need to upgrade the pg gem
	4	+ - 2.1.6
	5	+
	6	+sudo: false
	7	+addons:
	8	+ apt:
	9	+ packages:
	10	+ - po4a
	11	+ - iso-codes
	12	+ - tango-icon-theme
	13	+ - pidgin-data
	14	+ # for gem extensions
	15	+ - libmagickwand-dev
	16	+ - libpq-dev
	17	+ - libreadline-dev
	18	+ - libsqlite3-dev
	19	+ - libxslt1-dev
	20	+
	21	+before_install:
	22	+ - gem env
	23	+
	24	+# workaround for https://github.com/travis-ci/travis-ci/issues/4536
	25	+before_install:
	26	+ - export GEM_HOME=$PWD/vendor/bundle/ruby/2.1.0
	27	+ - gem install bundler
	28	+cache: bundler
	29	+
	30	+before_script:
	31	+ - mkdir -p tmp/pids log
	32	+# workaround for plugins with Gemfile
	33	+ - perl -pi -e 's/cat .+ > \$gemfile/echo "source \\"https:\/\/rubygems.org\\"" > \$gemfile && cat \$source\/Gemfile >> \$gemfile/' script/noosfero-plugins
	34	+ - perl -pi -e 's/--local --quiet/install --jobs=3 --retry=3/' script/noosfero-plugins
	35	+ - script/noosfero-plugins disableall
	36	+ - bundle exec rake makemo &>/dev/null
	37	+# database
	38	+ - cp config/database.yml.travis config/database.yml
	39	+ - psql -c 'create database myapp_test;' -U postgres
	40	+ - bundle exec rake db:schema:load &>/dev/null
	41	+ - bundle exec rake db:migrate &>/dev/null
	42	+
	43	+env:
	44	+ - TASK=test:units
	45	+ - TASK=test:functionals
	46	+ - TASK=test:integration
	47	+ - TASK=cucumber
	48	+ - TASK=selenium
	49	+ - TASK=test:noosfero_plugins
	50	+
	51	+script:
	52	+ - bundle exec rake $TASK
	53	+
	@@ -1185,7 +1185,7 @@ module ApplicationHelper		@@ -1185,7 +1185,7 @@ module ApplicationHelper
1185	pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))	1185	pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
1186	end	1186	end
1187		1187
1188	- (_("<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'))) +	1188	+ (_("<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'))) +
1189	render_environment_features(:usermenu) +	1189	render_environment_features(:usermenu) +
1190	admin_link +	1190	admin_link +
1191	manage_enterprises +	1191	manage_enterprises +
	@@ -1233,7 +1233,7 @@ module ApplicationHelper		@@ -1233,7 +1233,7 @@ module ApplicationHelper
1233		1233
1234	def task_information(task)	1234	def task_information(task)
1235	values = {}	1235	values = {}
1236	- values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor	1236	+ values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
1237	values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject	1237	values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
1238	values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject	1238	values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
1239	values.merge!(task.information[:variables]) if task.information[:variables]	1239	values.merge!(task.information[:variables]) if task.information[:variables]
	@@ -16,7 +16,7 @@ module CommentHelper		@@ -16,7 +16,7 @@ module CommentHelper
16	content_tag('span', show_date(article.published_at), :class => 'date') +	16	content_tag('span', show_date(article.published_at), :class => 'date') +
17	content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +	17	content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +
18	content_tag('span', comments, :class => 'comments'),	18	content_tag('span', comments, :class => 'comments'),
19	- :class => 'created-at'	19	+ :class => 'publishing-info'
20	)	20	)
21	end	21	end
22	title	22	title
	@@ -30,7 +30,7 @@ module ContentViewerHelper		@@ -30,7 +30,7 @@ module ContentViewerHelper
30	date_format +	30	date_format +
31	content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +	31	content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
32	content_tag('span', comments, :class => 'comments'),	32	content_tag('span', comments, :class => 'comments'),
33	- :class => 'created-at'	33	+ :class => 'publishing-info'
34	)	34	)
35	end	35	end
36	title	36	title
	@@ -98,47 +98,19 @@ class Event < Article		@@ -98,47 +98,19 @@ class Event < Article
98	start_date..(end_date\|\|start_date)	98	start_date..(end_date\|\|start_date)
99	end	99	end
100		100
101	- # FIXME this shouldn't be needed
102	- include ActionView::Helpers::TagHelper
103	- include ActionView::Helpers::UrlHelper
104	- include DatesHelper	101	+ def first_paragraph
		102	+ paragraphs = Nokogiri::HTML.fragment(self.body).css('p')
		103	+ paragraphs.empty? ? '' : paragraphs.first.to_html
		104	+ end
105		105
106	def to_html(options = {})	106	def to_html(options = {})
		107	+ event = self
		108	+ format = options[:format]
107		109
108	- result = ''
109	- html = ::Builder::XmlMarkup.new(:target => result)
110	-
111	- html.div(:class => 'event-info' ) {
112	- html.ul(:class => 'event-data' ) {
113	- html.li(:class => 'event-dates' ) {
114	- html.span _('When:')
115	- html.text! show_period(start_date, end_date)
116	- } if start_date.present? \|\| end_date.present?
117	- html.li {
118	- html.span _('URL:')
119	- html.a(self.link \|\| "", 'href' => self.link \|\| "")
120	- } if self.link.present?
121	- html.li {
122	- html.span _('Address:')
123	- html.text! self.address \|\| ""
124	- } if self.address.present?
125	- }
126	-
127	- # TODO: some good soul, please clean this ugly hack:
128	- if self.body
129	- html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description')
130	- end
131	- }
132	-
133	- if self.body
134	- if options[:format] == 'short'
135	- result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self))
136	- else
137	- result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
138	- end	110	+ proc do
		111	+ render :file => 'content_viewer/event_page', :locals => { :event => event,
		112	+ :format => format }
139	end	113	end
140	-
141	- result
142	end	114	end
143		115
144	def duration	116	def duration
	@@ -23,7 +23,7 @@ class Image < ActiveRecord::Base		@@ -23,7 +23,7 @@ class Image < ActiveRecord::Base
23		23
24	postgresql_attachment_fu	24	postgresql_attachment_fu
25		25
26	- attr_accessible :uploaded_data	26	+ attr_accessible :uploaded_data, :label
27		27
28	def current_data	28	def current_data
29	File.file?(full_filename) ? File.read(full_filename) : nil	29	File.file?(full_filename) ? File.read(full_filename) : nil
	@@ -147,6 +147,12 @@ class Organization < Profile		@@ -147,6 +147,12 @@ class Organization < Profile
147	]	147	]
148	end	148	end
149		149
		150	+ def short_name chars = 40
		151	+ s = self.display_name
		152	+ s = super(chars) if s.blank?
		153	+ s
		154	+ end
		155	+
150	def notification_emails	156	def notification_emails
151	emails = [contact_email].select(&:present?) + admins.map(&:email)	157	emails = [contact_email].select(&:present?) + admins.map(&:email)
152	if emails.empty?	158	if emails.empty?
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+<% if @page.belongs_to_blog? \|\| @page.belongs_to_forum?%>
	2	+ <h1 class="title">
	3	+ <% if no_link %>
	4	+ <%= h(@page.title) %>
	5	+ <% else %>
	6	+ <%= link_to(@page.name, @page.url) %>
	7	+ <% end %>
	8	+ </h1>
	9	+ <%= render :partial => "publishing_info" %>
	10	+ <% unless @page.abstract.blank? %>
	11	+ <div class="preview">
	12	+ <%= @page.lead %>
	13	+ </div>
	14	+ <% end %>
	15	+<% else %>
	16	+ <h1 class="title">
	17	+ <%= h(@page.title) %>
	18	+ </h1>
	19	+ <%= render :partial => "publishing_info" %>
	20	+<% end %>
	@@ -64,7 +64,7 @@		@@ -64,7 +64,7 @@
64	<% end %>	64	<% end %>
65	<%= link_to(image_tag('/images/icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>	65	<%= link_to(image_tag('/images/icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
66	<%= @plugins.dispatch(:article_header_extra_contents, @page).collect { \|content\| instance_exec(&content) }.join("") %>	66	<%= @plugins.dispatch(:article_header_extra_contents, @page).collect { \|content\| instance_exec(&content) }.join("") %>
67	- <%= article_title(@page, :no_link => true) %>	67	+ <%= render :partial => 'article_title', :locals => {:no_link => true} %>
68	<%= article_translations(@page) %>	68	<%= article_translations(@page) %>
69	</div>	69	</div>
70	</div>	70	</div>