03 Apr, 2012

3 commits


16 Mar, 2012

2 commits


15 Mar, 2012

3 commits


09 Mar, 2012

1 commit


07 Mar, 2012

2 commits


02 Mar, 2012

1 commit


25 Feb, 2012

1 commit


24 Feb, 2012

9 commits


21 Feb, 2012

1 commit


20 Feb, 2012

3 commits


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
     

15 Feb, 2012

1 commit


09 Feb, 2012

3 commits


08 Feb, 2012

2 commits


06 Feb, 2012

1 commit


01 Feb, 2012

1 commit


27 Jan, 2012

3 commits


24 Jan, 2012

1 commit