12 Nov, 2015

1 commit


29 Oct, 2015

1 commit


07 Oct, 2015

1 commit


06 Oct, 2015

1 commit


02 Oct, 2015

2 commits


26 Sep, 2015

1 commit


24 Sep, 2015

1 commit

  • Additional improvements include:
    
    - Makes 'Remove Image' checkbox optional
    - Very ugly css hack to hide duplicated labels in some forms. I couldn't
    find another way to avoid the labels generated by labelled_form_for nor
    could I skip adding labels inside the helper since it's supposed to be
    generic.
    Larissa Reis
     

11 Sep, 2015

1 commit


02 Sep, 2015

1 commit

  • Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Omar Júnior <omarroinuj@gmail.com>
    Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Signed-off-by: Vítor Barbosa <vitornga15@gmail.com>
    Vitor Barbosa de Araujo
     

28 Aug, 2015

1 commit


21 Aug, 2015

1 commit


13 Aug, 2015

1 commit


12 Aug, 2015

1 commit


09 Aug, 2015

1 commit


01 Aug, 2015

1 commit


24 Jul, 2015

2 commits


16 Jun, 2015

1 commit


12 Jun, 2015

1 commit


14 May, 2015

1 commit


27 Apr, 2015

1 commit


24 Apr, 2015

2 commits


14 Apr, 2015

1 commit


16 Mar, 2015

1 commit


22 Feb, 2015

2 commits


11 Feb, 2015

1 commit


03 Feb, 2015

1 commit

  • Conflicts:
    	app/controllers/my_profile/profile_editor_controller.rb
    	app/helpers/search_helper.rb
    	app/models/invitation.rb
    	app/models/person.rb
    	app/views/cms/view.html.erb
    	app/views/templates/index.html.erb
    	plugins/community_track/views/content_viewer/_step_item.html.erb
    	test/functional/home_controller_test.rb
    	test/unit/person_test.rb
    	test/unit/profile_test.rb
    Rodrigo Souto
     

02 Feb, 2015

1 commit


27 Jan, 2015

1 commit


22 Jan, 2015

1 commit

  • Work assignment master rebase
    
    The last version of the Work Assignment plugin, increased by Universidade de Brasília team.
    
    The plugin purpose is to keep versioned files, result of a work and to notify people by email about new uploaded files. Users can also change the visibility of their files, if the feature is set on Work Assignment settings.
    
    See merge request !420
    Antonio Terceiro
     

21 Jan, 2015

5 commits

  • - Changed article_extra_fields hotspot name to upload_files_extra_fields
    - Fixed some code spacing.
    - Fixed uploaded file filter on plugin class
    - Fixed after_validation filter on UploadedFile plugin extension class
    
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Hebert Douglas <hebertdougl@gmail>
    Tallys Martins
     
  • Added filters to cms controller to send email
    Removed unecessary dispatch on cms controller
    
    Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Tallys Martins
     
  • - Removed useless view.
    - Fixed problem on page render when file error(e.g. over max size) is detected.
    - Fixed bug when no file selected.
    - Refactored dispatch on upload_files.html.erb  to have less impact on core.
    - Added java script to modify the form action to use the plugin controller on upload_files form.
    - Fixed Work Assignment not sending e-mails
    - Removing duplicated code
    - Added new dispatch on cms_controller
    
    Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Tallys Martins
     
  • Changed html forms to rails3 pattern.
    
    Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Hebert Douglas <hebertdougl@gmail>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Hebert Santos
     
  • 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
     

15 Jan, 2015

2 commits