3343 Commits

Author SHA1 Message Date
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
Robin Eklund
6ba94dc6b9 Removed more unused stuff 2011-11-08 11:00:58 +01:00
Robin Eklund
78588f99b7 Merge branch 'develop' into eventCleanup 2011-11-08 10:49:51 +01:00
Robin Eklund
8c1b99b3a0 Cleaned up old schedule stuff. 2011-11-08 10:49:09 +01:00
Fredrik Friis
65621abc0f halfway adding info about no files 2011-11-08 18:09:13 +09:00
Fredrik Friis
14bce20579 fixed AJAX bug 2011-11-08 17:37:23 +09:00
Fredrik Friis
d7d3419fe5 fixed AJAX bug 2011-11-08 17:36:50 +09:00
Fredrik Friis
cd2dc7f529 removed bug from usersettinspanel 2011-11-08 16:29:39 +09:00
Fredrik Friis
076771eab3 implemented full behaviour of info label 2011-11-08 16:21:30 +09:00
Fredrik Friis
92c622a36f added empty activity plan info + delete behaviour 2011-11-08 16:02:41 +09:00
Fredrik Friis
703a8a8a5d fixed user settings panel bugs 2011-11-08 14:11:29 +09:00
Fredrik Friis
543d2d6971 added no upcoming events label 2011-11-08 12:58:04 +09:00
Fredrik Friis
413bc45692 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-08 10:50:38 +09:00
Fredrik Friis
1c3c8675ee fixed the mail setting, saved setting is now displayed 2011-11-08 10:50:18 +09:00
Fredrik Norberg
988d5a895d Merge branch 'hotfix-2011-11-07'
* hotfix-2011-11-07:
  buggfix, checklisttemplates can now be edited properly
2011-11-07 18:51:36 +01:00
Fredrik Norberg
c0d37fe506 buggfix, checklisttemplates can now be edited properly 2011-11-07 18:34:03 +01:00
Fredrik Norberg
5a334aecdf buggfix, editing checklisttemplates now work properly 2011-11-07 18:21:19 +01:00
Robin Eklund
23ba91d3be Merge branch 'release-2011-11-07' 2011-11-07 2011-11-07 16:40:13 +01:00
Fredrik Norberg
17aab84ce0 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  removed sortable field by mistake. now added again.
  minor changes to unit tests after adding sortable field to project domain object
  supervisor - my projects now supports sorting by headers and paging navigator added. radiogroup is now used instead of checkboxes
  temp commit
2011-11-07 16:23:15 +01:00
Emil Siverhall
e0822cdfcb Merge branch 'sortFix' into develop
* sortFix:
  removed sortable field by mistake. now added again.
2011-11-07 16:13:35 +01:00
Emil Siverhall
4a1985847d removed sortable field by mistake. now added again. 2011-11-07 16:13:19 +01:00
Emil Siverhall
1954cef78a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  small fixes for improved user experience when interactng with the activityplan and checklists as a supervisor
  Added viewing of activity-plan events, could be made a lot more graphically appealing.
  Added mode-switch for checklist viewing, needs more work.
  buggfixes from merge
  Minor cleanup
  made settingspanel more usable, TODO: fix the mail settings
  added a feedbackpanel to activityplan
  removed old icon
  changed the db script the lazy way since its late
  fixed persistence xml
2011-11-07 16:07:53 +01:00