6916 Commits

Author SHA1 Message Date
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
fred-fri
b70d0bef5d styling 2014-02-12 17:56:05 +09:00
7f7aebc9be Renamed ProjectFileUploadWicketImpl to WicketProjectFileUpload 2014-02-12 09:37:16 +01:00
dfb1024bfa Renamed FileUploadWicketImpl to WicketFileUpload 2014-02-12 09:36:25 +01:00
205cdb2217 Model setting is now done in FileLink instead of duplicated in download and open. 2014-02-12 09:32:30 +01:00
cd69aa02ef Made generics follow all the way through so you can use getModelObject() if you want to override some behaviour. 2014-02-12 09:26:23 +01:00
76648a1e23 Merge branch 'develop' into improvement/files
Conflicts:
	core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/FileDescriptionServiceImpl.java
	core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/FileDescriptionServiceImplIntegrationTest.java
	view/src/main/java/se/su/dsv/scipro/repository/components/FileOpenLink.java
2014-02-12 09:21:32 +01:00
891baf73c7 Merge remote-tracking branch 'origin/develop' into develop 2014-02-12 09:17:25 +01:00
47e1e7b537 Removed a bunch of methods from the FileDescriptionService interface that were either used only internally by the implementation or only in tests. 2014-02-12 09:01:31 +01:00
fred-fri
eb9e9be466 fixed some issues 2014-02-12 13:10:47 +09:00
fred-fri
904aacf9d1 fixes 2014-02-12 13:07:18 +09:00
fred-fri
bc2aa137e8 fixed remaining issues 2014-02-12 12:06:44 +09:00
fred-fri
92e8946bb8 fixed sortorder enum 2014-02-12 12:02:50 +09:00
fred-fri
aa05ff1f01 fixed logger statements 2014-02-12 10:51:45 +09:00
6454fc7dff Completely rewrote FileDownload/OpenLink 2014-02-11 17:43:31 +01:00
8904e10251 Attached files to forum posts now show up under files. 2014-02-11 16:56:57 +01:00
leosu
e5b418ce1c confirmation 2014-02-11 16:49:30 +01:00
leosu
c871720290 delete now works even if an opposition report exists 2014-02-11 16:43:25 +01:00
leosu
adb615cc23 oppositionGradingForm gets hidden after submit 2014-02-11 16:13:13 +01:00
d839961124 Extract ProjectFileUploadWicketImpl so it can be used for the forum as well. 2014-02-11 16:05:04 +01:00
515cc97648 Added feedback when a file gets uploaded. 2014-02-11 16:02:15 +01:00
ff8bdaef71 Cleaning. 2014-02-11 16:00:21 +01:00
06efa9662b Removed try/catch for exception that can never get thrown. 2014-02-11 15:49:27 +01:00