05 Dec, 2013
1 commit
-
…into merge-requests/413
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
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
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
25 Nov, 2013
1 commit
-
(ActionItem2748)
22 Nov, 2013
4 commits
21 Nov, 2013
3 commits
-
The numbers of categories are part of the classes names. Probably, those numbers are being used in some environment and we don't want to break those environments
-
Also allowing the expire of cache from old layouts
20 Nov, 2013
3 commits
16 Nov, 2013
3 commits
-
(ActionItem2903)
-
(ActionItem2901)
12 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
1 commit
-
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)
18 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
15 Oct, 2013
1 commit
-
…into merge-requests/391
12 Oct, 2013
1 commit
-
This limit the listing to the 5 most popular communities to avoid making it unbearable to users that create a lot of communities.
07 Oct, 2013
5 commits
-
Conflicts: app/views/cms/view.rhtml test/functional/profile_controller_test.rb
03 Oct, 2013
1 commit
19 Sep, 2013
6 commits
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
-
* The first_impl method was already implemented as dispatch_first (which was probably incorporated after this request was done). But I utilized the idea proposed here to use the default value for the hotspot instead of nil. * I changed the hotspot to pass all the parameters passed to the method since it might be useful for the plugins in the future. (ActionItem2666) -
…into merge-requests/313
-
…into merge-requests/295
09 Aug, 2013
1 commit
-
ActionItem2752