leosu
|
75f000d478
|
merge conflict
|
2014-03-19 10:53:36 +01:00 |
|
leosu
|
7818ccadcc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 10:44:08 +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 |
|
Emil Siverhall
|
1a6d9e0274
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerPortalPage.java
|
2014-03-19 10:41:54 +01:00 |
|
Emil Siverhall
|
c3851afb5e
|
removed abstract supervisor peer page
|
2014-03-19 10:41:13 +01:00 |
|
Emil Siverhall
|
da0086e786
|
removed supervisor peer review guide page
|
2014-03-19 10:35:28 +01:00 |
|
Emil Siverhall
|
70eee054ea
|
removed supervisor peer portal page
|
2014-03-19 10:33:36 +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
|
4e93a3a49a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 09:55:52 +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 |
|
Emil Siverhall
|
903941378e
|
removed all summary panel
|
2014-03-19 09:50:31 +01:00 |
|
leosu
|
8bf7374a61
|
formatting
|
2014-03-19 09:44:10 +01:00 |
|
Emil Siverhall
|
1c1938ce34
|
empty label added
|
2014-03-19 09:32:09 +01:00 |
|
leosu
|
3a520bfda2
|
made PeerPortalPanel not abstract
|
2014-03-19 09:26:51 +01:00 |
|
Emil Siverhall
|
baa077d92c
|
display reviewer name
|
2014-03-19 09:22:10 +01:00 |
|
Golrokh Moattar
|
b4e1ca8b9e
|
Removed unused repo and its binding
|
2014-03-19 09:19:17 +01:00 |
|
Golrokh Moattar
|
83055a58d9
|
Removed abstract
|
2014-03-19 09:15:40 +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
|
574d6873c3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 08:49:59 +01:00 |
|
|
|
22965f27a5
|
Fixed bad stale model.
|
2014-03-19 08:48:59 +01:00 |
|
Emil Siverhall
|
50ff522a37
|
new summary panel for peer reviews
|
2014-03-19 08:48:02 +01:00 |
|
fred-fri
|
71f5beb236
|
fixed bug
|
2014-03-19 16:44:26 +09:00 |
|
fred-fri
|
856f2a04ce
|
fixed bug
|
2014-03-19 16:41:38 +09:00 |
|
Emil Siverhall
|
ac7ec3a4a4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 08:11:42 +01:00 |
|
fred-fri
|
f2ebf2818a
|
fixed bug
|
2014-03-19 15:26:49 +09:00 |
|
fred-fri
|
e9abf001ef
|
changed to button, some refactoring
|
2014-03-19 14:16:27 +09: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 |
|
|
|
6e53b6a53e
|
Made RequestDetailsPanel into a panel that only shows RequestDetails.
(Made PeerPortalPanel worse)
|
2014-03-18 16:58:19 +01:00 |
|
Emil Siverhall
|
4675eb913f
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/test/java/se/su/dsv/scipro/peer/pages/AdminPeerReviewPageTest.java
view/src/test/java/se/su/dsv/scipro/peer/pages/SupervisorPeerReviewPageTest.java
|
2014-03-18 16:34:01 +01:00 |
|
|
|
8116cecfa2
|
Removed unused stuff.
|
2014-03-18 16:30:38 +01:00 |
|
|
|
5510eb6fbe
|
Fixed all tests.
|
2014-03-18 16:25:55 +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 |
|
|
|
3a7e8a0b38
|
Added perform review panel to peer portal page.
|
2014-03-18 15:57:41 +01:00 |
|
|
|
d9c4683103
|
Moved OptionalUnpacker to reusable package.
|
2014-03-18 15:57:32 +01:00 |
|
|
|
db87a5ce73
|
Tuple wtf.
|
2014-03-18 15:54:27 +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 |
|
|
|
58ea54f81e
|
Fixed bad implementation of convertInput()
|
2014-03-18 15:52:30 +01:00 |
|
