25 Apr, 2016

1 commit

21 Nov, 2015

1 commit

02 Oct, 2015

1 commit

01 Oct, 2015

1 commit

13 Sep, 2015

1 commit

17 Jun, 2015

1 commit

14 Jun, 2015

1 commit

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

03 Sep, 2014

1 commit

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
     

12 May, 2014

1 commit

24 Apr, 2014

1 commit

30 Jul, 2013

1 commit

16 Apr, 2013

1 commit

17 Jan, 2013

1 commit

  • 8f69c31b   Merge branch 'redemoinho-improvements' ... Browse Dir » 
    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
     

28 Dec, 2012

2 commits

27 Nov, 2012

1 commit

13 Nov, 2012

1 commit

16 Aug, 2011

8 commits