6886 Commits

Author SHA1 Message Date
niklas3
a6921df0c1 Merge remote-tracking branch 'origin/develop' into develop 2013-11-29 16:18:23 +01:00
niklas3
51b7a59074 Grade is shown and editable in the grading report. 2013-11-29 16:17:53 +01:00
Emil Siverhall
29f6dccea3 reintroduced ExternalUserLoginModule 2013-11-29 15:49:03 +01:00
882d1c3a00 More clean up. 2013-11-29 15:47:34 +01:00
d81d1564b2 Moved method to where it belongs. 2013-11-29 15:37:51 +01:00
70d1128e44 Removed useless code. 2013-11-29 15:33:44 +01:00
62c4f2be15 Simply because I could :) 2013-11-28 21:03:14 +01:00
1fcb1b2d0c Suppressed Wickets RequestCycleExtra logging to prevent excess mails. 2013-11-28 20:49:44 +01:00
0f1f3c9f2d Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 17:30:25 +01:00
3d2b8a460a Fixed display of statuses in the filter in Admin/Project/Peer. 2013-11-28 17:30:18 +01:00
Richard
5d1720a55c Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 16:51:51 +01:00
Richard
996a59a019 Continued styling of the grading report.
Created css class feedbackPanelSUCCESS.
2013-11-28 16:51:44 +01:00
b280d4f7f0 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 16:51:43 +01:00
15fa0179e5 Removed submitted and aborted properties from PeerReview. 2013-11-28 16:51:38 +01:00
Emil Siverhall
2f3acdeb71 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 16:43:34 +01:00
Emil Siverhall
7f1a98120e removed old .txt download resources 2013-11-28 16:43:22 +01:00
niklas3
dff6e17581 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 16:35:37 +01:00
niklas3
aff04112a0 Fixd bugs Andreas created. 2013-11-28 16:35:20 +01:00
Leo
b26f3672ba Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 16:33:57 +01:00
Emil Siverhall
c2a16f9a4e Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 16:28:27 +01:00
Emil Siverhall
7f31832378 pdf download of finished grading reports 2013-11-28 16:27:57 +01:00
Leo
9ae9acd463 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 16:27:25 +01:00
Leo
a4073b1325 more tests to ProjectFilePage 2013-11-28 16:27:16 +01:00
niklas3
292bb1ddf4 Moved total points and criteria inside the form. 2013-11-28 16:05:00 +01:00
niklas3
53a010206b Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 15:54:18 +01:00
niklas3
9e4774daba Grading points now have a minimum value of 0. 2013-11-28 15:45:26 +01:00
niklas3
ea28128acc Removed silly asterisks. 2013-11-28 15:44:53 +01:00
5cdbd37e34 Fixed compilation error after removing deleted flag from peer review. 2013-11-28 15:36:59 +01:00
67ee58284c Added status column to PeerReview. 2013-11-28 15:18:36 +01:00
ca6dba4576 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 15:14:40 +01:00
Leo
3d0ebd449a Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 13:53:44 +01:00
Leo
cc5cc00e8a some more asserts 2013-11-28 13:53:34 +01:00
Richard
62035b700f Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 13:45:53 +01:00
niklas3
27b8687b89 Total points are always shown.
Testing different approach to getTotalPoints.
2013-11-28 13:30:42 +01:00
Richard
7789d346d8 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 13:06:49 +01:00
Leo
de613f6df3 made string id's into constants and added a render test to AbstractFilePanel 2013-11-28 12:50:20 +01:00
niklas3
b06e1790b6 tests 2013-11-28 12:33:45 +01:00
niklas3
57fd80f3eb Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 12:29:45 +01:00
niklas3
f1aabdd158 Grading form now has a row for total points. 2013-11-28 12:29:40 +01:00
Emil Siverhall
0813a91226 trying to please safari auto completion 2013-11-28 11:59:14 +01:00
Emil Siverhall
7a890079b9 renamed property 2013-11-28 11:46:33 +01:00
Richard
85018f7054 Minor styling of internal users page. 2013-11-28 11:41:50 +01:00
Emil Siverhall
88780ccab1 avoid autocomplete of username/password fields 2013-11-28 11:38:19 +01:00
b73bdd2fb1 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 11:34:14 +01:00
Emil Siverhall
8636cf3d38 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 11:09:02 +01:00
Emil Siverhall
1050d11c3a unique validation on username editing 2013-11-28 11:08:45 +01:00
fa59242433 Changed concrete class to anonymous. 2013-11-28 10:55:17 +01:00
d7fe9d6134 Added AjaxEnumLinkPanel. 2013-11-28 10:45:55 +01:00
Leo
7c1ea1ba33 correctly renamed a method 2013-11-28 10:43:38 +01:00
c187106677 Added getStatus() to PeerReview 2013-11-28 10:39:00 +01:00