17 Aug, 2012

1 commit


15 Aug, 2012

2 commits


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


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


09 Dec, 2011

1 commit


27 Nov, 2011

1 commit

  • Conflicts:
    	app/controllers/admin_controller.rb
    	app/controllers/application.rb
    	app/controllers/public/account_controller.rb
    	app/controllers/public/content_viewer_controller.rb
    	lib/noosfero/i18n.rb
    	test/functional/account_controller_test.rb
    	test/functional/admin_controller_test.rb
    	test/unit/contact_test.rb
    	test/unit/profile_test.rb
    Antonio Terceiro
     

01 Nov, 2011

1 commit


11 Oct, 2011

1 commit


10 Oct, 2011

1 commit

  • * 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
     

04 May, 2011

1 commit


03 Apr, 2011

1 commit


22 Mar, 2011

2 commits


02 Mar, 2011

1 commit