fred-fri
|
8ffe6f1a70
|
finalseminar keys
|
2014-03-24 11:40:31 +09:00 |
|
fred-fri
|
339a1f8b84
|
checklisttemplate keys
|
2014-03-24 11:39:02 +09:00 |
|
fred-fri
|
80068a5b6d
|
checklist keys
|
2014-03-24 11:37:43 +09:00 |
|
fred-fri
|
623b89caf0
|
peerreviewkeys
|
2014-03-24 11:29:47 +09:00 |
|
|
|
c0755539ae
|
Added missing binding.
|
2014-03-21 16:07:01 +01:00 |
|
|
|
de24b25a3f
|
Removed class level @Transactional to get rid of the warnings.
|
2014-03-21 16:03:13 +01:00 |
|
Emil Siverhall
|
c4455d61f8
|
removed Peer tab from Supervisor project overview
|
2014-03-21 14:52:41 +01:00 |
|
|
|
cfdd685d23
|
Renamed method to match the rest of the world.
|
2014-03-21 12:38:30 +01:00 |
|
|
|
7963dd8956
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestSubmissionPanel.html
view/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestSubmissionPanel.java
view/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestSubmissionPanel.properties
|
2014-03-21 11:27:01 +01:00 |
|
|
|
c19ad4a947
|
Fixed bad predicate when looking for system settings.
|
2014-03-21 11:12:31 +01:00 |
|
Emil Siverhall
|
cc15f3856a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-21 10:38:52 +01:00 |
|
Emil Siverhall
|
ec9d955283
|
only find requests where reviewer is not part of project
|
2014-03-21 10:36:33 +01:00 |
|
Emil Siverhall
|
5a87d5e290
|
renamed service method
|
2014-03-21 10:16:40 +01:00 |
|
fred-fri
|
0e5e104cf3
|
adding new pageparameterskeyfile
|
2014-03-21 17:24:13 +09:00 |
|
fred-fri
|
0ecf90f943
|
safety
|
2014-03-21 13:16:34 +09:00 |
|
fred-fri
|
4d770a3366
|
safety
|
2014-03-21 13:06:06 +09:00 |
|
fred-fri
|
5f35bb113a
|
add remove methods plus list getters and setters so propertymodel can be used for exemptions
|
2014-03-21 13:02:34 +09:00 |
|
Emil Siverhall
|
54e2af2e8f
|
descending order on my peer panel
|
2014-03-20 19:45:34 +01:00 |
|
Emil Siverhall
|
ba7ee09c31
|
removed notreviewablereason
|
2014-03-20 17:42:34 +01:00 |
|
Emil Siverhall
|
e744351ac7
|
replaced peer portal panel with PeerRequestSelectionPanel
|
2014-03-20 16:12:14 +01:00 |
|
Emil Siverhall
|
57d997d25c
|
peer portal tests
|
2014-03-20 15:55:04 +01:00 |
|
Emil Siverhall
|
e39d12dabe
|
handling other types of validation errors when trying to accept review
|
2014-03-20 15:37:29 +01:00 |
|
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 |
|
