28 Jan, 2015
1 commit
-
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
27 Jan, 2015
1 commit
-
Ai3297 class community Fix the reviewed code in https://gitlab.com/noosfero/noosfero/merge_requests/348 See merge request !404
26 Jan, 2015
16 commits
-
Conflicts: plugins/comment_paragraph/public/style.css
-
…lder to avoid conflicts
-
…lder to avoid conflicts
-
Conflicts: plugins/comment_paragraph/lib/ext/article.rb plugins/comment_paragraph/public/comment_paragraph_macro.js plugins/comment_paragraph/public/style.css plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb
23 Jan, 2015
2 commits
22 Jan, 2015
5 commits
-
- Moved EmailContact class from ext directory to plugin scope - Refactored Work Assignment Plugin to accept general articles instead of only uploaded files - Protecting methods that are not supposed to be actions Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Hebert Douglas <hebertdougl@gmail>
-
Conflicts: plugins/comment_paragraph/public/comment_paragraph_macro.js plugins/comment_paragraph/public/style.css plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb
21 Jan, 2015
15 commits
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
-
Conflicts: plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb
-
- Changed methods and variable names. - Created work_assignment_plugin_myprofile_controller and undone the cms_controller extension - Fixed the tests to fit the new structure Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
-
- Changed article_extra_fields hotspot name to upload_files_extra_fields - Fixed some code spacing. - Fixed uploaded file filter on plugin class - Fixed after_validation filter on UploadedFile plugin extension class Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Hebert Douglas <hebertdougl@gmail>
-
- Written tests of work_assignment cms controller. - Fixed failures on unit tests - Removed empy lines, spaces and useless code. - Fixing bugs on edit_visibility filters Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Hebert Douglas <hebertdougl@gmail>
-
Changed privacy edition box to open on a new page. Fixed cancel buttom to redirect to back page. Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com> -
Refactored Cms Controller inheritance on Work Assignment Plugin. Added a new method on Cms controller that is extended on Work Assignment Plugin and can allow a plugin action to by pass the static before filter generated on Cms that denies any other actions outside it's list. Added a before filter on plugin cms controller that allows the visibility edition only for the article author and admins. Signed-off-by Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Arhur Del Esposte <arthurmde@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
-
- Refactored the name of the action to edit_visibility - Refactored edit_visibility behavior to apply privacy to also the Folder's children - Fixed bug on plugin content_viewer filter not passing the right path of article Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
-
- Added privacy button to work_Assignment uploaded files - Added style for privacy options - Applying privacy permitions on Uploaded Files Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
-
- Removed class Person on Work Assignment Plugin. - Fixed rails3 file extension on functional Tests. - changed the email_contact 'from' to be the environment email. - Changed notification text field to show the user email by default Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com> Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
-
Added default email message attribute to be sent when user choose to notify somebody. Refactored build_email_message method that attaches the URL of the uploaded files to the email message. Added Java Script to fill in the email field with an example. Removed destroy action method on plugin cms controller, now using the existent in the core cms controller.
-
Added filters to cms controller to send email Removed unecessary dispatch on cms controller Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
