17 Nov, 2015

1 commit

  • 92fbfd94   Merge branch 'master_rails4' into staging ... Browse Dir » 
    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
     

03 Nov, 2015

1 commit

28 Aug, 2015

2 commits

21 Aug, 2015

1 commit

24 Jul, 2015

3 commits

16 Jul, 2015

1 commit

15 Jul, 2015

3 commits

14 Apr, 2015

6 commits

21 Oct, 2014

1 commit

17 Oct, 2014

1 commit

16 Oct, 2014

3 commits

15 Oct, 2014

1 commit

14 Oct, 2014

1 commit

13 Oct, 2014

1 commit

10 Oct, 2014

1 commit

09 Oct, 2014

2 commits

08 Oct, 2014

1 commit

06 Oct, 2014

2 commits

02 Oct, 2014

1 commit

30 Sep, 2014

4 commits

22 Sep, 2014

1 commit

12 Sep, 2014

2 commits