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 |
|
|
|
06d0a26819
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-13 15:27:32 +01:00 |
|
|
|
d2c75c331a
|
Updated Daisy API xsd.
|
2014-01-13 15:27:15 +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 |
|
Emil Siverhall
|
07ef93ddb6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-13 08:33:18 +01:00 |
|
Emil Siverhall
|
2c83dbd4f6
|
oops
|
2014-01-13 08:19:36 +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
|
f571727cdb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-10 15:43:51 +01:00 |
|
Leo
|
159a9b9db9
|
URLfield required
|
2014-01-10 15:43:43 +01:00 |
|
Emil Siverhall
|
465d39ea2c
|
sort gradingcriteria on preliminary grading report
|
2014-01-10 15:42:08 +01:00 |
|
Emil Siverhall
|
2377b369d0
|
moved sort order comparation to abstract criterion
|
2014-01-10 15:20:03 +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
|
e484300fcd
|
DataInitializer now runs migration first
|
2014-01-10 14:22:35 +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
|
dc4794a874
|
added override tag
|
2014-01-10 14:08:30 +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 |
|
|
|
91689ed80d
|
Included GradingReport in the Report class hierarchy.
|
2014-01-10 12:25:43 +01:00 |
|
|
|
140b27a712
|
Re-added author back to PreliminaryGradingReport.
|
2014-01-10 12:11:46 +01:00 |
|
Leo
|
a78a838a44
|
added a missing FK
|
2014-01-10 11:53:43 +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 |
|
