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

  • 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

  •   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

  • 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


19 Jan, 2012

1 commit


16 Jan, 2012

2 commits


09 Jan, 2012

1 commit


24 Dec, 2011

6 commits