21 May, 2013

1 commit

13 Mar, 2013

1 commit

13 Dec, 2012

1 commit

11 Dec, 2012

2 commits

19 Jul, 2012

1 commit

  • 75524307   Merging AI1826 with master ... Browse Dir » 
    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
     

21 May, 2012

1 commit

19 May, 2012

1 commit

05 May, 2012

1 commit

17 Apr, 2012

1 commit

19 Feb, 2012

1 commit

  • 50def845   Merge remote branch 'noosfero-bsc/new-search-merge' ... Browse Dir » 
    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
     

24 Dec, 2011

1 commit

22 Feb, 2011

1 commit

23 Jul, 2010

1 commit

17 Jul, 2010

1 commit

13 Jul, 2010

1 commit

25 Nov, 2009

1 commit

10 Aug, 2009

1 commit

21 Jun, 2008

2 commits

20 Jun, 2008

1 commit

10 Jun, 2008

2 commits

09 Jun, 2008

1 commit

21 May, 2008

2 commits

02 May, 2008

1 commit

01 Apr, 2008

1 commit

27 Mar, 2008

1 commit

26 Mar, 2008

2 commits

25 Mar, 2008

1 commit

24 Mar, 2008

1 commit

20 Mar, 2008

1 commit

18 Mar, 2008

1 commit

26 Nov, 2007

1 commit

11 Oct, 2007

1 commit

25 Sep, 2007

3 commits