17 Jun, 2015

4 commits

16 Jun, 2015

4 commits

12 Jun, 2015

1 commit

21 May, 2015

1 commit

14 May, 2015

1 commit

27 Apr, 2015

1 commit

24 Apr, 2015

3 commits

20 Apr, 2015

3 commits

17 Apr, 2015

1 commit

14 Apr, 2015

1 commit

17 Mar, 2015

1 commit

16 Mar, 2015

1 commit

24 Feb, 2015

1 commit

04 Feb, 2015

1 commit

03 Feb, 2015

1 commit

  • 71439c6c   Merge branch 'master' into stoa ... Browse Dir » 
    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

29 Jan, 2015

1 commit

28 Jan, 2015

1 commit

  • d9a3fdb3   Merge branch 'master' into stable ... Browse Dir » 
    Conflicts:
	app/helpers/article_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/block.rb
	app/views/content_viewer/view_page.html.erb
	db/schema.rb
	plugins/community_track/views/blocks/_track_list_more.html.erb
	plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb
	public/javascripts/article.js
	test/unit/block_test.rb
	test/unit/person_notifier_helper_test.rb
    Victor Costa
     

27 Jan, 2015

1 commit

22 Jan, 2015

1 commit

  • 5e1957f3   Merge branch 'work_assignment_master_rebase' into 'master' ... Browse Dir » 
    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

  • cbed32d2   Refactoring Work Assignment Plugin ... Browse Dir » 
    - 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
     
  • e6c0328a   Refactoring Work Assignment ... Browse Dir » 
    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
     
  • 27831399   Fixing bugs on Work Assignment plugin ... Browse Dir » 
    - 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
     
  • 17c8b3be   Fixed bug on plugin views ... Browse Dir » 
    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
     
  • 938cbff3   Migrating Work Assignment Plugin to rails3 ... Browse Dir » 
    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

13 Jan, 2015

1 commit

12 Jan, 2015

1 commit

07 Jan, 2015

1 commit