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
1 commit
-
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
25 Nov, 2013
1 commit
-
(ActionItem2748)
24 Nov, 2013
1 commit
-
…into merge-requests/414
23 Nov, 2013
1 commit
-
…into merge-requests/418
22 Nov, 2013
2 commits
21 Nov, 2013
5 commits
-
Also includes migration to remove already orphaned profiles. (ActionItem2906)
-
Also allowing the expire of cache from old layouts
20 Nov, 2013
2 commits
17 Nov, 2013
1 commit
-
…into merge-requests/400
16 Nov, 2013
2 commits
-
(ActionItem2795)
-
…into merge-requests/373
12 Nov, 2013
1 commit
07 Nov, 2013
1 commit
06 Nov, 2013
1 commit
05 Nov, 2013
1 commit
-
Conflicts: script/quick-start test/unit/application_helper_test.rb test/unit/environment_statistics_block_test.rb test/unit/environment_test.rb
04 Nov, 2013
1 commit
-
Render container block box and do not override children boxes makes drag and drop functional. Also fix article block to not use direct box attribute and use owner method instead.
31 Oct, 2013
4 commits
-
This solves every problem related with Hpticot breaking pages since the parse was happening on the MainBlock too. But this does not changes the fact tha Hpricot is currently dead and we should move on to nokogiri. (ActionItem2873)
30 Oct, 2013
1 commit
29 Oct, 2013
1 commit
25 Oct, 2013
1 commit
24 Oct, 2013
1 commit
16 Oct, 2013
1 commit
-
* Adding tests for the new location method * Moving tests from profile_helper_test to profile_test * Rewriting tests of profile_helper_test
14 Oct, 2013
1 commit
-
ActionItem2691
10 Oct, 2013
1 commit
09 Oct, 2013
1 commit
-
Signed-of-by: Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com> Signed-of-by: Rafael de Souza Queiroz <querafael@live.com>
07 Oct, 2013
4 commits
-
…into merge-requests/328 Conflicts: app/controllers/public/catalog_controller.rb
-
Conflicts: app/views/cms/view.rhtml test/functional/profile_controller_test.rb