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
     

18 Jan, 2014

1 commit

25 Dec, 2012

1 commit

24 Dec, 2011

1 commit

27 Sep, 2011

1 commit

18 Jan, 2011

2 commits

12 May, 2010

1 commit

  • 688faaee   Fields verification filters malformed html correctly ... Browse File » 
    * The field verification now occurs before de validation.
	* Fields that uses the full filter escape residual '<' and '>' after
	  filtering wellformed tags.
	* Fields that uses white_list filter only escape the '<' and '>'
	  symbols if the tag is not wellformed.
	* This patch only fixes the fields that were before being
	  filtered. A full field verification is need to check the way each
	  field must be filtered.

(ActionItem1491)
    Rodrigo Souto
     

11 May, 2009

1 commit

29 Apr, 2008

1 commit

03 Jan, 2008

1 commit