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
|
ce0c4eae42
|
removed unused stuff
|
2014-03-18 16:21:16 +01:00 |
|
|
|
82df883fac
|
Fixed compilation errors.
|
2014-03-18 16:14:00 +01:00 |
|
|
|
549d8bc6eb
|
Changed some exception stuff.
|
2014-03-18 16:07:05 +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 |
|
|
|
58ea54f81e
|
Fixed bad implementation of convertInput()
|
2014-03-18 15:52:30 +01:00 |
|
Emil Siverhall
|
8ec76d1f48
|
page asserting components with their own visibility logic
|
2014-03-18 15:43:57 +01:00 |
|
Emil Siverhall
|
bde513f877
|
unused panels
|
2014-03-18 15:39:31 +01:00 |
|
Emil Siverhall
|
64a58fd6bc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-18 15:35:08 +01:00 |
|
Emil Siverhall
|
f521bff198
|
fixed visibility logics
|
2014-03-18 15:34:36 +01:00 |
|
Emil Siverhall
|
826497cd5f
|
hide panel if no peers are available
|
2014-03-18 15:30:22 +01:00 |
|
Emil Siverhall
|
f2c32b4c6f
|
link to reviews if request are completed
|
2014-03-18 15:20:44 +01:00 |
|
|
|
7ca5b5d2f5
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/panels/PerformReviewPanel.java
|
2014-03-18 14:56:08 +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 |
|
Emil Siverhall
|
69b6b531f1
|
requests and reviews header now inside enclosure depending on listview is empty or not
|
2014-03-18 14:29:14 +01:00 |
|
|
|
8aef3c6aa9
|
Handle submit errors.
|
2014-03-18 14:25:18 +01:00 |
|
Emil Siverhall
|
409f161b34
|
cancel link only visible on awaiting requests
|
2014-03-18 14:20:58 +01:00 |
|
|
|
871c09bbed
|
Submitting a PeerReview validates answers and stuff.
|
2014-03-18 14:19:29 +01:00 |
|
Golrokh Moattar
|
6c5f74bfcc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-18 14:11:30 +01:00 |
|
Golrokh Moattar
|
1f228b404d
|
Continuing merging the four tabs on the peer. Now many unused pages are removed.
|
2014-03-18 14:11:25 +01:00 |
|
|
|
85b2011c93
|
When accepting request the checklist questions are copied to answer objects immediately.
|
2014-03-18 14:00:51 +01:00 |
|
|
|
8a46577a34
|
TrafficLightPanel now updates its model object if used in a form.
|
2014-03-18 13:51:17 +01:00 |
|
Emil Siverhall
|
4450cd2c73
|
my peers panel
|
2014-03-18 13:50:50 +01:00 |
|
|
|
6cf6a45882
|
Refactored PerformReviewPanel
|
2014-03-18 13:49:25 +01:00 |
|
|
|
a2128f7253
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-18 13:28:35 +01:00 |
|
leosu
|
5871da3a3d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-18 13:18:35 +01:00 |
|
leosu
|
9019a04037
|
comment thread repo stuff
|
2014-03-18 13:18:30 +01:00 |
|
Golrokh Moattar
|
fc0dc7c18e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-18 11:37:41 +01:00 |
|
Golrokh Moattar
|
7caf840e91
|
Continuing merging the four tabs on the peer. Now there is no sub_menu under Peer menu.
|
2014-03-18 11:37:18 +01:00 |
|
|
|
63ef157924
|
Renamed freeTextAnswer to motivation.
|
2014-03-18 11:34:51 +01:00 |
|
|
|
c09c856ea2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-18 11:02:51 +01:00 |
|
