3982 Commits

Author SHA1 Message Date
Emil Siverhall
6aefd1a5e9 Started working on grading report entitites 2013-11-08 08:41:01 +01:00
fred-fri
6f442ff84d removed ehcache 2013-11-08 13:49:01 +09:00
fred-fri
7c46671c66 removed all cache annotations 2013-11-08 12:31:33 +09:00
819f6f4654 Fixed violations. 2013-11-07 17:01:31 +01:00
1daf8822dc Merge remote-tracking branch 'origin/develop' into develop 2013-11-07 16:16:41 +01:00
b195f10dd7 Fixed critical issues. 2013-11-07 16:16:36 +01:00
Emil Siverhall
e73cdd65e3 Merge remote-tracking branch 'origin/develop' into develop 2013-11-07 14:54:15 +01:00
Emil Siverhall
a2cabad87e removed unnecessary one-to-many relationship milestone phase -> milestone activities. 2013-11-07 14:53:34 +01:00
f8b6d206ed Suppressed warnings about unused feels due to Lombok. 2013-11-07 14:42:28 +01:00
niklas3
08e2e8d41e Added ApproveFinalThesisPanel. 2013-11-07 14:34:50 +01:00
niklas3
2bd31d6e09 Clean up in aisle 3. 2013-11-07 14:33:15 +01:00
8a649c90c6 Moved logic determining if uploading a final thesis is allowed to the service layer from view. 2013-11-07 13:55:04 +01:00
71049b37df Uploading final thesis form is hidden if there exists a final thesis in NOT_DECIDED or APPROVED status. 2013-11-07 13:31:42 +01:00
e831d6119b Added FinalThesis status. 2013-11-07 12:59:52 +01:00
0f3f6a4057 Fixed query and cleaned up some code. 2013-11-07 11:20:08 +01:00
fred-fri
feaff63846 testfix 2013-11-07 18:25:54 +09:00
fred-fri
75aee12600 testfix 2013-11-07 18:25:41 +09:00
fred-fri
d3291581a6 testfix 2013-11-07 17:32:52 +09:00
fred-fri
86ecaf5f76 store method that actually works 2013-11-07 16:41:11 +09:00
fred-fri
d5faab1d9a fixed npe 2013-11-07 14:32:10 +09:00
Leo
adecd427cf added data to override equals() 2013-11-06 14:39:10 +01:00
Leo
8724866949 merge 2013-11-06 14:28:14 +01:00
Leo
4ac389a2a3 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/test/java/se/su/dsv/scipro/project/panels/FinalThesisPanelTest.java
2013-11-06 14:26:41 +01:00
Emil Siverhall
2283b4dfdb Merge remote-tracking branch 'origin/develop' into develop 2013-11-06 13:51:15 +01:00
Emil Siverhall
84df6b7255 added notification when uploading final thesis 2013-11-06 13:50:27 +01:00
Leo
7a8a7d5e11 hides uploadForm if no final seminar has taken place 2013-11-06 13:48:50 +01:00
Leo
ed5d86920c removed unused columns in FinalSeminar 2013-11-06 11:46:12 +01:00
Leo
d3244541e0 added help needed for days filter 2013-11-06 11:10:41 +01:00
Leo
ff06b03a2c Merge remote-tracking branch 'origin/develop' into develop 2013-11-06 09:36:09 +01:00
Leo
2da377611e fixed project follower bug 2013-11-06 09:35:49 +01:00
Emil Siverhall
420c526eab added scipro base url to notifications created by idea export worker for proper url creation 2013-11-05 16:58:19 +01:00
Emil Siverhall
793536b496 Merge remote-tracking branch 'origin/develop' into develop 2013-11-05 15:32:35 +01:00
Emil Siverhall
1614f758bb fixed NPE in ProjectScheduleFacadeImpl when trying to add predefined activity plan in our import job 2013-11-05 15:31:19 +01:00
Leo
11cc94bd86 added mocktest to FinalThesisService 2013-11-05 15:14:08 +01:00
Leo
72c0667c09 implementation and tests for getFinalThesisFileDescription 2013-11-05 12:51:33 +01:00
Leo
ec87a64ffc implementation and tests for hasFinalThesis 2013-11-05 11:44:50 +01:00
fred-fri
5a6f2cc09d authorization fixes 2013-11-05 16:09:59 +09:00
niklas3
215bfe1af0 Revert 2013-11-04 16:09:53 +01:00
niklas3
d8104b7155 Re-added public empty constructor to FPRSI. 2013-11-04 15:53:05 +01:00
niklas3
294431a103 Merge remote-tracking branch 'origin/develop' into develop 2013-11-04 15:51:21 +01:00
Emil Siverhall
541ee78f71 milestone completed before date filter added to milestone statistics 2013-11-04 15:13:56 +01:00
niklas3
a452fefa13 Added @Data on ForumPostReadStateId. 2013-11-04 14:46:52 +01:00
f18fdad285 Changed thesis type id for bachelor to 56 from 3. If you do not know what 56 is well, time to read up! 2013-11-04 10:28:45 +01:00
Emil Siverhall
98d5905ac4 Removed unnecessary exception logging when authentication fails. 2013-11-04 10:23:10 +01:00
Emil Siverhall
212d6e574b Since old supervisor ideas is still available for student selection, we can't specify a certain date where ideas needs to be created after when checking if they are exportable 2013-11-04 10:18:09 +01:00
25f0804cbf Merge remote-tracking branch 'origin/develop' into develop 2013-11-01 16:49:36 +01:00
4d74866eae Start of FinalThesisService implementation. 2013-11-01 16:49:32 +01:00
niklas3
b2ebfed3cc Clean up in aisle 2. 2013-11-01 16:29:53 +01:00
niklas3
c551cb0dcb Clean up in aisle 1. 2013-11-01 16:10:33 +01:00
b01bcc4da3 Merge remote-tracking branch 'origin/develop' into develop 2013-11-01 15:37:07 +01:00