|
|
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
|
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
|
515b801cec
|
fixed a missing test case for searchFiles (path not ending with "/")
|
2013-11-28 13:53:09 +01:00 |
|
niklas3
|
27b8687b89
|
Total points are always shown.
Testing different approach to getTotalPoints.
|
2013-11-28 13:30:42 +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 |
|
|
|
de2b215439
|
Fixed compilation errors after removing lazy deletion.
|
2013-11-28 11:41:31 +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 |
|
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 |
|
Leo
|
2a1983608f
|
added if-statement to searchFiles
|
2013-11-28 10:54: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 |
|
Leo
|
b538341840
|
ignore tests for jenkins
|
2013-11-28 09:43:10 +01: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 |
|
fred-fri
|
d28343b57d
|
blabla
|
2013-11-28 16:14:52 +09:00 |
|
fred-fri
|
6a33dd8eaf
|
adding stuff
|
2013-11-28 15:36:51 +09:00 |
|
fred-fri
|
7a36a5da40
|
fixes
|
2013-11-28 15:11:27 +09:00 |
|
fred-fri
|
6271d8a22b
|
builders
|
2013-11-28 15:03:09 +09:00 |
|
fred-fri
|
aba91231d3
|
added maxpoints attribute
|
2013-11-28 14:07:08 +09:00 |
|
Emil Siverhall
|
408bdf8b8b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 17:10:53 +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 |
|
|
|
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 |
|
Leo
|
f571154410
|
added a "/" to the start of the searchPath in recursive search
|
2013-11-27 16:57:00 +01:00 |
|
Emil Siverhall
|
7727bdb1e4
|
update of username for internal users
|
2013-11-27 16:54:56 +01:00 |
|
Leo
|
72953480e3
|
removed FileRepositoryManager from FileDescriptionServiceImpl
|
2013-11-27 16:51:41 +01:00 |
|
Leo
|
144ed083d4
|
new implementation for searchFiles
|
2013-11-27 16:50:39 +01:00 |
|
Leo
|
36e9163cd2
|
moved sortFolders
|
2013-11-27 15:46:37 +01:00 |
|
Leo
|
88c84b314b
|
added tests to FileDescriptionServiceImpl
|
2013-11-27 15:37:01 +01:00 |
|
Leo
|
3cc486b73f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 15:19:46 +01:00 |
|
Leo
|
8509143592
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 15:14:29 +01:00 |
|
Leo
|
7f0998d6ef
|
fixed tests broken by refactoring
|
2013-11-27 15:14:14 +01:00 |
|
Emil Siverhall
|
822944cb74
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 15:14:13 +01:00 |
|
Emil Siverhall
|
3586f01e01
|
basic user editing for internal users
|
2013-11-27 15:05:49 +01:00 |
|
|
|
9716ad3412
|
Added filter to only show internal users under Admin / Users / Roles.
|
2013-11-27 14:39:30 +01:00 |
|
