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
|
0f2a38ce52
|
Re-added V24__
|
2013-11-28 16:20:00 +01:00 |
|
niklas3
|
292bb1ddf4
|
Moved total points and criteria inside the form.
|
2013-11-28 16:05:00 +01:00 |
|
niklas3
|
506dc429b6
|
Added sortOrder.
|
2013-11-28 16:00:06 +01:00 |
|
niklas3
|
0273a7c8d8
|
Sorting asc.
|
2013-11-28 15:57:43 +01:00 |
|
niklas3
|
53a010206b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-28 15:54:18 +01:00 |
|
niklas3
|
9bc37556df
|
Added sort order to grading criterion.
Sorting questions by that order now.
|
2013-11-28 15:54:16 +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 |
|
|
|
fdb8a1773d
|
Removed setStatus(ReviewStatus) from PeerReview and replaced it with methods that describe what you want to do.
|
2013-11-28 15:37:40 +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 |
|
|
|
fcf6b1c2ef
|
Renamed schema migration to prevent conflicts.
|
2013-11-28 15:15:00 +01:00 |
|
|
|
ca6dba4576
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-28 15:14:40 +01:00 |
|
Leo
|
9314a0f314
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-28 14:02:44 +01:00 |
|
niklas3
|
6a560c4fc7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-28 14:01:47 +01:00 |
|
niklas3
|
736d8fc0ab
|
GradingAnswer points is now converted to 0 instead of null in getTotalPoints.
|
2013-11-28 14:01:29 +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 |
|
Leo
|
515b801cec
|
fixed a missing test case for searchFiles (path not ending with "/")
|
2013-11-28 13:53:09 +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 |
|
|
|
de2b215439
|
Fixed compilation errors after removing lazy deletion.
|
2013-11-28 11:41:31 +01:00 |
|
Emil Siverhall
|
88780ccab1
|
avoid autocomplete of username/password fields
|
2013-11-28 11:38:19 +01:00 |
|
|
|
bd9f22750d
|
Fixed compilation errors in test.
|
2013-11-28 11:37:32 +01:00 |
|
|
|
b73bdd2fb1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-28 11:34:14 +01:00 |
|
|
|
6031073ce3
|
Peer review is no longer lazy deleted.
|
2013-11-28 11:21:10 +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 |
|
Leo
|
3911e04ae6
|
ignored tests for jenkins
|
2013-11-28 11:00:39 +01:00 |
|
|
|
8e9399f676
|
Removed presentation toString() from ReviewStatus.
|
2013-11-28 10:56:58 +01:00 |
|
|
|
fa59242433
|
Changed concrete class to anonymous.
|
2013-11-28 10:55:17 +01:00 |
|
Leo
|
2a1983608f
|
added if-statement to searchFiles
|
2013-11-28 10:54:38 +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 |
|
Leo
|
c73e752e60
|
refactored searchFiles
|
2013-11-28 10:32:14 +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 |
|
Leo
|
baf22a512f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-28 09:44:19 +01:00 |
|
