|
|
6373e404e7
|
Removed unused code.
|
2013-12-11 11:20:04 +01:00 |
|
niklas3
|
3cc9461698
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 11:12:45 +01:00 |
|
niklas3
|
d31f947584
|
stuff
|
2013-12-11 11:12:41 +01:00 |
|
|
|
8d9babbf77
|
Simplified.
|
2013-12-11 11:11:41 +01:00 |
|
Emil Siverhall
|
5867968066
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 11:10:52 +01:00 |
|
Emil Siverhall
|
4d60422538
|
only project types with a valid degree level is default filter options on admin pages
|
2013-12-11 11:03:04 +01:00 |
|
niklas3
|
c68252eeb6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 10:59:35 +01:00 |
|
Leo
|
3db25db883
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 10:44:15 +01:00 |
|
Leo
|
2f5544049e
|
added missed part of commit
|
2013-12-11 10:44:01 +01:00 |
|
fred-fri
|
068cc36676
|
removed arrow
|
2013-12-11 17:56:17 +09:00 |
|
Emil Siverhall
|
1f2b9c79ee
|
merge
|
2013-12-11 09:29:49 +01:00 |
|
Emil Siverhall
|
a2fe73262e
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/admin/panels/settings/EditMileStoneActivityPanel.java
|
2013-12-11 09:29:20 +01:00 |
|
Emil Siverhall
|
5a9988c841
|
renamed project class service and project class repo
|
2013-12-11 09:28:21 +01:00 |
|
|
|
e659a610d4
|
setRequired(boolean) does not work on multiple checkbox components.
|
2013-12-11 09:00:52 +01:00 |
|
Emil Siverhall
|
8401c3c897
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 08:38:34 +01:00 |
|
Emil Siverhall
|
635e1b5c89
|
feedback when trying to submit a peer request without file attached
|
2013-12-11 08:36:40 +01:00 |
|
fred-fri
|
ff3d8cfd0c
|
showing and disabling checkbox on exception activities
|
2013-12-11 12:33:51 +09:00 |
|
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
|
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
|
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
|
ccb9c04d9a
|
textarea label
|
2013-12-10 15:02:47 +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 |
|
Richard
|
04490a80d1
|
Added bootstrap-styling to project partner textarea.
|
2013-12-10 14:08:31 +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 |
|
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
|
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 |
|
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 |
|
