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
    Rodrigo Souto
     

04 Feb, 2014

1 commit


30 Jan, 2014

2 commits


28 Jan, 2014

1 commit


27 Jan, 2014

1 commit


22 Jan, 2014

1 commit


20 Jan, 2014

1 commit


18 Jan, 2014

1 commit


15 Jan, 2014

3 commits


12 Dec, 2013

1 commit

  • (ActionItem2849)
    
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com
    Signed-off-by: Valéssio Brito <contato@valessiobrito.com.br>
    Signed-off-by: Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
    Marcos Ramos
     

27 Nov, 2013

1 commit


25 Nov, 2013

2 commits


20 Nov, 2013

1 commit


19 Sep, 2013

1 commit


30 Aug, 2013

2 commits


12 Jul, 2013

1 commit


11 Jul, 2013

2 commits


09 May, 2013

1 commit


07 May, 2013

1 commit


03 Apr, 2013

1 commit


20 Mar, 2013

1 commit


13 Mar, 2013

1 commit


06 Feb, 2013

1 commit


20 Dec, 2012

1 commit


07 Nov, 2012

1 commit


04 Nov, 2012

1 commit


01 Nov, 2012

3 commits


29 Oct, 2012

1 commit


25 Oct, 2012

3 commits