6238 Commits

Author SHA1 Message Date
fred-fri
c73a89bacc cleaning 2014-02-14 15:23:59 +09:00
d1344644ae Merge branch 'develop' into improvement/files
Conflicts:
	core/src/test/java/se/su/dsv/scipro/data/controllers/impl/FinalSeminarUploadControllerImplTest.java
2014-02-13 17:02:50 +01:00
b9fdd0d17b Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 16:56:15 +01:00
Emil Siverhall
8046d16348 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 16:28:30 +01:00
Emil Siverhall
55a4d93712 fixed project type sorting 2014-02-13 16:28:18 +01:00
019ed5fe2e Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 16:14:20 +01:00
leosu
861596f8f4 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 16:12:58 +01:00
leosu
6bdd61885b visibility for grade container 2014-02-13 16:12:46 +01:00
Emil Siverhall
0950473e76 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 15:45:20 +01:00
Emil Siverhall
2e3ffc6178 possible to add a description when creating/editing a checklist template 2014-02-13 15:45:03 +01:00
leosu
b5269490db Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 14:56:25 +01:00
leosu
98ff87cc3d hide label if not supervisor 2014-02-13 14:56:13 +01:00
Richard
a33db1ff63 Moved wicket:id from well to row. 2014-02-13 14:47:08 +01:00
Richard
f1a0148820 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 14:43:13 +01:00
Richard
fe55d7a433 Changes to the styling (points and motivation). 2014-02-13 14:43:04 +01:00
leosu
eaef3c698e Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 14:23:29 +01:00
Emil Siverhall
5003e6f0d5 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 14:17:33 +01:00
Emil Siverhall
1bfdd79596 some cleanup 2014-02-13 14:17:17 +01:00
leosu
f63a05b666 posts SubmittedEvents 2014-02-13 13:56:55 +01:00
leosu
e5761b5986 moved OppositionReportService to where it belongs 2014-02-13 13:48:10 +01:00
leosu
bafb2018a0 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 13:25:44 +01:00
leosu
d85b51e0ec hides empty comments 2014-02-13 13:02:51 +01:00
fred-fri
8b614b250f Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 19:54:47 +09:00
fred-fri
ff7ecb6b45 refactoring application period exemptions 2014-02-13 19:54:24 +09:00
Richard
a79fc4f126 Column changes 2014-02-13 11:16:34 +01:00
Golrokh Moattar
1ece2025f7 The old way for activating a milestone removed 2014-02-13 10:56:34 +01:00
fred-fri
ab81bd4fb0 fixed pdf bug 2014-02-13 17:29:12 +09:00
fred-fri
2401e622ff fixes 2014-02-13 16:36:59 +09:00
fred-fri
77cec26046 bug fix 2014-02-13 12:57:20 +09:00
Richard
c3e98a9273 Merge remote-tracking branch 'origin/develop' into develop 2014-02-12 17:21:44 +01:00
Richard
a0bfb4184b Initial styling of the grading criteria on the final seminar panel. 2014-02-12 17:21:36 +01:00
leosu
d24421f2a4 Merge remote-tracking branch 'origin/develop' into develop 2014-02-12 16:51:32 +01:00
leosu
b5a3b4ba5e pleasing sonar 2014-02-12 16:51:25 +01:00
Richard
50fbef0a97 Changed colors on the checklist comments. 2014-02-12 16:21:33 +01:00
Richard
3df12b8a81 Merge remote-tracking branch 'origin/develop' into develop 2014-02-12 16:12:11 +01:00
Richard
3b75c30c77 Design changes to the comments in checklists. 2014-02-12 16:12:02 +01:00
leosu
1187e7833e pleasing sonar
fixed previous error while pleasing sonar
2014-02-12 16:09:44 +01:00
Richard
5501d0bec2 Design changes to the comments in checklists. 2014-02-12 16:07:17 +01:00
e82d9ae49b Merge branch 'develop' into improvement/files 2014-02-12 15:52:25 +01:00
b4867a19d7 Merge remote-tracking branch 'origin/develop' into develop 2014-02-12 15:52:09 +01:00
4ea7964846 Fixed view to use FileUpload. 2014-02-12 15:51:54 +01:00
Richard
45923330f9 Minor changes for better visibility on larger screens. 2014-02-12 15:03:57 +01:00
leosu
708874e0a6 bigger dialog window 2014-02-12 11:44:01 +01:00
leosu
15adf01b4f fixed failing tests 2014-02-12 11:22:58 +01:00
leosu
a210b2bbf5 Merge remote-tracking branch 'origin/develop' into develop 2014-02-12 11:04:29 +01:00
leosu
5914efbdac too big file notification 2014-02-12 11:00:16 +01:00
fred-fri
4105483d65 lazy fix 2014-02-12 18:31:40 +09:00
fred-fri
3156506892 styling 2014-02-12 18:18:56 +09:00
leosu
34134f40c6 worker does not sent big files to Turnitin
label with size info in SeminarPanel
2014-02-12 10:15:51 +01:00
fred-fri
5f9d8def6e instructions 2014-02-12 18:15:12 +09:00