08 Apr, 2016

1 commit

21 Nov, 2015

1 commit

01 Oct, 2015

1 commit

19 Aug, 2015

1 commit

  • 121912b3   Merge branch 'shopping-cart-with-orders-and-delivery-plugins' ... Browse Dir » 
    Conflicts:
	Gemfile
	app/models/profile.rb
	plugins/shopping_cart/lib/shopping_cart_plugin.rb
	plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
	plugins/shopping_cart/po/de/shopping_cart.po
	plugins/shopping_cart/po/es/shopping_cart.po
	plugins/shopping_cart/po/fr/shopping_cart.po
	plugins/shopping_cart/po/hy/shopping_cart.po
	plugins/shopping_cart/po/pt/shopping_cart.po
	plugins/shopping_cart/po/ru/shopping_cart.po
	plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb
	plugins/shopping_cart/views/cart.html.erb
	plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
	plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
    Rodrigo Souto
     

17 Jun, 2015

2 commits

14 Jun, 2015

1 commit

15 Jan, 2015

1 commit

  • d4587481   Deduplicate strings from plugins ... Browse Dir » 
    I have deduplicated every message in plugin code that was already in the
core. Going forward, plugins should use c_() is they want to reuse the
message from the core. If they want to force their own translation, they
should probably use _('plugin_name|The message') to avoid overriding
translations from the core.
    Antonio Terceiro
     

07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse Dir » 
    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
     

13 May, 2014

1 commit

24 Apr, 2014

1 commit

03 Oct, 2013

1 commit

  • 604eb3f6   plugins-infra: add infra support to core extensions ... Browse Dir » 
    The core extensions now should be created inside the folder lib/ext.
They will automatically loaded, so no need for the requires on the
plugin class definition file.

Further information on how to use this feature here:
http://noosfero.org/Development/PluginsArchitecture#Extending_core_classes
    Rodrigo Souto
     

22 Mar, 2013

1 commit

17 Jan, 2013

2 commits

28 Dec, 2012

3 commits

14 Nov, 2012

1 commit

13 Nov, 2012

1 commit

12 Nov, 2012

1 commit

22 Oct, 2012

3 commits

22 Jun, 2012

1 commit

  • dbf169ee   Fixes crash in shopping cart reports when product is removed ... Browse Dir » 
      Changes what's stored in PurchaseOrder so the product name is also stored,
  that way if the product is removed its name isn't lost.
  Uses a class named LineItem to encapsulate the information about an
  ordered product for clarification.
  Also fixes the views so it shows the product name but not the product url
  if the product was removed.

(ActionItem2362)
    Larissa Reis
     

05 Apr, 2012

1 commit

15 Feb, 2012

1 commit

09 Feb, 2012

1 commit

04 Jan, 2012

1 commit

26 Dec, 2011

1 commit

22 Dec, 2011

2 commits

18 Dec, 2011

2 commits

18 Oct, 2011

1 commit

22 Sep, 2011

2 commits

22 Aug, 2011

1 commit

17 Aug, 2011

2 commits