6238 Commits

Author SHA1 Message Date
0b4db492a9 Merge remote-tracking branch 'origin/develop' into develop 2014-03-25 08:42:42 +01:00
fred-fri
a2ead31d40 filter fix 2014-03-25 11:39:50 +09:00
fred-fri
35b6329e36 typo 2014-03-25 11:14:23 +09:00
Emil Siverhall
b649d650f2 review completed by label to authors view review page 2014-03-24 20:11:51 +01:00
Emil Siverhall
a6e6edbf5c unused methods/services 2014-03-24 16:42:20 +01:00
Golrokh Moattar
d3dab29ed6 Merge remote-tracking branch 'origin/develop' into develop 2014-03-24 16:30:23 +01:00
Golrokh Moattar
1cc1ff4252 Replace Statistic-Peer with ProjectManagement-Peers 2014-03-24 16:29:53 +01:00
Emil Siverhall
cb4b272db8 different text if review in progress.. 2014-03-24 16:28:15 +01:00
Emil Siverhall
0cdc88ea3f allow request submission even when review in progress.. 2014-03-24 15:55:17 +01:00
47c5ed827a Minor HTML changes. 2014-03-24 15:32:45 +01:00
Golrokh Moattar
8bda47bc5b Merge remote-tracking branch 'origin/develop' into develop 2014-03-24 15:31:29 +01:00
Emil Siverhall
2ca6e445f8 add/remove methods for active participations 2014-03-24 15:27:30 +01:00
ae374a1e48 Removed test that did nothing. 2014-03-24 15:16:39 +01:00
Golrokh Moattar
d2d91b321e Merge remote-tracking branch 'origin/develop' into develop 2014-03-24 15:01:23 +01:00
Golrokh Moattar
4fa412c4bc Added ProjectType to Admin>Peers filtering 2014-03-24 15:01:05 +01:00
Emil Siverhall
51c2313399 removed peer priority from settings 2014-03-24 14:53:01 +01:00
Emil Siverhall
2a9c377e14 feedback when selection fails 2014-03-24 14:30:53 +01:00
Emil Siverhall
bc749f3542 count reviews doesn't count expired 2014-03-24 14:19:44 +01:00
Emil Siverhall
81a7d6098b peer level settings only available for project types with peer module 2014-03-24 14:17:51 +01:00
Richard
f607e03a30 Removed help icon from ProjectIdeaStartPage.
Moved help info from modal to the page.
2014-03-24 13:14:14 +01:00
Richard
da0d186733 Merge remote-tracking branch 'origin/develop' into develop 2014-03-24 13:06:45 +01:00
Emil Siverhall
bd0a54425c Hide button on request submission panel always visible.. 2014-03-24 12:58:01 +01:00
fred-fri
fa684b3783 peer request visibility fix 2014-03-24 16:51:16 +09:00
fred-fri
61ecbfce90 final seminar pages fixes 2014-03-24 16:15:45 +09:00
fred-fri
05f9c7a9b7 final seminar pages fixes 2014-03-24 15:53:46 +09:00
Richard
d39609d5f5 Merge remote-tracking branch 'origin/develop' into develop 2014-03-24 07:05:50 +01:00
fred-fri
21b72b0f4a keys misc 2014-03-24 12:53:44 +09:00
fred-fri
3f6b4d4be1 forum thread key 2014-03-24 11:47:00 +09:00
fred-fri
4d222bb435 forum post key 2014-03-24 11:43:47 +09:00
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
804a7f03ac application period keys 2014-03-24 11:33:42 +09:00
fred-fri
85ef5d9dd4 schedule template keys 2014-03-24 11:32:15 +09:00
fred-fri
623b89caf0 peerreviewkeys 2014-03-24 11:29:47 +09:00
fred-fri
37db113ade tests 2014-03-24 11:03:23 +09:00
fred-fri
ae723a5ef5 Merge remote-tracking branch 'origin/develop' into develop 2014-03-24 10:37:08 +09:00
fred-fri
5fe7bee78e edit 2014-03-24 10:36:40 +09:00
Richard
856721f835 Merge remote-tracking branch 'origin/develop' into develop 2014-03-21 15:45:39 +01:00
Emil Siverhall
525864f5c1 peer review panel is gone, supervisor peer review page is gone.. 2014-03-21 15:02:06 +01:00
Emil Siverhall
55847eebc9 and admins wants to look at peers as well.. 2014-03-21 15:00:22 +01:00
Emil Siverhall
c4455d61f8 removed Peer tab from Supervisor project overview 2014-03-21 14:52:41 +01:00
Emil Siverhall
4554c758ee review page request details panel simplified 2014-03-21 14:40:42 +01:00
Richard
d856dd551c Merge remote-tracking branch 'origin/develop' into develop 2014-03-21 14:24:40 +01:00
Emil Siverhall
1654a8ebb7 Merge remote-tracking branch 'origin/develop' into develop 2014-03-21 14:13:24 +01:00
Emil Siverhall
aa8f9dc3bf review details panel even more simplified (deleted) 2014-03-21 14:13:03 +01:00
Emil Siverhall
267b00a34a review details panel simplified 2014-03-21 13:58:42 +01:00
Richard
9e5309625d Merge remote-tracking branch 'origin/develop' into develop 2014-03-21 13:49:29 +01:00
3be9dd9a4a Merge remote-tracking branch 'origin/develop' into develop 2014-03-21 13:48:54 +01:00
92fe5ccd9f Created a peer portal header panel instead of trying to have PeerRequestSubmissionPanel do everything. 2014-03-21 13:48:51 +01:00