Charles Oliveira / noosfero

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

2015-11-17 09:23:22 -0300

13 Nov, 2015

2 commits

0ac23124 api: fixes to merge api to rails 4 ... Browse File »
```
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
```
Rodrigo Souto
2015-11-13 10:57:23 -0300

b164af65 API improvements: ... Browse File »

- Add several endpoints
- Add some API documentation
- Fix plugins API hotspot

Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Leandro Nunes dos Santos <leandronunes@gmail.com>
Signed-off-by: Evandro Junior <evandrojr@gmail.com>
Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>
Signed-off-by: Caio SBA <caio@colivre.coop.br>
Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com>
Signed-off-by: Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
Signed-off-by: Aurelio A. Heckert <aurelio@colivre.coop.br>
Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
Signed-off-by: Marcelo Júnior <maljunior@gmail.com>
Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
Signed-off-by: Larissa Reis <larissa@colivre.coop.br>
Signed-off-by: ABNER SILVA DE OLIVEIRA <abner.oliveira@serpro.gov.br>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Simião Carvalho <simiaosimis@gmail.com>
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>