DMC/scipro
7
0
Fork 0
Code Issues 20 Pull Requests 1 Actions Projects 1 Wiki Activity
2,314 Commits 5 Branches 412 Tags
Commit Graph

2314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Eklund
0ce4d98f48 Fixed formatting bug in the final seminar panel leading to very misleading information being presented. 
Also made it a bit more clear what time is the real one by showing both start and end dates
in the details-panel.
2011-12-07 		2011-12-07 10:09:55 +01:00
Emil Siverhall
b7a021c3f2 Merge branch 'release-2011-11-14' 
* release-2011-11-14:
  small design change to make attachment icons stay on the same line
  re-added free text comment on peer reviews when checklist template not is attached. peer review couldn't be submitted without template or free text comment.
2011-11-14 		2011-11-14 16:39:50 +01:00
Emil Siverhall
d1548d177e Merge branch 'hotfix-peer_review' into release-2011-11-14 
* hotfix-peer_review:
  small design change to make attachment icons stay on the same line
  re-added free text comment on peer reviews when checklist template not is attached. peer review couldn't be submitted without template or free text comment.
 2011-11-14 16:23:39 +01:00
Emil Siverhall
6d65cc6c28 small design change to make attachment icons stay on the same line 2011-11-14 15:27:30 +01:00
Emil Siverhall
91aef57528 re-added free text comment on peer reviews when checklist template not is attached. peer review couldn't be submitted without template or free text comment. 2011-11-14 15:14:58 +01:00
Robin Eklund
50e39c8a9e Fixed merge conflict. 2011-11-10 2011-11-10 17:11:19 +01:00
Robin Eklund
bc6516db20 SQL-update scripts re-packaged. 2011-11-10 17:02:59 +01:00
Robin Eklund
597bcaa658 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-10 14:17:05 +01:00
Robin Eklund
ac78d1af8c Merge branch 'editableProjectClassFix' into develop 2011-11-10 14:16:53 +01:00
Robin Eklund
ae277dfecb Fixed bug making project class erroneously editable 2011-11-10 14:16:32 +01:00
Fredrik Friis
553c6bf444 added no checklist info 2011-11-10 14:12:20 +09:00
Fredrik Friis
a403d693ef added info for empty conference 2011-11-10 13:40:30 +09:00
Fredrik Friis
c0a490dd48 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-10 11:46:46 +09:00
Fredrik Friis
62c57e457d added info for no files and folders 2011-11-10 11:46:31 +09:00
Robin Eklund
edddc7b8da Merge branch 'addChecklistTemplateQuestion' into develop 2011-11-09 14:06:38 +01:00
Robin Eklund
1bd70229d8 Merge branch 'develop' into addChecklistTemplateQuestion 2011-11-09 13:55:10 +01:00
Robin Eklund
7abcd49a71 Made sure that a default set of checklist-categories are created at server start when they don't already exist. 
Without this data, the application crashes whenever a checklist template is saved. Ideally, that should be fixed at some point.
 2011-11-09 13:54:53 +01:00
Robin Eklund
082764a4dc Merge branch 'develop' into addChecklistTemplateQuestion 2011-11-09 11:53:59 +01:00
Fredrik Norberg
8ca797835d Merge branch 'small_fixes' into develop 
* small_fixes:
  change to checklistquestion compareTo
 2011-11-09 11:46:05 +01:00
Fredrik Norberg
230a86e278 change to checklistquestion compareTo 2011-11-09 11:45:46 +01:00
Fredrik Norberg
aaa480e907 Merge branch 'small_fixes' into develop 
* small_fixes:
  changed from set to list in checklist so the questions gets the correct order
 2011-11-09 11:09:50 +01:00
Fredrik Norberg
dfcce54116 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  Minor review of accessible admin-sections and removed some unused stuff.
 2011-11-09 11:09:09 +01:00
Fredrik Norberg
fc0a7e00ff changed from set to list in checklist so the questions gets the correct order 2011-11-09 11:08:29 +01:00
Robin Eklund
ca7afcbbee Added feedback messaging for empty question text instead of exception throwing 2011-11-09 10:48:27 +01:00
Robin Eklund
4daba36399 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-09 10:02:54 +01:00
Robin Eklund
e0a46b6f80 Minor review of accessible admin-sections and removed some unused stuff. 
Made validation of file uploads for final seminars somewhat server-side debuggable via log4j debug facility.
 2011-11-09 10:02:25 +01:00
Fredrik Norberg
394c87cc37 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (24 commits)
  moved contents from page to panel in admin - all peers. radio button behavior now works better when using browsers back button as well.
  Added the "peer review guide" text to supervisor+student views.
  removed another unused file and changed to a better name on another
  removed unused file
  added correct menu highlighting when admins are looking at peer reviews
  Changed name of default feedback panel, names clashed. Should implement a better solution really.
  unit test modifications to match new PeerReviewDataProvider
  Update deletion scripts
  sorting by date now works on peer review data provider as well.
  Added error handling for non-pdf uploads where required (previously, the system just threw infernal server errors).
  added unit test for peer request data provider extensions
  removed query from peer request dao that is no longer necessary when SortableDataProvider is implemented. Associated unit test also removed
  modified data provider for peer requests to make lists sortable. admin - peer request list is now sortable by date.
  Removed more unused stuff
  Cleaned up old schedule stuff.
  halfway adding info about no files
  fixed AJAX bug
  fixed AJAX bug
  removed bug from usersettinspanel
  implemented full behaviour of info label
  ...
 2011-11-09 09:32:17 +01:00
Emil Siverhall
aebf2fee48 Merge branch 'adminPeerRefactoring' into develop 
* adminPeerRefactoring:
  moved contents from page to panel in admin - all peers. radio button behavior now works better when using browsers back button as well.
 2011-11-08 15:41:29 +01:00
Emil Siverhall
531c4fa450 moved contents from page to panel in admin - all peers. radio button behavior now works better when using browsers back button as well. 2011-11-08 15:40:55 +01:00
Robin Eklund
ad07b12eb3 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-08 14:40:10 +01:00
Robin Eklund
006402be42 Added the "peer review guide" text to supervisor+student views. 2011-11-08 14:39:55 +01:00
Emil Siverhall
c0ef18eb42 Merge branch 'cleanup' into develop 
* cleanup:
  removed another unused file and changed to a better name on another
  removed unused file
 2011-11-08 14:30:08 +01:00
Emil Siverhall
7531080bac removed another unused file and changed to a better name on another 2011-11-08 14:29:38 +01:00
Emil Siverhall
57dee9c796 removed unused file 2011-11-08 14:21:41 +01:00
Emil Siverhall
d32d8e7f35 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
 2011-11-08 14:04:39 +01:00
Robin Eklund
4ae4cc5336 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-08 14:01:17 +01:00
Emil Siverhall
05d3fe9d40 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/personal/re into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/personal/re:
  Update deletion scripts
  Removed more unused stuff
  Cleaned up old schedule stuff.
 2011-11-08 13:51:58 +01:00
Emil Siverhall
d98211dae1 Merge branch 'sortablePeers' into develop 
* sortablePeers:
  added correct menu highlighting when admins are looking at peer reviews
  unit test modifications to match new PeerReviewDataProvider
  sorting by date now works on peer review data provider as well.
  added unit test for peer request data provider extensions
  removed query from peer request dao that is no longer necessary when SortableDataProvider is implemented. Associated unit test also removed
  modified data provider for peer requests to make lists sortable. admin - peer request list is now sortable by date.
 2011-11-08 13:49:34 +01:00
Robin Eklund
69dcc11460 Merge branch 'develop' into eventCleanup 2011-11-08 13:41:37 +01:00
Emil Siverhall
88724fdecb added correct menu highlighting when admins are looking at peer reviews 2011-11-08 13:41:18 +01:00
Robin Eklund
01b0d71ec2 Changed name of default feedback panel, names clashed. Should implement a better solution really. 2011-11-08 13:38:45 +01:00
Emil Siverhall
ee9d0dedb3 unit test modifications to match new PeerReviewDataProvider 2011-11-08 13:35:33 +01:00
Robin Eklund
5fb05c9418 Update deletion scripts 2011-11-08 13:34:37 +01:00
Robin Eklund
4120a7233e Merge branch 'develop' into eventCleanup 2011-11-08 13:24:03 +01:00
Robin Eklund
fa7d093ade Merge branch 'pdfUploadErrorHandling' into develop 2011-11-08 13:23:30 +01:00
Emil Siverhall
272c15345a sorting by date now works on peer review data provider as well. 2011-11-08 13:22:44 +01:00
Robin Eklund
05d3e5a3cb Added error handling for non-pdf uploads where required (previously, the system just threw infernal server errors). 2011-11-08 13:22:42 +01:00
Emil Siverhall
5a91269b53 added unit test for peer request data provider extensions 2011-11-08 11:50:10 +01:00
Emil Siverhall
a12a5d6ce9 removed query from peer request dao that is no longer necessary when SortableDataProvider is implemented. Associated unit test also removed 2011-11-08 11:33:17 +01:00
Emil Siverhall
1b18f6f63d modified data provider for peer requests to make lists sortable. admin - peer request list is now sortable by date. 2011-11-08 11:30:03 +01:00