19 Jul, 2013
1 commit
-
Conflicts: app/helpers/boxes_helper.rb app/models/comment.rb app/views/comment/_comment.rhtml app/views/comment/_comment_form.rhtml app/views/content_viewer/_comment.html.erb app/views/content_viewer/_comment.rhtml app/views/content_viewer/_comment_form.html.erb app/views/content_viewer/_comment_form.rhtml app/views/profile/send_mail.html.erb config/routes.rb debian/control
17 Jul, 2013
5 commits
16 Jul, 2013
16 commits
-
Introducing bug (http://noosfero.org/Development/ActionItem2705) temporarily in order to avoid the performance issues associated with the necessary loading of all posts to run display_to?. When we develop a scoped way to retrieve this contents we then will be able to fix this bug. (ActionItem2706)
-
…into merge-requests/338
-
…into merge-requests/325
-
…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
7 commits
13 Jul, 2013
5 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
6 commits
-
These borders and shadow are breaking other colorboxes so I'm commenting them for now until the other cases are properly treated.