Emil Siverhall
|
36aaa92094
|
part of project exception when trying to accept your own peer
|
2014-03-20 15:14:19 +01:00 |
|
Emil Siverhall
|
99a126d500
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/pages/PeerPortalPage.html
view/src/main/java/se/su/dsv/scipro/peer/pages/PeerPortalPage.java
|
2014-03-20 13:52:55 +01:00 |
|
Emil Siverhall
|
8a6c38b830
|
find and count methods for available requests should only get requests from active projects
|
2014-03-20 13:48:17 +01:00 |
|
|
|
f21f1d7ca9
|
Removed setting for peer review rating.
|
2014-03-20 13:30:24 +01:00 |
|
|
|
4c9f6a2311
|
Changed getInProgressReview to also take a project parameter.
|
2014-03-20 13:02:59 +01:00 |
|
|
|
b1173a8285
|
Added FileDescriptions to all PeerRequests in the integration tests since it is no longer optional.
|
2014-03-20 11:04:09 +01:00 |
|
|
|
489be4d73c
|
Removed implicit toString(). Watch out.
|
2014-03-20 09:59:22 +01:00 |
|
|
|
a86a6f7fe8
|
It is not optional.
|
2014-03-20 09:34:13 +01:00 |
|
|
|
57ab1567a0
|
Added getDeadline() and removed getNumDaysToSubmitPeerReview() since that is what is really wanted.
|
2014-03-20 09:12:14 +01:00 |
|
Golrokh Moattar
|
68b8ba4489
|
Removed unused Repo and fixed related Service
|
2014-03-19 15:26:32 +01:00 |
|
Golrokh Moattar
|
55cb9b43eb
|
Fixed binding StudentService
|
2014-03-19 15:08:41 +01:00 |
|
Emil Siverhall
|
695e8ffa05
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 14:16:02 +01:00 |
|
Emil Siverhall
|
6d3cbb8955
|
fixed peer settings
|
2014-03-19 14:15:51 +01:00 |
|
Golrokh Moattar
|
274f5024dc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 13:30:38 +01:00 |
|
Golrokh Moattar
|
98817ae29b
|
changed save button to scrolling save button
|
2014-03-19 13:30:21 +01:00 |
|
Emil Siverhall
|
40403d8950
|
bind EventService to CoreModule
|
2014-03-19 13:24:17 +01:00 |
|
Emil Siverhall
|
b88023580e
|
bind event configuration service to coremodule
|
2014-03-19 13:21:17 +01:00 |
|
Emil Siverhall
|
5dd54a3f70
|
scipro is safe to the end of days
|
2014-03-19 13:13:01 +01:00 |
|
leosu
|
75f000d478
|
merge conflict
|
2014-03-19 10:53:36 +01:00 |
|
leosu
|
8603a7351d
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/peer/PeerRequestService.java
view/src/test/java/se/su/dsv/scipro/peer/panels/PeerPortalPanelTest.java
|
2014-03-19 10:44:00 +01:00 |
|
leosu
|
07aad16b13
|
hides requests
|
2014-03-19 10:42:24 +01:00 |
|
Golrokh Moattar
|
b36ac48fb9
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/pages/PeerPortalPage.java
view/src/test/java/se/su/dsv/scipro/peer/panels/PeerPortalPanelTest.java
|
2014-03-19 10:30:04 +01:00 |
|
Golrokh Moattar
|
bf8141f73a
|
test problems got fixed
|
2014-03-19 10:27:17 +01:00 |
|
Emil Siverhall
|
390e7ffbd7
|
unused methods
|
2014-03-19 09:52:59 +01:00 |
|
Golrokh Moattar
|
b824d18633
|
Submitting review after deadline mark it as expired
|
2014-03-19 09:52:56 +01:00 |
|
Emil Siverhall
|
fefd27ee40
|
unused methods
|
2014-03-19 09:52:31 +01:00 |
|
leosu
|
8bf7374a61
|
formatting
|
2014-03-19 09:44:10 +01:00 |
|
Golrokh Moattar
|
b4e1ca8b9e
|
Removed unused repo and its binding
|
2014-03-19 09:19:17 +01:00 |
|
Golrokh Moattar
|
83a26abb8f
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/pages/PeerPortalPage.java
view/src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerPortalPage.java
view/src/test/java/se/su/dsv/scipro/peer/panels/PeerPortalPanelTest.java
|
2014-03-19 09:14:23 +01:00 |
|
Emil Siverhall
|
50ff522a37
|
new summary panel for peer reviews
|
2014-03-19 08:48:02 +01:00 |
|
Emil Siverhall
|
ac7ec3a4a4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 08:11:42 +01:00 |
|
fred-fri
|
72ed7a7a5f
|
removed peer rating and fixed comment stuff
|
2014-03-19 13:00:44 +09:00 |
|
Golrokh Moattar
|
defc9d568d
|
CommentRepo removed
|
2014-03-18 17:37:53 +01:00 |
|
Emil Siverhall
|
fdea590685
|
constructList method, up up away.
|
2014-03-18 16:23:04 +01:00 |
|
Emil Siverhall
|
ce0c4eae42
|
removed unused stuff
|
2014-03-18 16:21:16 +01:00 |
|
|
|
82df883fac
|
Fixed compilation errors.
|
2014-03-18 16:14:00 +01:00 |
|
|
|
4d6d6dc952
|
Fixed tests in core after PeerReview#submit became more strict.
|
2014-03-18 16:12:36 +01:00 |
|
|
|
549d8bc6eb
|
Changed some exception stuff.
|
2014-03-18 16:07:05 +01:00 |
|
|
|
898973ed91
|
wtf IntelliJ stop placing new classes in generated-sources.
|
2014-03-18 15:59:54 +01:00 |
|
|
|
7dccdce29c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-18 15:57:50 +01:00 |
|
|
|
a02b58501e
|
Added null check to PeerReview#submit
|
2014-03-18 15:53:52 +01:00 |
|
|
|
3aa675affa
|
Added missing @Transactional.
|
2014-03-18 15:53:01 +01:00 |
|
|
|
5ed23166f6
|
Fixed endless recursive ToString
|
2014-03-18 15:52:43 +01:00 |
|
|
|
38ecd3a1bd
|
Bound PerformReviewService.
|
2014-03-18 15:52:13 +01:00 |
|
Emil Siverhall
|
f2c32b4c6f
|
link to reviews if request are completed
|
2014-03-18 15:20:44 +01:00 |
|
|
|
9c33e3bd27
|
Changed auto-complete predicate to generate better sql queries.
|
2014-03-18 15:16:41 +01:00 |
|
|
|
9b755f7dfd
|
Implemented PerformReviewService.
|
2014-03-18 14:53:58 +01:00 |
|
|
|
b2353b063d
|
Implemented logic to only show if current user has an in progress review.
|
2014-03-18 14:45:24 +01:00 |
|
|
|
21d8b2064e
|
Made it return null instead of throw exception.
|
2014-03-18 14:30:28 +01:00 |
|
|
|
871c09bbed
|
Submitting a PeerReview validates answers and stuff.
|
2014-03-18 14:19:29 +01:00 |
|
