02 Apr, 2014
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/categories_block.feature po/eo/noosfero.po po/es/noosfero.po po/it/noosfero.po test/unit/block_test.rb
01 Apr, 2014
1 commit
26 Mar, 2014
1 commit
-
(ActionItem3063)
20 Mar, 2014
1 commit
-
Conflicts: app/views/themes/index.rhtml db/schema.rb plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb test/unit/person_test.rb
19 Mar, 2014
1 commit
18 Mar, 2014
1 commit
-
Also included tests for meta tags and removed not-needed tests (ActionItem2610)
28 Jan, 2014
1 commit
-
…pa/noosfero-AI2786-like
19 Jan, 2014
2 commits
-
- Added pagination to versions - Treating access denied and not found (ActionItem2822)
18 Jan, 2014
2 commits
-
(ActionItem2822) Signed-off-by: Daniela Feitosa Signed-off-by: Ana Losnak <analosnak@gmail.com> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
03 Jan, 2014
1 commit
16 Dec, 2013
1 commit
-
…into merge-requests/425
03 Dec, 2013
1 commit
-
AI2824
02 Dec, 2013
1 commit
27 Nov, 2013
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
22 Nov, 2013
2 commits
-
(ActionItem2829)
19 Sep, 2013
1 commit
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
25 Jul, 2013
1 commit
23 Jul, 2013
1 commit
16 Jul, 2013
1 commit
-
…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
1 commit
-
…into merge-requests/283 Conflicts: test/unit/comment_test.rb
12 Jul, 2013
2 commits
-
Removing obsolete FIXME's, trailing whitespaces and so.
08 Jul, 2013
2 commits
28 Jun, 2013
1 commit
27 Jun, 2013
1 commit
14 May, 2013
1 commit
09 May, 2013
1 commit
17 Apr, 2013
2 commits
-
Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb
16 Apr, 2013
1 commit
27 Mar, 2013
1 commit
20 Feb, 2013
2 commits
-
…that uses the macro support
07 Oct, 2012
2 commits
-
- Added render_not_found screen when comment id doesn't exist - Displaying message when trying to edit a comment from other page - Fixed a test on ToleranceTimePlugin
-
…into merge-requests/213 Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb app/views/content_viewer/_comment.rhtml app/views/content_viewer/view_page.rhtml lib/noosfero/plugin.rb test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb