21 May, 2015
1 commit
-
Conflicts: app/views/content_viewer/_article_toolbar.html.erb
13 May, 2015
1 commit
-
Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
12 May, 2015
2 commits
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
08 May, 2015
6 commits
-
- Fixed search method for members - Fixed headings and misplaced divs - Fixed tests for better reliability
-
Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
-
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
-
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
-
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
07 May, 2015
1 commit
-
Conflicts: test/unit/boxes_helper_test.rb
27 Apr, 2015
2 commits
-
Conflicts: test/unit/block_test.rb
24 Apr, 2015
2 commits
13 Apr, 2015
1 commit
-
Conflicts: config.ru lib/noosfero/plugin.rb
06 Apr, 2015
1 commit
-
This reverts commit b17cbf221f90477b52622fdef03e4917dc3f12fe. Conflicts: app/controllers/my_profile/profile_editor_controller.rb app/views/profile_editor/edit.html.erb plugins/pairwise plugins/proposals_discussion
24 Mar, 2015
1 commit
23 Mar, 2015
1 commit
-
It resolves issue #38 Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
11 Mar, 2015
2 commits
-
Conflicts: app/controllers/box_organizer_controller.rb app/controllers/my_profile/profile_design_controller.rb app/helpers/box_organizer_helper.rb app/helpers/boxes_helper.rb app/helpers/layout_helper.rb app/models/block.rb app/models/communities_block.rb app/models/theme.rb app/views/box_organizer/index.html.erb app/views/box_organizer/show_block_type_info.html.erb test/functional/environment_design_controller_test.rb test/functional/profile_design_controller_test.rb
10 Mar, 2015
1 commit
-
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>
06 Mar, 2015
1 commit
27 Feb, 2015
1 commit
25 Feb, 2015
1 commit
20 Feb, 2015
1 commit
04 Feb, 2015
1 commit
-
Conflicts: app/controllers/public/search_controller.rb app/models/profile.rb app/views/cms/edit.html.erb public/stylesheets/application.css
03 Feb, 2015
1 commit
-
Conflicts: app/controllers/my_profile/profile_editor_controller.rb app/helpers/search_helper.rb app/models/invitation.rb app/models/person.rb app/views/cms/view.html.erb app/views/templates/index.html.erb plugins/community_track/views/content_viewer/_step_item.html.erb test/functional/home_controller_test.rb test/unit/person_test.rb test/unit/profile_test.rb
02 Feb, 2015
2 commits
30 Jan, 2015
1 commit
29 Jan, 2015
3 commits
-
This reverts commit 853cc8ef357b5eeb2d25cf586fb96bbeab36a785, reversing changes made to a0ef4f259127426b96f8a8ba2bbb2c18c67bf980. This reverts commit b8304468ef6de86accdfd442c889f30b2fdd9539, reversing changes made to ed4938b5272fb57a714c84c3443c7d329c9407aa. This reverts commit 77ee15d0896424d4c02de0a61ad8922e5b38304c, reversing changes made to b52c66dba90218f9dd21b10dee85e293ccf52aa7. This reverts commit a0ef4f259127426b96f8a8ba2bbb2c18c67bf980, reversing changes made to 5c4d0723fb8977e29f0e208e6d3c609933281cec.
28 Jan, 2015
3 commits
-
Conflicts: app/helpers/article_helper.rb app/helpers/boxes_helper.rb app/models/article.rb app/models/block.rb app/views/content_viewer/view_page.html.erb db/schema.rb plugins/community_track/views/blocks/_track_list_more.html.erb plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb public/javascripts/article.js test/unit/block_test.rb test/unit/person_notifier_helper_test.rb
-
Bug fix from action item #3025
27 Jan, 2015
1 commit
-
Now all tests pass. A couple aditional changes: - Replacing flash notice for session notice; - Cancel a task if it fails. A task can fail for many reasons, including for validation, so I thought it would make sense to cancel a task to publish an article if it fails. For example if the title is too big validation will fail, the task will fail and the user will get a message saying publish request couldn't be sent, so naturally the user will try to publish again, hopefully this time succeding.
22 Jan, 2015
2 commits
-
Work assignment master rebase The last version of the Work Assignment plugin, increased by Universidade de Brasília team. The plugin purpose is to keep versioned files, result of a work and to notify people by email about new uploaded files. Users can also change the visibility of their files, if the feature is set on Work Assignment settings. See merge request !420
-
Always allow admin to change profiles homepage See merge request !412