30 Nov, 2012

1 commit

04 Nov, 2012

3 commits

25 Oct, 2012

1 commit

21 Oct, 2012

1 commit

13 Sep, 2012

1 commit

11 Sep, 2012

1 commit

05 Sep, 2012

1 commit

29 Aug, 2012

1 commit

24 Aug, 2012

1 commit

21 Aug, 2012

1 commit

07 Aug, 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
     

05 Jul, 2012

2 commits

  • ecc6a631   Allowing members_of to receive an array of organization Browse File »
    Rodrigo Souto
     
  • 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
     

22 Jun, 2012

1 commit

21 Jun, 2012

1 commit

17 May, 2012

1 commit

22 Mar, 2012

1 commit

24 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

3 commits

24 Jan, 2012

1 commit

19 Jan, 2012

1 commit

16 Jan, 2012

2 commits

10 Jan, 2012

1 commit

24 Dec, 2011

3 commits

22 Nov, 2011

1 commit

14 Nov, 2011

1 commit

01 Nov, 2011

1 commit

11 Oct, 2011

1 commit

10 Oct, 2011

1 commit

  • 619223c6   Bsc Plugin ... Browse File » 
    * Refactoring profile management to use tokeninput
  * Also, adding support of tokeninput to the core
* Adding attributes validated and cnpj to enterprise
* Environment option to define enterprise as validated by defaul
* Making profile namedscopes consider subclasses too
* Adapting enterprise icon and identification to meet Bsc expectations
* Adapting profile info actions to meet Bsc expectations
* Adapting control panel buttons to meet Bsc expectations
* Adapting core product to meed Bsc expectations
* Adding and fixing plugin hotspots

(ActionItem2085, ActionItem2087, ActionItem2086, ActionItem2088)
    Rodrigo Souto
     

27 May, 2011

1 commit

28 Mar, 2011

1 commit

  • 52b357dc   English review ... Browse File » 
    Thanks to professor Fabio Kon from USP for the heads up.

Note that this patch changes only the labels used for the fields, but
does not touch the actual field names.
    Antonio Terceiro