16944 Commits

Author SHA1 Message Date
Emil Siverhall
d0dedb7fed changed logging level when user is attempting to switch user. Only keep error logging if the user is trying to switch without sysadmin role 2013-11-05 14:34:20 +01:00
Emil Siverhall
5bda67d5cb changed logging level when user is authenticated but not found through api 2013-11-05 13:52:17 +01:00
Emil Siverhall
5e9236f110 merge 2013-11-05 13:08:09 +01:00
Leo
72c0667c09 implementation and tests for getFinalThesisFileDescription 2013-11-05 12:51:33 +01:00
Emil Siverhall
8ac35cefb6 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaOverviewPanel.html
2013-11-05 11:53:55 +01:00
Emil Siverhall
034cfbe3c6 refactoring of admin idea panels to avoid duplication 2013-11-05 11:46:59 +01:00
Leo
ec87a64ffc implementation and tests for hasFinalThesis 2013-11-05 11:44:50 +01:00
Richard
1b542a6a7c Minor css-changes on admin/ideas and edit keyword popup. 2013-11-05 11:40:45 +01:00
Richard
33d30dd6a6 Fixed checkbox not having correct padding on reviewing page. 2013-11-05 11:25:54 +01:00
Richard
70e253035d Minor change in CSS regarding horizontal scrollbar in modal windows. 2013-11-05 11:16:24 +01:00
Emil Siverhall
84a13ea582 switch to use ProjectClassFilter on a few places 2013-11-05 09:05:15 +01:00
fred-fri
5a6f2cc09d authorization fixes 2013-11-05 16:09:59 +09:00
Richard
c8814f3bb7 Fix that removes the horizontal scrollbar on pages and in the modal windows. 2013-11-04 17:55:12 +01:00
niklas3
5206dfcbc0 REVERT THE REVERT! 2013-11-04 16:18:49 +01:00
niklas3
215bfe1af0 Revert 20131104 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
63817b3206 some constants for testing 2013-11-04 15:15:25 +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
Emil Siverhall
16326736e3 made sure we show feedback when updating supervisor target numbers 2013-11-04 13:03:39 +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
Per Lundholm
8e51c8074e Set logging from ehcache to "error". 2013-11-01 17:00:27 +01:00
Per Lundholm
72ae3d5b0d Block warnings from hibernate 2013-11-01 16:57:14 +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
44358328d0 Merge remote-tracking branch 'origin/develop' into develop 2013-11-01 16:10:37 +01:00
niklas3
c551cb0dcb Clean up in aisle 1. 2013-11-01 16:10:33 +01:00
ac9889365e Handle invalid page parameters by sending the user to the project idea start page. 2013-11-01 16:09:27 +01:00
6433d70048 Readded deleted constructor. 2013-11-01 15:44:58 +01:00
9976c164ab Readded deleted constructor. 2013-11-01 15:44:12 +01:00
bee5c43cc4 Readded deleted constructor. 2013-11-01 15:43:57 +01:00
b01bcc4da3 Merge remote-tracking branch 'origin/develop' into develop 2013-11-01 15:37:07 +01:00
a82b48525e Panel to upload and download final theses. 2013-11-01 15:37:02 +01:00
niklas3
5e0d70492b Merge remote-tracking branch 'origin/develop' into develop 2013-11-01 14:53:29 +01:00
niklas3
571cbca977 Removed unnecessary serializableUID fields. 2013-11-01 14:53:26 +01:00
1d146c850b Merge remote-tracking branch 'origin/develop' into develop 2013-11-01 14:38:57 +01:00
b8198fb210 WARN logging statements generate mails. Enjoy 2013-11-01 14:38:50 +01:00
Per Lundholm
c67e594b9c Merge remote-tracking branch 'origin/develop' into develop 2013-11-01 14:25:38 +01:00
Per Lundholm
598f366fa0 Changed the log level to warning. Added test. 2013-11-01 14:25:27 +01:00
Per Lundholm
e8b3d2007e Merge 2013-11-01 14:02:10 +01:00
Leo
bd551dc3ae Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/datatables/target/EditTargetPanel.java
2013-11-01 13:58:49 +01:00
Leo
a9469d728f fixed error with saving new targets 2013-11-01 13:57:19 +01:00
niklas3
1c43feda98 Merge remote-tracking branch 'origin/develop' into develop 2013-11-01 13:41:54 +01:00
niklas3
d52421a4e0 Added braces to all if/else/for/while/do statements which had none. 2013-11-01 13:41:50 +01:00
Per Lundholm
a6e19495ed Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/workerthreads/MailEventWorker.java
2013-11-01 13:41:23 +01:00
Emil Siverhall
067a156530 merge conflicts 2013-11-01 12:34:56 +01:00