02 Jan, 2014
2 commits
18 Dec, 2013
6 commits
-
Conflicts: plugins/display_content/lib/display_content_block.rb
-
… into order-attributes
-
Conflicts: test/unit/profile_test.rb
16 Dec, 2013
10 commits
-
Conflicts: test/unit/article_test.rb
13 Dec, 2013
3 commits
-
(ActionItem2910) Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Rafael de Souza Queiroz <querafael@live.com>
-
(ActionItem2838)
12 Dec, 2013
2 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>
10 Dec, 2013
1 commit
05 Dec, 2013
2 commits
-
…into merge-requests/413
02 Dec, 2013
2 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
2 commits
-
Also: - Removed unused code - Fixed identation (ActionItem2587)
-
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
3 commits
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
26 Nov, 2013
2 commits
25 Nov, 2013
5 commits
-
(ActionItem2875)
-
- Added translation markup - Fixed indentation - css of link (ActionItem2875)
-
(ActionItem2875)
-
…into merge-requests/417
-
(ActionItem2748)