13 Jan, 2014
1 commit
-
(ActionItem2871)
30 Dec, 2013
1 commit
13 Dec, 2013
2 commits
-
Enable options to display the main block at all pages and all pages except in the homepage.
12 Dec, 2013
2 commits
-
(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>
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
22 Nov, 2013
4 commits
-
(ActionItem2829)
-
(ActionItem2887)
16 Nov, 2013
2 commits
-
(ActionItem2901)
06 Nov, 2013
1 commit
04 Nov, 2013
1 commit
01 Nov, 2013
1 commit
18 Oct, 2013
1 commit
14 Oct, 2013
1 commit
-
ActionItem2691
07 Oct, 2013
2 commits
-
…into merge-requests/328 Conflicts: app/controllers/public/catalog_controller.rb
-
Conflicts: app/views/cms/view.rhtml test/functional/profile_controller_test.rb
19 Sep, 2013
2 commits
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
-
…into merge-requests/295
12 Sep, 2013
1 commit
-
…into merge-requests/361
22 Aug, 2013
1 commit
21 Aug, 2013
1 commit
20 Aug, 2013
3 commits
13 Aug, 2013
1 commit
-
(ActionItem2768)
25 Jul, 2013
1 commit
23 Jul, 2013
1 commit
17 Jul, 2013
1 commit
-
(ActionItem2737)
16 Jul, 2013
1 commit
-
…into merge-requests/343 Also replacing the load_comments method by a filter that receives a scope. Conflicts: app/controllers/public/content_viewer_controller.rb app/models/comment.rb app/views/content_viewer/view_page.rhtml test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb
15 Jul, 2013
1 commit