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
06 Feb, 2014
2 commits
05 Feb, 2014
4 commits
04 Feb, 2014
3 commits
03 Feb, 2014
3 commits
-
Change the way of sending signup mail
31 Jan, 2014
3 commits
30 Jan, 2014
4 commits
-
On rails 3.2, the return type of some queries changes from Array to ActiveRecord::Relation. An assertion that check if these attributes has been assigned (with a value != nil) should be enought. This avoids future problems with api changes.
-
Output fields_for tags
29 Jan, 2014
8 commits
-
This method was removed by ca5ebf95375cd5dbb80a047dc79f4c31e36df899 and was mistakenly included on this merge 4ad91064632c8c1f5483a559d158d96b93e1a3c6 due to this fix 70c90e476a2a263639d13654564b8ea9db30a911. Also its tests weren't removed.
-
will_paginate returns an ActiveRecord::Relation, so count will do a 'select count' in db. Use size instead. https://github.com/mislav/will_paginate/wiki/Backwards-incompatibility#willpaginatecollection
-
Not sure if compute_public_path should be replaced by a simple File.join. Consider the use of asset_path if the current solution isn't safe.
28 Jan, 2014
7 commits
-
…into merge-requests/366 Conflicts: INSTALL script/install-dependencies/debian-squeeze.sh
-
ActionItem1011
-
Signed-off-by: Ana Losnak <analosnak@gmail.com> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> ActionItem1011
-
…pa/noosfero-AI2786-like
27 Jan, 2014
2 commits
-
getterm (and __) was replaced by _ (commit 86ecb14f)
23 Jan, 2014
3 commits
-
…sub_organizations_improvements
-
Conflicts: public/stylesheets/application.css
