4004 Commits

Author SHA1 Message Date
leosu
09e7e8d3f7 Merge remote-tracking branch 'origin/develop' into develop 2014-02-14 14:49:10 +01:00
leosu
008fb306d8 changed SupervisorGradingReportSubmittedEvent to individual 2014-02-14 14:49:05 +01:00
Emil Siverhall
45e599f6c8 renamed V99 script to avoid pang boom bang when pushing 2014-02-14 14:33:54 +01:00
Emil Siverhall
ac901f540f Merge remote-tracking branch 'origin/develop' into develop 2014-02-14 14:33:03 +01:00
Emil Siverhall
df2383d3ba renamed ProjectFacade to ChecklistFacade since we only perform checklist operations in the class. Also added description from template 2014-02-14 14:32:19 +01:00
fb3bbec7e6 Merge branch 'develop' into improvement/files
Conflicts:
	view/src/main/java/se/su/dsv/scipro/repository/panels/AbstractFilePanel.java
2014-02-14 14:25:53 +01:00
494ad3e75c Added new columns to file_description to prepare for jackrabbit migration. 2014-02-14 14:22:24 +01:00
Golrokh Moattar
829d49a9e0 Activate milestone after seminar created 2014-02-14 14:12:24 +01:00
Emil Siverhall
ab63587d5e description to checklist entity as well 2014-02-14 13:39:11 +01: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
Golrokh Moattar
70c9522bf9 TestCases written for creation of FinalSeminarCreatedEvent cr 2014-02-13 16:22:20 +01:00
Golrokh Moattar
fe1aadc11f Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 16:18:23 +01:00
Emil Siverhall
0950473e76 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 15:45:20 +01:00
Emil Siverhall
c52522d476 description field to checklist templates 2014-02-13 15:11:05 +01:00
leosu
055daa8526 activate milestone when posting grading report events 2014-02-13 14:23:08 +01:00
Golrokh Moattar
77145ab60a "final seminar created" added to "event" table 2014-02-13 14:07:12 +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
086869c2d6 new events in database 2014-02-13 13:29:45 +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
Golrokh Moattar
82e9f74457 FinalThesisUploaded changed to FinalSeminarThesisUploaded 2014-02-13 10:47:24 +01:00
Golrokh Moattar
611e94e445 Milestone activated after seminar uploaded 2014-02-13 10:44:07 +01:00
Golrokh Moattar
d67aaab600 Final Thesis Uploaded event will be sent 2014-02-13 10:14:30 +01:00
Golrokh Moattar
380e02e9b9 Final Thesis Uploaded added to the Event Table 2014-02-13 09:36:26 +01:00
fred-fri
77cec26046 bug fix 2014-02-13 12:57:20 +09:00
leosu
b5a3b4ba5e pleasing sonar 2014-02-12 16:51:25 +01:00
leosu
1187e7833e pleasing sonar
fixed previous error while pleasing sonar
2014-02-12 16:09:44 +01:00
e82d9ae49b Merge branch 'develop' into improvement/files 2014-02-12 15:52:25 +01:00
leosu
0e622720d9 pleasing sonar 2014-02-12 15:38:41 +01:00
c04c57bd7b Changed all core to use the new FileUpload instead of stupid strings and byte[]s. 2014-02-12 15:19:39 +01:00
leosu
bc18444dab updated datainitializer to set correct fx flags 2014-02-12 15:15:53 +01:00
b07da1457b Renamed sql migration scripts. 2014-02-12 15:14:53 +01:00
leosu
e7c3883833 too big file notification title and body 2014-02-12 11:04:13 +01:00
leosu
5914efbdac too big file notification 2014-02-12 11:00:16 +01: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
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
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
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
8904e10251 Attached files to forum posts now show up under files. 2014-02-11 16:56:57 +01:00
leosu
d98dbcfea9 max file size in TurnitinSettingsPage 2014-02-11 15:26:32 +01:00
leosu
03846fbc78 new column in TurnitinSettings 2014-02-11 15:13:44 +01:00
62ee50b3a1 Removed everything folder-related from the files page. 2014-02-11 14:57:02 +01:00
c639e1df6a Files now only lists ProjectFiles, uploading a new file creates a ProjectFile. 2014-02-11 14:32:31 +01:00
leosu
a40f6ed49b Merge remote-tracking branch 'origin/develop' into develop 2014-02-11 14:24:52 +01:00
leosu
3a9523dd2c visibility for gradeContainer 2014-02-11 14:11:25 +01:00
c7a9e14d09 Created new file entity which handles files connected to a project (should be shown in files). 2014-02-11 13:26:56 +01:00
2e20a92fde Added file data to FileDescription as a byte[] 2014-02-11 13:22:39 +01:00
1bd3478a1c Merge remote-tracking branch 'origin/develop' into develop 2014-02-11 12:05:28 +01:00