22 Nov, 2013

2 commits


23 May, 2013

1 commit


22 May, 2013

1 commit


13 Mar, 2013

1 commit


06 Mar, 2013

1 commit


05 Mar, 2013

1 commit


01 Mar, 2013

1 commit


28 Feb, 2013

4 commits


27 Feb, 2013

2 commits


10 Jan, 2013

3 commits


20 Dec, 2012

2 commits


13 Sep, 2012

1 commit


04 Sep, 2012

2 commits


15 Aug, 2012

1 commit


22 Jul, 2012

1 commit


18 Jul, 2012

1 commit


22 May, 2012

1 commit


20 May, 2012

1 commit


19 May, 2012

1 commit


17 Apr, 2012

1 commit


15 Apr, 2012

1 commit


03 Apr, 2012

1 commit


24 Feb, 2012

1 commit


22 Feb, 2012

1 commit


20 Feb, 2012

1 commit


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
     

04 Jan, 2012

1 commit


24 Dec, 2011

3 commits