29 Jul, 2016

1 commit


16 Jul, 2016

1 commit


07 Jul, 2016

1 commit


22 Apr, 2016

1 commit


13 Apr, 2016

1 commit

  • - Avoid create comments, associate children articles and perform votes on archived articles
    - Update db/schema
    
    -Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
    -Signed-off-by: Gustavo Jaruga Cruz <darksshades@gmail.com>
    -Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    
    (cherry picked from commit 144d608f15e2864e8053d384e871699d314a9283)
    Michel Felipe
     

11 Apr, 2016

1 commit


08 Apr, 2016

1 commit


24 Mar, 2016

1 commit


22 Mar, 2016

1 commit


08 Mar, 2016

1 commit


22 Feb, 2016

1 commit

  • - Every article can be followed so the user can receive notifications without
      having to comment on it
    
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com>
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Signed-off-by: Caio SBA <caio@colivre.coop.br>
    Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
    Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
    Signed-off-by: Evandro Jr <evandrojr@gmail.com>
    Marcos Ramos
     

30 Nov, 2015

1 commit


20 Nov, 2015

1 commit


19 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


11 Sep, 2015

1 commit


24 Jul, 2015

1 commit


08 Jul, 2015

1 commit


15 Jun, 2015

1 commit


02 Jun, 2015

11 commits


09 Apr, 2015

1 commit


08 Apr, 2015

2 commits


26 Feb, 2015

1 commit


25 Feb, 2015

1 commit


04 Feb, 2015

1 commit


29 Jan, 2015

1 commit


03 Nov, 2014

1 commit


30 Oct, 2014

1 commit