Richard
|
e4c98c9021
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 10:26:49 +01:00 |
|
Emil Siverhall
|
9d3e8c875a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 10:22:35 +01:00 |
|
Emil Siverhall
|
691ae1ad69
|
same on Admin->Match->Ideas
|
2014-01-15 10:21:39 +01:00 |
|
Emil Siverhall
|
1eb5512de5
|
changed from OnChangeAjaxBehavior to AjaxFormComponentUpdatingBehavior on free text filter (project management)
|
2014-01-15 10:19:18 +01:00 |
|
Richard
|
4f1e485619
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 10:11:46 +01:00 |
|
|
|
d50224c224
|
Added generics.
|
2014-01-15 10:05:33 +01:00 |
|
|
|
355a3a09d7
|
Different text for report link if it is submitted or not.
|
2014-01-15 10:05:10 +01:00 |
|
|
|
d0350a4a88
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 10:00:34 +01:00 |
|
Emil Siverhall
|
0d6a66a147
|
disabled clearance of reviewer in project management since this produced null pointer in auto complete field
|
2014-01-15 09:51:18 +01:00 |
|
Emil Siverhall
|
92b198023c
|
feedback when submitting grading report
|
2014-01-15 08:55:37 +01:00 |
|
Richard
|
2238453417
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-14 17:30:38 +01:00 |
|
Richard
|
ec519c33cc
|
- Replaced details-box with well.
- Removed details-box.
- CSS-cleanup.
|
2014-01-14 17:30:17 +01:00 |
|
|
|
7e98514ada
|
Renamed panel since it is now generic.
|
2014-01-14 15:45:28 +01:00 |
|
|
|
b1cdebf219
|
Merged OppositionReport and PreliminaryGradingReport.
|
2014-01-14 15:42:06 +01:00 |
|
|
|
5bc10281b4
|
Fixed database schema.
|
2014-01-14 14:31:38 +01:00 |
|
|
|
9be491336d
|
Fixed FillOutPreliminaryGradingReportPanel so that the report gets submitted and saved correctly.
|
2014-01-14 14:04:12 +01:00 |
|
|
|
842e293338
|
Removed preliminary grading criterion and used opposition criterion everywhere.
|
2014-01-14 13:47:50 +01:00 |
|
|
|
21ff54fb23
|
Fixed tests. These tests are badly written and need to fetch their expected message from the .properties file to prevent future errors like these.
|
2014-01-14 13:01:01 +01:00 |
|
|
|
d4facd3f9e
|
Made methods private.
|
2014-01-14 11:38:48 +01:00 |
|
Richard
|
b4460771ee
|
- Removed ECTS-credits, added hp.
|
2014-01-14 11:02:26 +01:00 |
|
Richard
|
a887fd0912
|
- Removed parenthesis, added comma.
|
2014-01-14 11:01:12 +01:00 |
|
Richard
|
ee39582884
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-14 10:32:36 +01:00 |
|
Richard
|
b028f3e3b7
|
- Changes to text on the thesis link panels.
|
2014-01-14 10:32:29 +01:00 |
|
Emil Siverhall
|
0d312ccba4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-14 10:22:52 +01:00 |
|
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 |
|
