17 Jan, 2013

1 commit

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

03 Jan, 2013

1 commit

03 Dec, 2012

1 commit

27 Nov, 2012

1 commit

04 Nov, 2012

1 commit

27 Oct, 2012

1 commit

25 Oct, 2012

1 commit

24 Oct, 2012

1 commit

22 Oct, 2012

1 commit

  • 7843b795   Generic Settings for Plugins ... Browse File » 
    This patch extends the infra developed on the spaminator branch to build
generic settings for plugin by allowing the setting to be instatiated
with any model that supports settings (and respond to the method
settings).

This way a plugin can have any number of settings over any model
instance like a Profile or an Article and not only the Environment.

!! This might conflict with the commit that introduces this idea !!
!! The commit is 7afc68410de26905e442714857effa3e3a13ad1a        !!
    Rodrigo Souto
     

13 Sep, 2012

1 commit

24 Aug, 2012

2 commits

21 Aug, 2012

4 commits

19 Aug, 2012

1 commit

17 Aug, 2012

1 commit

15 Aug, 2012

2 commits

08 Aug, 2012

1 commit

07 Aug, 2012

1 commit

20 Jul, 2012

1 commit

19 Jul, 2012

1 commit

  • 75524307   Merging AI1826 with master ... Browse File » 
    Conflicts:
	app/models/article.rb
	app/models/profile.rb
	app/models/uploaded_file.rb
	public/javascripts/application.js
	public/stylesheets/application.css
	test/unit/article_test.rb
	test/unit/category_finder_test.rb
	test/unit/enterprise_test.rb
    Daniela Feitosa
     

18 Jul, 2012

1 commit

05 Jul, 2012

1 commit

  • 32ea7f36   Adding new hotspots ... Browse File » 
      1. organization_members: allows plugins to extend the list of members of
  an organization.

  2. has_permission?: allows plugins to add permission to some user to
  perform some action over a profile or environment. This hotspot only
  allows plugins to expand access, not to revoke access.

  3. new_community_hidden_fields and
  enterprise_registration_hidden_fields: allows plugins to include new
  hidden fields in the following forms.

  * Also including a monkey patch to include some features from the gem
    fake_arel that requires activesupport-2.3.14 and
    activerecord-2.3.14. This them allows OR with scopes without loading
    them.
    Rodrigo Souto
     

15 Jun, 2012

1 commit

20 May, 2012

1 commit

19 May, 2012

1 commit

17 May, 2012

1 commit

05 May, 2012

1 commit

15 Apr, 2012

2 commits

05 Apr, 2012

1 commit

03 Apr, 2012

2 commits

20 Feb, 2012

1 commit

19 Feb, 2012

1 commit

  • 50def845   Merge remote branch 'noosfero-bsc/new-search-merge' ... Browse File » 
    Conflicts:
	app/controllers/application.rb
	app/controllers/public/browse_controller.rb
	app/helpers/application_helper.rb
	app/helpers/display_helper.rb
	app/models/environment_finder.rb
	app/models/product.rb
	app/views/layouts/_javascript.rhtml
	app/views/layouts/application-ng.rhtml
	public/javascripts/application.js
	public/stylesheets/application.css
	test/functional/browse_controller_test.rb
	test/functional/search_controller_test.rb
	vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
    Rafael Martins
     

27 Jan, 2012

1 commit

24 Jan, 2012

1 commit