07 Dec, 2015

1 commit


03 Dec, 2015

1 commit


30 Nov, 2015

1 commit


19 Nov, 2015

1 commit


18 Nov, 2015

1 commit


17 Nov, 2015

2 commits

  • Victor Costa
     
  • 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
     

13 Nov, 2015

2 commits

  • Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Rodrigo Souto
     
  • - 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>
    Marcos Pereira
     

22 Sep, 2015

1 commit


11 Sep, 2015

1 commit


28 Aug, 2015

1 commit


27 Aug, 2015

2 commits


06 Aug, 2015

4 commits


27 Jul, 2015

1 commit


25 Jul, 2015

2 commits


22 Jul, 2015

1 commit

  • Merge branch 'api' into api_captcha_with_frontend_console_feedback
    
    * api: (70 commits)
      Tests for articles with category at the API
      Updating authors file
      Normalize authors names
      Generalize lattes_curriculum plugins' cucumber test
      API: adding api pagination
      API: fix reference_id parameter to avoid crash when load empty parameter
      Remove lattes_curriculum's tests with external dependencies
      api: added change password methods
      CommunityTrack: load the correct box in functional tests
      Define specific grape logging version to avoid undefined method "downcase"
      refactoring display_filter to filter all article of friends marked as show_to_followers
      api: fix user activation
      sub_organizations: add missed timestamps (fix unit tests)
      travis: remove workaround and fix selenium concurrent run
      allow run the "quick-start" script from everywhere
      Fix api article filter
      Fix display filter for article children
      Add new url request to activate a user in session end-point
      Highlight block fix
      Fix JS behaviour to show categories when noosfero is in a subdir environment
      ...
    
    Conflicts:
    	lib/noosfero/api/session.rb
    Evandro Junior
     

21 Jul, 2015

2 commits


20 Jul, 2015

3 commits


16 Jul, 2015

2 commits


15 Jul, 2015

2 commits


14 Jul, 2015

1 commit


13 Jul, 2015

1 commit


08 Jul, 2015

1 commit


02 Jun, 2015

2 commits


11 May, 2015

1 commit


24 Mar, 2015

1 commit