20 Feb, 2014

1 commit

11 Feb, 2014

1 commit

  • e9fea38f   Merge branch 'master' into rails3-merge ... Browse File » 
    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
    Rodrigo Souto
     

05 Feb, 2014

1 commit

31 Jan, 2014

1 commit

30 Jan, 2014

1 commit

  • de0aceaa   rails3: fix assert_kind_of Array ... Browse File » 
    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.
    Victor Costa
     

29 Jan, 2014

1 commit

23 Jan, 2014

1 commit

22 Jan, 2014

1 commit

20 Jan, 2014

1 commit

13 Jan, 2014

1 commit

02 Dec, 2013

1 commit

27 Nov, 2013

1 commit

26 Nov, 2013

1 commit

21 Nov, 2013

4 commits

20 Nov, 2013

1 commit

16 Nov, 2013

2 commits

18 Oct, 2013

1 commit

07 Oct, 2013

2 commits

19 Sep, 2013

1 commit

12 Sep, 2013

1 commit

21 Aug, 2013

1 commit

20 Aug, 2013

1 commit

13 Aug, 2013

1 commit

11 Jul, 2013

2 commits

01 Jun, 2013

1 commit

27 Mar, 2013

1 commit

05 Mar, 2013

1 commit

08 Jan, 2013

1 commit

19 Dec, 2012

1 commit

15 Nov, 2012

1 commit

04 Nov, 2012

2 commits

24 Oct, 2012

2 commits