05 Jan, 2016

5 commits


30 Dec, 2015

2 commits


29 Dec, 2015

1 commit


23 Nov, 2015

1 commit


17 Nov, 2015

1 commit

  • 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
     

14 Nov, 2015

1 commit


10 Nov, 2015

1 commit


03 Nov, 2015

5 commits


29 Oct, 2015

2 commits


22 Oct, 2015

1 commit


14 Oct, 2015

1 commit


02 Oct, 2015

1 commit


01 Oct, 2015

1 commit


30 Sep, 2015

1 commit


25 Sep, 2015

1 commit


22 Sep, 2015

1 commit


11 Sep, 2015

4 commits


01 Sep, 2015

2 commits


28 Aug, 2015

1 commit


14 Aug, 2015

1 commit


13 Aug, 2015

1 commit


05 Aug, 2015

2 commits


01 Aug, 2015

1 commit


24 Jul, 2015

2 commits