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
     

09 Feb, 2012

1 commit


31 Jan, 2012

5 commits


27 Jan, 2012

3 commits


26 Jan, 2012

2 commits


19 Jan, 2012

1 commit


17 Jan, 2012

1 commit


10 Jan, 2012

2 commits


08 Jan, 2012

1 commit


24 Dec, 2011

4 commits


22 Dec, 2011

4 commits


21 Dec, 2011

3 commits


20 Dec, 2011

1 commit


19 Dec, 2011

1 commit


18 Dec, 2011

3 commits


09 Dec, 2011

1 commit


07 Dec, 2011

1 commit


06 Dec, 2011

1 commit


04 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
     

24 Nov, 2011

1 commit