31 Jul, 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
     

08 Apr, 2014

1 commit


26 Feb, 2014

1 commit


23 Apr, 2013

1 commit


16 Apr, 2013

1 commit


15 Apr, 2013

3 commits


12 Apr, 2013

1 commit


10 Apr, 2013

1 commit


05 Apr, 2013

2 commits


14 Mar, 2013

2 commits


07 Mar, 2013

1 commit


04 Mar, 2013

1 commit


18 Feb, 2013

1 commit


30 Jan, 2013

2 commits


26 Jan, 2013

3 commits


23 Jan, 2013

1 commit


22 Jan, 2013

1 commit


19 Jan, 2013

1 commit


17 Jan, 2013

1 commit

  • Conflicts:
    	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
    	plugins/shopping_cart/lib/shopping_cart_plugin.rb
    	plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb
    	plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
    	plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
    	plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
    Rodrigo Souto
     

16 Jan, 2013

1 commit


15 Jan, 2013

1 commit


03 Jan, 2013

3 commits


02 Jan, 2013

3 commits


27 Dec, 2012

1 commit


25 Dec, 2012

3 commits


23 Dec, 2012

1 commit