02 Oct, 2015

1 commit


04 Sep, 2015

1 commit


11 Aug, 2015

1 commit


31 Jul, 2015

1 commit


19 Jun, 2015

1 commit


22 Feb, 2015

1 commit


11 Feb, 2015

1 commit


26 Jan, 2015

1 commit


13 May, 2014

1 commit

  • Conflicts:
    	app/helpers/application_helper.rb
    	app/helpers/layout_helper.rb
    	app/models/community.rb
    	app/models/enterprise.rb
    	app/models/product_category.rb
    	app/views/account/change_password.html.erb
    	config/boot.rb
    	config/environment.rb
    	config/routes.rb
    	lib/noosfero/plugin.rb
    	test/unit/enterprise_activation_test.rb
    	test/unit/person_notifier_test.rb
    Rodrigo Souto
     

03 Apr, 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
    Rodrigo Souto
     

03 Feb, 2014

1 commit


20 Jan, 2014

1 commit


09 Oct, 2013

1 commit


05 Sep, 2013

1 commit


15 Jul, 2013

1 commit


27 Feb, 2013

1 commit


12 Dec, 2012

1 commit


11 Dec, 2012

2 commits


18 Oct, 2012

1 commit


17 Aug, 2012

1 commit


25 May, 2012

1 commit


19 May, 2012

1 commit


05 May, 2012

1 commit


17 Apr, 2012

1 commit


15 Apr, 2012

2 commits


04 Apr, 2012

1 commit


03 Apr, 2012

1 commit


15 Mar, 2012

1 commit


13 Mar, 2012

1 commit


24 Feb, 2012

2 commits


20 Feb, 2012

1 commit


19 Feb, 2012

2 commits


09 Feb, 2012

1 commit


06 Feb, 2012

1 commit


04 Jan, 2012

1 commit