17 Nov, 2015

1 commit

  • 92fbfd94   Merge branch 'master_rails4' into staging ... Browse File » 
    Conflicts:
	Gemfile
	Rakefile
	app/controllers/box_organizer_controller.rb
	app/controllers/my_profile/tasks_controller.rb
	app/controllers/public/profile_controller.rb
	app/mailers/user_mailer.rb
	app/models/article.rb
	app/models/person.rb
	app/models/product_category.rb
	app/models/task.rb
	config/application.rb
	config/routes.rb
	lib/acts_as_having_settings.rb
	lib/noosfero/api/entities.rb
	lib/noosfero/api/helpers.rb
	lib/noosfero/api/session.rb
	lib/noosfero/api/v1/articles.rb
	lib/noosfero/api/v1/contacts.rb
	lib/noosfero/api/v1/search.rb
	lib/noosfero/api/v1/users.rb
	test/functional/tasks_controller_test.rb
	test/unit/api/articles_test.rb
	test/unit/api/helpers_test.rb
	test/unit/api/people_test.rb
	test/unit/api/search_test.rb
	test/unit/api/session_test.rb
	test/unit/api/users_test.rb
	test/unit/person_notifier_test.rb
	test/unit/task_test.rb
	vendor/plugins/access_control/lib/acts_as_accessible.rb
    Victor Costa
     

28 Aug, 2015

2 commits

21 Aug, 2015

1 commit

13 Aug, 2015

2 commits

31 Jul, 2015

1 commit

24 Jul, 2015

1 commit

16 Jul, 2015

1 commit

26 Jan, 2015

1 commit

22 Jan, 2014

1 commit

09 Jan, 2014

1 commit

  • 6adc8bc2   Merge branch 'master' into rails3 ... Browse File » 
    Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb
    Rodrigo Souto
     

14 Nov, 2013

1 commit

08 Nov, 2013

1 commit

21 Oct, 2013

2 commits

18 Sep, 2013

1 commit

05 Sep, 2013

1 commit

03 Apr, 2011

1 commit

27 Feb, 2011

2 commits

22 Feb, 2011

1 commit

24 Sep, 2010

1 commit

17 Jul, 2010

1 commit

06 Jul, 2010

1 commit

15 Oct, 2008

1 commit

  • b9c58d94   ActionItem780: refactoring tests ... Browse File » 
    Squashed commit of the following:

commit ff9310723bc4f768185d4c562f06a99807e00d05
Author: Moises Machado <moises@colivre.coop.br>
Date:   Sat Oct 11 18:34:24 2008 -0300

    fixed the rest of the tests

commit 8fe241dcb67b3928796254e557319da3ec7e9734
Author: Moises Machado <moises@colivre.coop.br>
Date:   Sat Oct 11 17:16:27 2008 -0300

    ActionItem780: refactoring tests and forms
    Moises Machado
     

05 Jun, 2008

1 commit

13 Oct, 2007

2 commits

09 Oct, 2007

2 commits

08 Oct, 2007

1 commit

05 Oct, 2007

1 commit

04 Oct, 2007

1 commit