3979 Commits

Author SHA1 Message Date
0201113425 Removed data column from file_description table and added foreign key constraint to user. 2014-02-17 17:25:19 +01:00
523df0d0b4 Merge remote-tracking branch 'origin/develop' into improvement/files 2014-02-17 17:15:51 +01:00
834cc418c7 Files are now stored/retrieved on disk rather than in the database. 2014-02-17 17:14:28 +01:00
0010aa6ce9 Clean up. 2014-02-17 17:13:34 +01:00
Emil Siverhall
62c4b9d757 removed unused method 2014-02-17 17:07:30 +01:00
Emil Siverhall
0a5f27dc14 Merge remote-tracking branch 'origin/develop' into develop 2014-02-17 16:43:08 +01:00
Emil Siverhall
71e0e8f356 removed checklistrole, addchecklistpanel and refactoring 2014-02-17 16:42:48 +01:00
Golrokh Moattar
908b273c59 Merge remote-tracking branch 'origin/develop' into develop 2014-02-17 16:10:45 +01:00
Emil Siverhall
426c30d0a7 Merge remote-tracking branch 'origin/develop' into develop 2014-02-17 15:37:29 +01:00
Emil Siverhall
2299dfb602 removed old list checklist panel and implemented remove checklist properly 2014-02-17 15:35:18 +01:00
Emil Siverhall
b2baa8becb allow remove checklist only if it isn't attached to an activity plan 2014-02-17 15:15:32 +01:00
Golrokh Moattar
bdf6da1ada In DataInitializer, usernames changed to email addresses 2014-02-17 14:18:39 +01:00
leosu
00b4ca0eea cleanup 2014-02-17 14:12:03 +01:00
Golrokh Moattar
354a387ea2 Merge remote-tracking branch 'origin/develop' into develop 2014-02-17 13:40:20 +01:00
Golrokh Moattar
7d400d2549 Milstone deactivation after deletion of FinalSeminar tested and problem with deleted fixed 2014-02-17 13:40:08 +01:00
f9f6efa7a9 Made type nullable until migration is done. 2014-02-17 13:38:44 +01:00
2c35825ae8 Merge remote-tracking branch 'origin/develop' into improvement/files
Conflicts:
	core/src/main/java/se/su/dsv/scipro/activityplan/facade/ProjectScheduleFacadeImpl.java
	core/src/main/java/se/su/dsv/scipro/peer/PeerPortal.java
	core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/FileDescriptionServiceImpl.java
	core/src/main/java/se/su/dsv/scipro/springdata/services/FileDescriptionService.java
	core/src/main/java/se/su/dsv/scipro/springdata/services/FinalThesisService.java
	view/src/main/java/se/su/dsv/scipro/repository/panels/AbstractFilePanel.java
2014-02-17 13:02:19 +01:00
fred-fri
7a970dfe2d cleaning 2014-02-17 20:20:50 +09:00
fred-fri
5a83baa422 cleaning 2014-02-17 13:17:14 +09:00
fred-fri
9664ca99ee refactoring to remove critical 2014-02-17 10:34:41 +09:00
Golrokh Moattar
e00899aeea Milstone deactivation for the deleted final seminar added 2014-02-14 16:42:47 +01:00
Golrokh Moattar
bb80108108 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/test/java/se/su/dsv/scipro/milestones/service/MilestoneActivatorTest.java
2014-02-14 15:43:36 +01:00
Golrokh Moattar
3a487a5304 Event class for deletion of a FinalSeminar created 2014-02-14 15:32:28 +01:00
Emil Siverhall
ca63babcd7 Merge remote-tracking branch 'origin/develop' into develop 2014-02-14 15:19:11 +01:00
Emil Siverhall
f62048beed displaying checklist description on ViewChecklistPage (if one exists) 2014-02-14 15:16:27 +01:00
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