6916 Commits

Author SHA1 Message Date
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
Emil Siverhall
ea6640b852 allow editing of internal users without username attached (eg. thesissupport) 2013-11-28 10:20:55 +01:00
Emil Siverhall
ba262e1a63 password editing enabled (optional) 2013-11-28 10:07:48 +01:00
a38628fb71 Renamed enum value from ABORTED to TIMED_OUT to better reflect what it actually means. 2013-11-28 09:52:07 +01:00
9ad51fa9eb Renamed stupid panel. 2013-11-28 09:34:54 +01:00
Emil Siverhall
5e1f293fc9 feedback message when updating users 2013-11-28 09:01:46 +01:00
fred-fri
c831a3000a set maximum 2013-11-28 16:55:48 +09:00
fred-fri
6866c8348d tests 2013-11-28 16:51:15 +09:00
fred-fri
889bf111f5 cleanup 2013-11-28 16:44:58 +09:00
fred-fri
e14f3a14ec fixes 2013-11-28 16:39:23 +09:00
Emil Siverhall
d6ddfcb1a4 update username instead of delete/create 2013-11-28 08:33:17 +01:00
Emil Siverhall
b0019fb832 make sure we can't edit users with external identifiers 2013-11-28 08:22:27 +01:00
fred-fri
d28343b57d blabla 2013-11-28 16:14:52 +09:00
fred-fri
4f21be7075 fixes 2013-11-28 15:28:40 +09:00
fred-fri
8fa22b3046 added info 2013-11-28 13:47:05 +09:00
Emil Siverhall
408bdf8b8b Merge remote-tracking branch 'origin/develop' into develop 2013-11-27 17:10:53 +01:00
Emil Siverhall
fcb403ede7 test fix 2013-11-27 17:10:37 +01:00
48859c8708 Merge remote-tracking branch 'origin/develop' into develop 2013-11-27 17:07:24 +01:00
662f8d86b9 Moved PeerPortal interface and its implementation. 2013-11-27 17:07:20 +01:00
Leo
03c34cb98d Merge remote-tracking branch 'origin/develop' into develop 2013-11-27 17:04:15 +01:00
56b2edc3b9 Renamed PeerPortalController to PeerPortal. Technical stuff should not be in interface names. 2013-11-27 17:03:23 +01:00
a0f67b9ee0 Created submitReview(PeerReview) functionality for PeerPortalController. 2013-11-27 17:02:25 +01:00
Emil Siverhall
7727bdb1e4 update of username for internal users 2013-11-27 16:54:56 +01:00
Richard
0c47ba787e Styling of roles page. 2013-11-27 16:53:10 +01:00
Leo
7472dc873e Merge remote-tracking branch 'origin/develop' into develop 2013-11-27 16:51:52 +01:00
Leo
144ed083d4 new implementation for searchFiles 2013-11-27 16:50:39 +01:00
Richard
6bdcb41497 Changed styling of feedback panels 2013-11-27 16:23:59 +01:00
niklas3
ef76312d12 Merge remote-tracking branch 'origin/develop' into develop 2013-11-27 15:53:53 +01:00
niklas3
de3e1a91e6 Opposition and participation in project now lists the name and role of each project author. 2013-11-27 15:53:50 +01:00
Leo
3cc486b73f Merge remote-tracking branch 'origin/develop' into develop 2013-11-27 15:19:46 +01:00