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

24 May, 2012

1 commit


19 May, 2012

1 commit


17 May, 2012

3 commits


05 May, 2012

1 commit


17 Apr, 2012

1 commit


15 Apr, 2012

2 commits


03 Apr, 2012

2 commits


24 Feb, 2012

1 commit


20 Feb, 2012

1 commit


19 Feb, 2012

2 commits


22 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
     

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
     

16 Aug, 2011

1 commit


26 Jul, 2011

1 commit


02 Jun, 2011

1 commit


27 May, 2011

1 commit


18 May, 2011

1 commit

  • Change acts_as_searcheable to always index schema_path. If multitenancy
    if off or the database isn't PostgreSQL, then schema_path method returns
    an empty string and is not used at find_by_contents.
    
    Change find_by_contents adding options separating options from paginate,
    solr and rails's find. With Solr search capabilities, combined search
    (solr + rails find) won't be necessary in the future.
    Also change find_by_contents to return a hash where there are the
    facets found and also the results.
    
    Related tests pass with this change
    Braulio Bhavamitra
     

04 May, 2011

1 commit


04 Apr, 2011

1 commit


03 Apr, 2011

1 commit


22 Mar, 2011

2 commits


02 Mar, 2011

2 commits


23 Feb, 2011

1 commit


22 Feb, 2011

1 commit


27 Jan, 2011

2 commits


17 Dec, 2010

1 commit


07 Dec, 2010

1 commit


26 Oct, 2010

1 commit