07 Mar, 2014
1 commit
-
Conflicts: lib/noosfero/plugin/routes.rb plugins/container_block/test/unit/block_test.rb plugins/container_block/test/unit/environment_test.rb plugins/container_block/test/unit/profile_test.rb plugins/container_block/views/blocks/container.html.erb
25 Feb, 2014
1 commit
12 Feb, 2014
1 commit
18 Dec, 2013
2 commits
16 Dec, 2013
1 commit
13 Dec, 2013
2 commits
12 Dec, 2013
3 commits
-
…into merge-requests/410
-
(ActionItem2849) Signed-off-by: Marcos Ramos <ms.ramos@outlook.com Signed-off-by: Valéssio Brito <contato@valessiobrito.com.br> Signed-off-by: Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
09 Dec, 2013
1 commit
-
Although there are a lot of places on Noosfero where we do this test_helper ugly inclusion, they are just obsolete. Now we prefer to just include the test_helper and run the tests through rake tasks or including the path to the tests helper in the test run (something like: ruby -Itest ...).
05 Dec, 2013
1 commit
-
Whenever we are creating new models on plugins we should use the plugin's namespace to avoid future name conflicts.
02 Dec, 2013
3 commits
-
Conflicts: app/models/category.rb app/models/uploaded_file.rb test/functional/memberships_controller_test.rb test/functional/profile_controller_test.rb vendor/plugins/action_tracker_has_comments/init.rb
28 Nov, 2013
1 commit
-
Show events by month Event list now only show 10 events when listing events for month (events for a day still listing all events) Add information on indefined place Enhance layout (ActionItem2587) Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br> Signed-off-by: Luiz Matos <luizff.matos@gmail.com> Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com> Signed-off-by: Leandro Alves <leandrosustenido@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by; Gabriela Navarro <navarro1703@gmail.com>
27 Nov, 2013
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
26 Nov, 2013
2 commits
-
AI2784 Conflicts: vendor/plugins/action_tracker_has_comments/init.rb
25 Nov, 2013
3 commits
-
(ActionItem2875)
-
(ActionItem2875)
-
…into merge-requests/417
23 Nov, 2013
1 commit
-
…into merge-requests/418
22 Nov, 2013
4 commits
-
(ActionItem2829)
-
(ActionItem2887)
21 Nov, 2013
5 commits
20 Nov, 2013
2 commits
-
The comments and replies are fetched only after the View all and More links are clicked.
19 Nov, 2013
2 commits
16 Nov, 2013
3 commits
-
(ActionItem2903)
-
(ActionItem2901)