18 Dec, 2015

3 commits

17 Dec, 2015

1 commit

16 Dec, 2015

5 commits

14 Dec, 2015

2 commits

10 Dec, 2015

2 commits

09 Dec, 2015

1 commit

07 Dec, 2015

3 commits

01 Dec, 2015

3 commits

30 Nov, 2015

3 commits

23 Nov, 2015

3 commits

20 Nov, 2015

1 commit

19 Nov, 2015

4 commits

18 Nov, 2015

2 commits

17 Nov, 2015

2 commits

  • 2287ee28   Do not return private token when user is inactive Browse Dir »
    Victor Costa
     
  • 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
     

16 Nov, 2015

1 commit

13 Nov, 2015

4 commits