09 Dec, 2015
1 commit
08 Dec, 2015
1 commit
-
This reverts commit 3057b70bfe7e25e4dee80cae10c408238f040a02, which caused several tests to fail.
07 Dec, 2015
1 commit
05 Dec, 2015
1 commit
-
Also drop wrong files copied from old repo
01 Dec, 2015
2 commits
30 Nov, 2015
2 commits
-
Conflicts: app/helpers/forms_helper.rb app/views/cms/edit.html.erb lib/noosfero/api/entities.rb lib/noosfero/api/v1/comments.rb lib/noosfero/api/v1/search.rb test/unit/api/search_test.rb
23 Nov, 2015
2 commits
-
Custom fields can be added to any profile through the admin panel in the 'Fields' section. They have the same behaviour as the current Noosfero's fields (active, signup, required and privacy). Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Joenio Costa <joenio@colivre.coop.br> Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
20 Nov, 2015
1 commit
19 Nov, 2015
4 commits
-
Conflicts: app/models/article.rb app/models/comment.rb
18 Nov, 2015
1 commit
17 Nov, 2015
1 commit
-
Conflicts: Gemfile Rakefile app/controllers/box_organizer_controller.rb app/controllers/my_profile/tasks_controller.rb app/controllers/public/profile_controller.rb app/mailers/user_mailer.rb app/models/article.rb app/models/person.rb app/models/product_category.rb app/models/task.rb config/application.rb config/routes.rb lib/acts_as_having_settings.rb lib/noosfero/api/entities.rb lib/noosfero/api/helpers.rb lib/noosfero/api/session.rb lib/noosfero/api/v1/articles.rb lib/noosfero/api/v1/contacts.rb lib/noosfero/api/v1/search.rb lib/noosfero/api/v1/users.rb test/functional/tasks_controller_test.rb test/unit/api/articles_test.rb test/unit/api/helpers_test.rb test/unit/api/people_test.rb test/unit/api/search_test.rb test/unit/api/session_test.rb test/unit/api/users_test.rb test/unit/person_notifier_test.rb test/unit/task_test.rb vendor/plugins/access_control/lib/acts_as_accessible.rb
16 Nov, 2015
1 commit
12 Nov, 2015
1 commit
05 Nov, 2015
4 commits
-
Article privacy fixies * Fix article privacy to not consider invisible profiles * Change feed published method to consider it's parent privacy * Closes #148 See merge request !723
-
* It fix the private feed creation problem * Closes #148 Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
04 Nov, 2015
4 commits
03 Nov, 2015
1 commit
13 Oct, 2015
3 commits
-
Signed-off-by: Victor Costa <vfcosta@gmail.com> Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br> Conflicts: app/controllers/my_profile/profile_design_controller.rb app/helpers/boxes_helper.rb app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb public/stylesheets/application.css test/functional/environment_design_controller_test.rb test/functional/profile_design_controller_test.rb
09 Oct, 2015
1 commit
08 Oct, 2015
2 commits
-
Fix highlights_block error on add Noosfero.root @danielafeitosa, can you review this merge request? See merge request !701
-
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
07 Oct, 2015
3 commits
-
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
-
Favorite enterprises block footer and content fixes Before:  After:  Had to move the "view all" button to the bottom because of this problem:  See merge request !676
06 Oct, 2015
1 commit
-
Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
02 Oct, 2015
1 commit
30 Sep, 2015
1 commit