04 Dec, 2015

4 commits

  • Victor Costa
     
  • Fix HTTP caching and logins with rails 4
    
    Since all cookies should be dropped for unauthenticated users, you cannot
    expect the XSRF cookie to be present to allow users to login!
    
    
    See merge request !739
    Victor Costa
     
  • Victor Costa
     
  • - Adds hostspot in Organization Rating task details
    - Improvements on task and organization ratings layout
    - Added one hotspot for task contents and another for ratings container content
    - Rejected rating comments are only displayed to env admins and comment owners
    - All task messages now refers to "a Report" instead of Comment:
      i.g. "Report waiting for approval" instead of "Comment waiting for approval"
    - Also added css style to auto expand task div
    
    Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
    Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
    Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
    
    See merge request !737
    Gabriel Silva
     

03 Dec, 2015

1 commit


01 Dec, 2015

2 commits


30 Nov, 2015

2 commits


23 Nov, 2015

3 commits

  • Daniela Feitosa
     
  • Custom fields can be added to any profile through the admin panel
    in the 'Fields' section. They have the same behaviour as the current
    Noosfero's fields (active, signup, required and privacy).
    
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Marcos Pereira
     
  • Victor Costa
     

20 Nov, 2015

2 commits


19 Nov, 2015

5 commits


18 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
     

16 Nov, 2015

1 commit


13 Nov, 2015

2 commits

  • Leandro Santos
     
  • - 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
     

12 Nov, 2015

2 commits


10 Nov, 2015

1 commit


05 Nov, 2015

4 commits


04 Nov, 2015

4 commits


03 Nov, 2015

4 commits


29 Oct, 2015

1 commit