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
2 commits
-
Conflicts: test/unit/boxes_helper_test.rb
-
Add alternative redirect's behavior when user is '~' This is a new feature to create generic URL's related to usernames in Noosfero. It is useful for internal links on articles and for general links on themes. Examples: - If you're logged in as "test" and you go to /~/blog it will redirect you to /test/blog - If you're logged in as "test" and you go to /myprofile/~ it will redirect you to /myprofile/test - If you're not logged in and you go to /profile/~ or any other link using "~" it will give you a not found page(404). See merge request !518
27 Apr, 2015
3 commits
-
Conflicts: test/unit/block_test.rb
-
When the :profile parameter is '~', replace it with the identifier of the currently logged-in user and redirect. This is useful for example for adding direct links to the control panel of the current user in documentation. Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> 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>
24 Apr, 2015
3 commits
23 Apr, 2015
1 commit
22 Apr, 2015
2 commits
17 Apr, 2015
2 commits
16 Apr, 2015
1 commit
13 Apr, 2015
3 commits
-
Conflicts: config.ru lib/noosfero/plugin.rb
09 Apr, 2015
1 commit
08 Apr, 2015
5 commits
-
This reverts commit 82742464704b48dce6337fa31610da3db7a6bce4. This commit broke searches pagination when using solr
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
26 Mar, 2015
4 commits
-
Conflicts: app/helpers/layout_helper.rb
24 Mar, 2015
2 commits