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
3 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
7 commits
-
…into merge-requests/331
-
…into merge-requests/323
-
…into merge-requests/301
-
…into merge-requests/291
-
…into merge-requests/287 Conflicts: app/models/environment.rb
-
…into merge-requests/285
-
…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
10 Jun, 2013
1 commit
-
ActionItem2675
27 May, 2013
1 commit
-
closes ActionItem2387
23 May, 2013
1 commit
22 May, 2013
1 commit
-
Moving solr specifics to the plugin
15 May, 2013
1 commit
07 May, 2013
1 commit
-
Conflicts: app/models/article.rb app/views/layouts/application-ng.rhtml lib/noosfero/plugin.rb script/noosfero-plugins
24 Apr, 2013
1 commit
-
…into merge-requests/259 Conflicts: app/controllers/admin/environment_design_controller.rb
20 Apr, 2013
1 commit
17 Apr, 2013
1 commit
-
Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb
11 Apr, 2013
1 commit
05 Apr, 2013
2 commits
-
ActionItem2217
