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
     

07 Nov, 2015

1 commit

11 Sep, 2015

1 commit

20 Aug, 2015

1 commit

15 Aug, 2015

1 commit

13 Aug, 2015

2 commits

10 Aug, 2015

1 commit

05 Aug, 2015

1 commit

29 Jul, 2015

1 commit

25 Jul, 2015

1 commit

24 Jul, 2015

5 commits

12 Jul, 2015

1 commit

08 Jul, 2015

1 commit

07 Jul, 2015

1 commit

06 Jul, 2015

1 commit

02 Jun, 2015

1 commit

13 Apr, 2015

3 commits

10 Apr, 2015

1 commit

25 Feb, 2015

1 commit

24 Feb, 2015

1 commit

29 Jan, 2015

1 commit

28 Jan, 2015

1 commit

14 Jan, 2015

1 commit

12 Jan, 2015

1 commit

05 Jan, 2015

1 commit

16 Dec, 2014

1 commit

28 Oct, 2014

2 commits

27 Oct, 2014

1 commit

11 Oct, 2014

1 commit

11 Sep, 2014

1 commit

16 Jun, 2014

1 commit

04 Feb, 2014

1 commit