6189 Commits

Author SHA1 Message Date
Emil Siverhall
85cd14c333 beta annotation on preliminary grading page and readded upload opposition form to use when new opposition report is in beta stage. 2014-01-14 10:21:50 +01:00
Richard
a8808e8ef7 Merge remote-tracking branch 'origin/develop' into develop 2014-01-14 10:16:41 +01:00
5282c942ae Added credits to project details page if non-zero. 2014-01-14 09:48:10 +01:00
Richard
7fa5658c80 - Continued cleanup of the css-file. 2014-01-13 18:05:00 +01:00
Richard
13f84b57f4 - Minor cleanup of the css-file. 2014-01-13 17:50:59 +01:00
Richard
931c7d7087 Merge remote-tracking branch 'origin/develop' into develop 2014-01-13 17:34:17 +01:00
Richard
38b2fe42c6 - Replaced class rounded-box with well well-sm on all pages.
- Removed class rounded-box from the css.
- Cleanup of nasty HTML-code on different pages.
- Improved styling of perform peer review.
2014-01-13 17:34:05 +01:00
Emil Siverhall
9a75417426 beta annotation on final thesis panel 2014-01-13 16:39:29 +01:00
Emil Siverhall
5ec6ee1a2b Merge remote-tracking branch 'origin/develop' into develop 2014-01-13 16:23:34 +01:00
Emil Siverhall
4edf319fb4 new notification event for opponents on seminar thesis upload. uses it's own notification source since we can't redirect to opposition page for the seminars project 2014-01-13 16:23:22 +01:00
Richard
303cdedd16 Initial styling of the preliminary grading report. 2014-01-13 15:51:37 +01:00
Richard
fd22d87bca Initial styling of the opposition report. (Minor update2) 2014-01-13 15:31:11 +01:00
Richard
c20c7b96e9 Merge remote-tracking branch 'origin/develop' into develop 2014-01-13 15:29:50 +01:00
Richard
cef95d488f Initial styling of the opposition report. (Minor update) 2014-01-13 15:29:43 +01:00
Richard
577dd7f2e6 Initial styling of the opposition report. 2014-01-13 15:21:15 +01:00
Emil Siverhall
140e877097 beta annotation on opposition report page 2014-01-13 10:29:10 +01:00
Richard
cce0df3ffc Merge remote-tracking branch 'origin/develop' into develop 2014-01-10 16:47:17 +01:00
Richard
2d4bca77b4 Moved two divs on author and supervisor ProjectDetailsPage. 2014-01-10 16:46:57 +01:00
Leo
a91ca78467 does not add "..." unless long url 2014-01-10 16:41:52 +01:00
Leo
f46d28d153 shows short URL an opens link in new tab 2014-01-10 16:29:39 +01:00
Leo
d6d17e9d08 Merge remote-tracking branch 'origin/develop' into develop 2014-01-10 15:59:57 +01:00
Leo
424ba662a7 removed constraint forbidding users to book first meeting before application period 2014-01-10 15:59:51 +01:00
Emil Siverhall
e6e43e6fcc Merge remote-tracking branch 'origin/develop' into develop 2014-01-10 15:55:27 +01:00
Emil Siverhall
147bbb5702 fill out report link is only visible if final seminar has an uploaded thesis 2014-01-10 15:54:57 +01:00
Leo
159a9b9db9 URLfield required 2014-01-10 15:43:43 +01:00
Leo
4d90a6a1db Merge remote-tracking branch 'origin/develop' into develop 2014-01-10 15:07:40 +01:00
Leo
e5d9138050 removed visibility options from ThesisLink 2014-01-10 15:07:30 +01:00
Emil Siverhall
069c1d5ae8 made opposition report page use the scrolling save button 2014-01-10 15:02:28 +01:00
Leo
4e44e33b39 removed checkboxes in ThesisLinkPanel 2014-01-10 14:55:18 +01:00
Emil Siverhall
7c910cf327 Merge remote-tracking branch 'origin/develop' into develop 2014-01-10 14:41:45 +01:00
Emil Siverhall
3c9282334d we don't want to save project id in page parameters after submitting opposition report, opponent can't look at the report since abstract project details page redirects; isPartOfProject 2014-01-10 14:41:28 +01:00
Emil Siverhall
1c285e4052 feedback with current time for each save on opposition report 2014-01-10 14:25:17 +01:00
Leo
790912c067 when creating PreliminaryGradingReport you now send author 2014-01-10 14:21:06 +01:00
Emil Siverhall
62b2345c21 Merge remote-tracking branch 'origin/develop' into develop 2014-01-10 14:13:39 +01:00
Leo
81ae2f438a Merge remote-tracking branch 'origin/develop' into develop 2014-01-10 13:53:55 +01:00
Leo
4bd7b0f9f8 disables textareas if submitted 2014-01-10 13:53:47 +01:00
Leo
aefc68140a added success-call and removed a dash from the confirmation dialog because it messed with the java script 2014-01-10 13:44:11 +01:00
Emil Siverhall
48399bcfc7 confirmation message when submitting opposition report 2014-01-10 13:36:48 +01:00
Emil Siverhall
f88bc5a052 Merge remote-tracking branch 'origin/develop' into develop 2014-01-10 13:22:38 +01:00
Emil Siverhall
9f56a3779c application period editing issues 2014-01-10 13:20:11 +01:00
55cf558a83 Fixed tests. 2014-01-10 12:59:08 +01:00
e3d2c16343 Reduced log level. 2014-01-10 10:47:39 +01:00
Emil Siverhall
275170050d Merge remote-tracking branch 'origin/develop' into develop 2014-01-10 10:36:31 +01:00
Emil Siverhall
90f10511c4 delete opposition report when removing opponents 2014-01-10 10:34:16 +01:00
81c79728af Replaced panel with CheckboxMultipleChoice. 2014-01-10 10:04:15 +01:00
9d7f094953 Switched to CompoundPropertyModel. 2014-01-10 09:51:25 +01:00
5afcf44549 Fixed not being able to change name of checklist templates when a detachable model was used. 2014-01-10 09:44:25 +01:00
Emil Siverhall
e53bf2bff2 test fix 2014-01-09 23:56:31 +01:00
Emil Siverhall
90d01d7bf6 opposition report is not finished if thesis summary field is not filled out 2014-01-09 23:47:07 +01:00
Emil Siverhall
fe87103de5 disable form and hide save/finish links if report is submitted 2014-01-09 23:23:09 +01:00