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
24 Nov, 2013
1 commit
-
(ActionItem2899)
22 Nov, 2013
3 commits
-
(ActionItem2829)
-
Since there are plugins that need to receive the scope clean (that is without filters applied to it) and since the plugin has the power to not apply the filter when conveys it (also rewriting the interface to keep its consistency), I decided to pass the reposability of applying any filter provided by the core to the engines. Nevertheless, if the plugin returns nil (that's the same that it would return if it was disabled) the core will deal with the filters through the default way (that is without any engine).
21 Nov, 2013
2 commits
20 Nov, 2013
1 commit
-
The comments and replies are fetched only after the View all and More links are clicked.
07 Oct, 2013
1 commit
-
…into merge-requests/328 Conflicts: app/controllers/public/catalog_controller.rb
19 Sep, 2013
1 commit
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
29 Jul, 2013
1 commit
-
(ActionItem2471)
16 Jul, 2013
3 commits
-
Fixing the js method and also correcting the controller orders to calculate the total count.
-
…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
13 Jul, 2013
2 commits
-
Also renaming dispatch_plugins to fetch_plugins and first_plugin to fetch_first_plugin
-
…into merge-requests/283 Conflicts: test/unit/comment_test.rb
12 Jul, 2013
9 commits
-
About the FIXME on the helper, I guess it can't hurt to support css class throught the options parameter.
-
…into merge-requests/282
11 Jul, 2013
3 commits
-
…into merge-requests/323
-
…into merge-requests/301
-
…into merge-requests/264 Conflicts: app/controllers/public/catalog_controller.rb app/views/catalog/index.rhtml
08 Jul, 2013
2 commits
28 Jun, 2013
1 commit
27 Jun, 2013
1 commit
01 Jun, 2013
1 commit
-
The disable_* settings for environment are incoherent with the user interface and with the code itself. This changes correct only one incoherent setting as an example how to do with all others.
27 May, 2013
1 commit
-
closes ActionItem2387
23 May, 2013
1 commit
22 May, 2013
1 commit
-
Moving solr specifics to the plugin