30 Jun, 2014

1 commit


29 May, 2014

1 commit


23 May, 2014

1 commit


22 May, 2014

1 commit


19 May, 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
     

06 Feb, 2014

1 commit


15 Jan, 2014

1 commit

  • (ActionItem2513)
    
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Tales Martins <tales.martins@gmail.com>
    Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Arthur Del Esposte
     

07 Jan, 2014

1 commit


16 Dec, 2013

1 commit


24 Nov, 2013

1 commit


27 Sep, 2013

1 commit


19 Sep, 2013

1 commit


08 Jul, 2013

1 commit


01 Jul, 2013

1 commit


28 Jun, 2013

3 commits


27 Jun, 2013

1 commit


17 Apr, 2013

1 commit


15 Apr, 2013

1 commit


11 Apr, 2013

1 commit


10 Apr, 2013

1 commit


22 Mar, 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
     

12 Mar, 2013

1 commit


22 Feb, 2013

1 commit


20 Feb, 2013

1 commit


25 Dec, 2012

1 commit


12 Dec, 2012

1 commit


06 Nov, 2012

1 commit


21 Oct, 2012

1 commit


01 Oct, 2012

1 commit


30 Sep, 2012

1 commit


28 Sep, 2012

1 commit


11 Sep, 2012

1 commit


21 Aug, 2012

2 commits


15 Aug, 2012

1 commit

  •   I did a little refactor in the already existent script to
      limited_text_area so the part that grows the textarea can be reused
      elsewhere, e.g. the comment box in the wall.
    
      Since I was modifying the limited_text_area function again, I re-did
      here the fix to the bug in Chrome browsers where the textarea would
      grow with every key press. So this merge request also fix the
      ActionItem2288.
    
    (ActionItem2405)
    Larissa Reis
     

31 Jul, 2012

1 commit