19 Feb, 2012

2 commits

  • 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
     
  • Conflicts:
    	INSTALL
    	app/models/environment_finder.rb
    	config/environments/cucumber.rb
    	debian/control
    	features/step_definitions/noosfero_steps.rb
    	test/unit/forum_helper_test.rb
    Rafael Martins
     

10 Jan, 2012

2 commits


30 Dec, 2011

1 commit


24 Dec, 2011

1 commit


22 Dec, 2011

1 commit


18 Oct, 2011

1 commit


13 Oct, 2011

2 commits


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
     

17 Aug, 2011

1 commit


16 Aug, 2011

1 commit


11 Aug, 2011

1 commit

  • - creating helpers in Noosfero::SampleDataHelper to save some 'typing'
    - adding articles and profiles to categories in sample-data scripts
    - moving Events creation to sample-articles script
    - echoing 'F' or 'E' in output in case of fail or error on creating
    Joenio Costa
     

26 Jul, 2011

3 commits


27 May, 2011

1 commit


18 May, 2011

1 commit


11 May, 2011

2 commits


10 May, 2011

2 commits


04 Apr, 2011

1 commit


02 Mar, 2011

2 commits


25 Feb, 2011

1 commit


20 Feb, 2011

1 commit


31 Jan, 2011

1 commit


13 Jan, 2011

1 commit


25 Nov, 2010

1 commit


26 Oct, 2010

3 commits


15 Sep, 2010

1 commit


04 Sep, 2010

1 commit

  • `./script/production run` will start the complete service (app server,
    ferret server, delayed_job server) in production mode and then wait for
    a control-C, after which it will stop the service. This is useful for
    running in production mode during test activities.
    Antonio Terceiro
     

30 Aug, 2010

1 commit


27 Aug, 2010

3 commits