niklas3
|
a9be361609
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/test/java/se/su/dsv/scipro/admin/panels/settings/EditMileStoneActivityPanelTest.java
|
2013-12-10 17:04:25 +01:00 |
|
niklas3
|
6e2e125de8
|
Fixd tests.
|
2013-12-10 17:03:33 +01:00 |
|
|
|
aba08962ed
|
Borked. Niklas fix.
|
2013-12-10 16:57:57 +01:00 |
|
|
|
a5aaad8e4f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 16:43:15 +01:00 |
|
|
|
d3a66f9272
|
Removed code from ProjectType.
|
2013-12-10 16:43:11 +01:00 |
|
niklas3
|
e376a64f3a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 16:38:49 +01:00 |
|
niklas3
|
01d5e978f9
|
stuffs
|
2013-12-10 16:38:44 +01:00 |
|
niklas3
|
6b9b7fe8e0
|
stuffs
|
2013-12-10 16:38:27 +01:00 |
|
Leo
|
12dbecf059
|
added missed part of commit
|
2013-12-10 16:34:43 +01:00 |
|
Leo
|
3867339538
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 16:28:19 +01:00 |
|
niklas3
|
c279cd6083
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 16:18:19 +01:00 |
|
niklas3
|
cb70afec8d
|
Milestones are now in the DataInitializer.
|
2013-12-10 16:17:13 +01:00 |
|
Leo
|
875376bffa
|
removed block of import and export
|
2013-12-10 16:07:26 +01:00 |
|
|
|
b048a506d9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 15:39:54 +01:00 |
|
|
|
756302c984
|
Changed findByCode to take a DegreeLevel instead.
|
2013-12-10 15:39:49 +01:00 |
|
Emil Siverhall
|
235b894747
|
modified info text on top of grading page
|
2013-12-10 15:27:32 +01:00 |
|
Emil Siverhall
|
2270db3a01
|
added antiplagiarism feedback to pdf export as well
|
2013-12-10 15:24:33 +01:00 |
|
Emil Siverhall
|
72e6ad907d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 15:05:41 +01:00 |
|
Emil Siverhall
|
377e525bb6
|
tests
|
2013-12-10 15:05:27 +01:00 |
|
Emil Siverhall
|
ccb9c04d9a
|
textarea label
|
2013-12-10 15:02:47 +01:00 |
|
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 |
|
