30 Nov, 2015
1 commit
-
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
1 commit
-
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>
19 Nov, 2015
2 commits
-
Conflicts: app/models/article.rb app/models/comment.rb
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
15 Nov, 2015
1 commit
14 Nov, 2015
2 commits
-
Move non responsive styles from application.css to base Responsive themes use `base-responsive` instead of `base`, but `application.css` can't be replaced. There is no problem with this if all noosfero instances use the `base` theme, which is the default setup for themes. Anyone don't use the `base` theme? See merge request !425
12 Nov, 2015
1 commit
10 Nov, 2015
1 commit
-
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> See merge request !709
05 Nov, 2015
2 commits
03 Nov, 2015
3 commits
28 Oct, 2015
1 commit
19 Oct, 2015
1 commit
13 Oct, 2015
4 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
07 Oct, 2015
2 commits
-
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
05 Oct, 2015
1 commit
02 Oct, 2015
3 commits
01 Oct, 2015
2 commits
-
Also %s/will_paginate/pagination_links to use the default on forum, blog and cms Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Signed-off-by: Melissa Wen <melissa@colivre.coop.br>
30 Sep, 2015
1 commit
29 Sep, 2015
3 commits
26 Sep, 2015
3 commits
-
Keeped controllers/views structure
-
This reverts commit 83c318e66c66d82671cccaf3acc7f29c2bacf8d2.
25 Sep, 2015
2 commits
-
With some translations the view all button gets overlaped by the title.
24 Sep, 2015
1 commit
-
Additional improvements include: - Makes 'Remove Image' checkbox optional - Very ugly css hack to hide duplicated labels in some forms. I couldn't find another way to avoid the labels generated by labelled_form_for nor could I skip adding labels inside the helper since it's supposed to be generic.