08 Apr, 2016

1 commit


05 Dec, 2015

1 commit


21 Nov, 2015

1 commit


02 Oct, 2015

1 commit


01 Oct, 2015

2 commits


01 Aug, 2015

1 commit


24 Jul, 2015

1 commit


14 Jun, 2015

1 commit


07 Aug, 2014

1 commit

  • Hopefully this is the very last time we do this.
    
    Conflicts:
    	Rakefile
    	app/controllers/my_profile/cms_controller.rb
    	app/controllers/public/content_viewer_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/content_viewer_helper.rb
    	app/models/article.rb
    	app/models/enterprise.rb
    	app/models/product_categories_block.rb
    	app/models/products_block.rb
    	app/views/account/_signup_form.rhtml
    	app/views/blocks/my_network.rhtml
    	app/views/blocks/profile_info.rhtml
    	app/views/blocks/profile_info_actions/_community.html.erb
    	app/views/blocks/profile_info_actions/_enterprise.html.erb
    	app/views/blocks/profile_info_actions/_person.html.erb
    	app/views/content_viewer/view_page.rhtml
    	app/views/profile/index.rhtml
    	app/views/shared/_disabled_enterprise.html.erb
    	app/views/shared/articles_list.html.erb
    	db/schema.rb
    	debian/changelog
    	lib/file_presenter.rb
    	lib/noosfero.rb
    	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
    	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
    	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
    	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
    	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
    	public/javascripts/application.js
    	script/sample-articles
    	script/sample-enterprises
    	script/sample-products
    	script/sample-profiles
    	test/functional/cms_controller_test.rb
    	test/functional/comment_controller_test.rb
    	test/functional/content_viewer_controller_test.rb
    	test/unit/application_helper_test.rb
    	test/unit/article_test.rb
    	test/unit/content_viewer_helper_test.rb
    	test/unit/folder_helper_test.rb
    	test/unit/forum_helper_test.rb
    Antonio Terceiro
     

05 Jun, 2014

1 commit


04 Jun, 2014

1 commit


13 May, 2014

1 commit


12 May, 2014

1 commit


24 Apr, 2014

1 commit


22 Jan, 2014

1 commit


26 Nov, 2013

1 commit


22 Nov, 2013

1 commit


21 Aug, 2013

1 commit


15 Jul, 2013

1 commit


11 Apr, 2013

1 commit


20 Mar, 2013

1 commit

  • This commit, with the participation of Lucas Melo, does:
    
    * Make action list from ShoppingCartPluginController Fault-tolerant.
    * Create a basic logging system and replace debug alerts.
    * Limit the cart size to protect against cookie limit.
    * Add more loading style possibilities.
    * Add a little fault-tolerance to the process of loading the carts items.
    * Force colorbox to "Shopping checkout" button.
    * Add L10n to Cart JS interaction.
    Aurélio A. Heckert
     

17 Jan, 2013

2 commits


02 Jan, 2013

1 commit


28 Dec, 2012

9 commits


27 Dec, 2012

1 commit


14 Nov, 2012

1 commit


13 Nov, 2012

1 commit


12 Nov, 2012

1 commit


22 Oct, 2012

1 commit


16 Jul, 2012

1 commit