21 Jan, 2015

2 commits

  • - Removed class Person on Work Assignment Plugin.
    - Fixed rails3 file extension on functional Tests.
    - changed the email_contact 'from' to be the environment email.
    - Changed notification text field to show the user email by default
    
    Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
    Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
    Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Tallys Martins
     
  • Added upload_files_extra_content hotspot, fixed work_assignment_form file extension,
    fixed redirections on file deletion, changed deprecated build_notification to build_contact method.
    
    Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
    Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    
    (AI2967)
    André Guedes
     

25 Feb, 2014

1 commit


07 Nov, 2012

1 commit


04 Nov, 2012

1 commit


01 Nov, 2012

1 commit


29 Oct, 2012

1 commit


25 Oct, 2012

2 commits


24 Oct, 2012

1 commit


03 Oct, 2012

1 commit


01 Oct, 2012

1 commit


08 Aug, 2012

1 commit


18 Jul, 2012

1 commit


26 May, 2012

1 commit


19 May, 2012

1 commit


16 May, 2012

3 commits


15 Apr, 2012

2 commits


05 Apr, 2012

2 commits


16 Mar, 2012

1 commit

  • Conflicts:
    	INSTALL
    	app/helpers/application_helper.rb
    	app/views/account/signup.rhtml
    	app/views/layouts/application-ng.rhtml
    	app/views/search/_product.rhtml
    	debian/control
    	debian/noosfero.install
    	debian/noosfero.links
    	features/step_definitions/noosfero_steps.rb
    	script/production
    Daniela Feitosa
     

09 Mar, 2012

1 commit


08 Mar, 2012

1 commit


25 Feb, 2012

1 commit


20 Feb, 2012

1 commit


19 Feb, 2012

2 commits


09 Feb, 2012

2 commits


31 Jan, 2012

2 commits


22 Dec, 2011

1 commit


12 Dec, 2011

1 commit


11 Dec, 2011

1 commit


27 Nov, 2011

1 commit

  • Conflicts:
    	app/controllers/admin_controller.rb
    	app/controllers/application.rb
    	app/controllers/public/account_controller.rb
    	app/controllers/public/content_viewer_controller.rb
    	lib/noosfero/i18n.rb
    	test/functional/account_controller_test.rb
    	test/functional/admin_controller_test.rb
    	test/unit/contact_test.rb
    	test/unit/profile_test.rb
    Antonio Terceiro
     

12 Oct, 2011

1 commit


10 Oct, 2011

1 commit