13 Feb, 2014
1 commit
11 Feb, 2014
1 commit
-
Conflicts: app/controllers/my_profile/cms_controller.rb app/controllers/public/content_viewer_controller.rb app/helpers/application_helper.rb app/helpers/article_helper.rb app/helpers/catalog_helper.rb app/helpers/comment_helper.rb app/models/article.rb app/models/enterprise.rb app/models/members_block.rb app/models/person.rb app/models/profile.rb app/views/blocks/profile_info.html.erb app/views/blocks/profile_info_actions/community.html.erb config/initializers/dependencies.rb config/routes.rb db/schema.rb debian/control lib/noosfero/plugin.rb lib/tasks/plugins.rake plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb script/sample-products test/functional/catalog_controller_test.rb test/functional/manage_products_controller_test.rb test/functional/map_balloon_controller_test.rb test/functional/profile_controller_test.rb test/functional/search_controller_test.rb test/unit/box_test.rb test/unit/cms_helper_test.rb test/unit/enterprise_test.rb test/unit/environment_test.rb test/unit/featured_products_block_test.rb test/unit/person_test.rb test/unit/product_category_test.rb test/unit/product_test.rb test/unit/profile_test.rb test/unit/user_test.rb vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb
04 Feb, 2014
1 commit
28 Jan, 2014
1 commit
-
…pa/noosfero-AI2786-like
27 Jan, 2014
1 commit
23 Jan, 2014
1 commit
22 Jan, 2014
1 commit
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