niklas3
|
46b5526746
|
Passed more correctness to project grading criterion template.
|
2013-12-10 14:58:20 +01:00 |
|
niklas3
|
c4a5f7d957
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 14:47:27 +01:00 |
|
niklas3
|
6a6a2e21f7
|
Passed the correct ProjectType to grading report template.
|
2013-12-10 14:47:24 +01:00 |
|
Emil Siverhall
|
ec2293a611
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 14:45:52 +01:00 |
|
Emil Siverhall
|
91c748aa35
|
textarea to write plagiarism feedback in grading report. pdf download is not enabled if feedback is missing.
|
2013-12-10 14:45:30 +01:00 |
|
niklas3
|
8faf73d054
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 14:10:49 +01:00 |
|
niklas3
|
0ffe26e41e
|
added project ready for grading
|
2013-12-10 14:10:42 +01:00 |
|
Richard
|
04490a80d1
|
Added bootstrap-styling to project partner textarea.
|
2013-12-10 14:08:31 +01:00 |
|
Emil Siverhall
|
56266ea2fc
|
plagiarismFeedback column to grading_report table
|
2013-12-10 13:49:39 +01:00 |
|
Richard
|
46d338eb7b
|
CSS-override of selects to make it easier to clear the field.
|
2013-12-10 13:32:12 +01:00 |
|
Emil Siverhall
|
a117c390ab
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 11:32:10 +01:00 |
|
|
|
31f024c734
|
Made degree level not null in ProjectType and added NONE as default.
|
2013-12-10 11:31:35 +01:00 |
|
niklas3
|
c409a3d0d8
|
more data in dataInitializer
|
2013-12-10 11:26:16 +01:00 |
|
Emil Siverhall
|
a2bcbbc021
|
added close button to autocomplete choice
|
2013-12-10 11:23:59 +01:00 |
|
Richard
|
b8a0ace5f2
|
Style changes to the thesisapprovedpanel.
|
2013-12-10 10:59:24 +01:00 |
|
Richard
|
23f644e92e
|
Removed colon from filterformcheckboxpanel.
|
2013-12-10 10:13:40 +01:00 |
|
Richard
|
1cfa36ab1d
|
Added styling to create checklist template popup.
|
2013-12-10 10:11:16 +01:00 |
|
Emil Siverhall
|
6c908ec5f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 09:55:51 +01:00 |
|
Emil Siverhall
|
8ecaa6806c
|
renamed faulty projectClass property model
|
2013-12-10 09:55:35 +01:00 |
|
niklas3
|
76bf7079b6
|
some new checks for not exporting other than in production (again)
|
2013-12-10 09:46:10 +01:00 |
|
niklas3
|
fab88466e7
|
some new checks for not exporting other than in production
|
2013-12-10 09:42:34 +01:00 |
|
niklas3
|
3af9816b4b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 09:30:12 +01:00 |
|
niklas3
|
8844d3222b
|
cleaning
|
2013-12-10 09:30:00 +01:00 |
|
fred-fri
|
80c732668d
|
sql fix
|
2013-12-10 16:09:21 +09:00 |
|
fred-fri
|
7082accc84
|
markup test fix
|
2013-12-10 15:51:57 +09:00 |
|
fred-fri
|
01644252e5
|
fixed sql
|
2013-12-10 15:08:07 +09:00 |
|
fred-fri
|
7f490b4b63
|
sql fixes
|
2013-12-10 11:23:09 +09:00 |
|
fred-fri
|
acbf553040
|
sql fixes
|
2013-12-10 10:38:56 +09:00 |
|
fred-fri
|
0e5fe3794e
|
sql fixes
|
2013-12-10 10:12:37 +09:00 |
|
fred-fri
|
29a1f687e2
|
sql fixes
|
2013-12-10 09:20:25 +09:00 |
|
Emil Siverhall
|
f7c197b594
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 20:13:09 +01:00 |
|
Emil Siverhall
|
c24980d0aa
|
motivering i stället för omdöme i pdf-mallen
|
2013-12-09 20:12:47 +01:00 |
|
Per Lundholm
|
451607cd5c
|
Renamed DegreeLevel to ProjectType
|
2013-12-09 17:10:46 +01:00 |
|
|
|
a6b24245a7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 16:20:04 +01:00 |
|
Richard
|
06bc63cb60
|
Minor styling to FillOutGradingReportPanel:
- Text before grade is shown changed.
- Feedbackpanel moved up above the input for points.
|
2013-12-09 16:15:01 +01:00 |
|
Richard
|
77c0d1b442
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 16:02:27 +01:00 |
|
Emil Siverhall
|
ea504e5620
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 15:59:36 +01:00 |
|
Emil Siverhall
|
dce3431323
|
added author name to pdf header
|
2013-12-09 15:59:24 +01:00 |
|
Richard
|
f87fa9d170
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 15:59:11 +01:00 |
|
Richard
|
b8e8981982
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 15:58:42 +01:00 |
|
Richard
|
ce0a1e540b
|
Aligned filters on SupervisorMyProjectsPanel so that all three are on the same row.
|
2013-12-09 15:58:36 +01:00 |
|
Per Lundholm
|
ecf78cf800
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 15:58:32 +01:00 |
|
Leo
|
e8f38aba54
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 15:58:10 +01:00 |
|
Leo
|
ee3106da03
|
changed from "omdöme" to "motivering"
|
2013-12-09 15:58:04 +01:00 |
|
Per Lundholm
|
e2ac1fe48f
|
Renamed DegreeLevel to ProjectType
|
2013-12-09 15:52:43 +01:00 |
|
|
|
e23aa5c275
|
Criteria are not considered assessed until both points and feedback have been set.
|
2013-12-09 15:32:32 +01:00 |
|
|
|
6873e51135
|
Made it nullable until the dust settles.
|
2013-12-09 15:18:12 +01:00 |
|
|
|
63da734ba5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 14:58:10 +01:00 |
|
|
|
ffb7003fa6
|
Added degree level enum to degree level the entity :)
|
2013-12-09 14:57:30 +01:00 |
|
Emil Siverhall
|
741b0861b7
|
project class filter on all supervisor ideas panel
|
2013-12-09 14:20:51 +01:00 |
|
