14427 Commits

Author SHA1 Message Date
Emil Siverhall
21ee2dfa4d Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 14:42:02 +01:00
Emil Siverhall
f9976bce95 fixed test failure 2013-11-14 14:41:49 +01:00
be608a0e35 More logging from workers. 2013-11-14 14:35:59 +01:00
Emil Siverhall
68cfe1a5d6 maileventworkers logger logs the actual exception when unable to send mail 2013-11-14 14:19:16 +01:00
Emil Siverhall
f4456599a0 mocking GradingReportService 2013-11-14 14:09:40 +01:00
0047cd4be5 Force JBoss (Hibernate) to use SLF4J. 2013-11-14 14:04:27 +01:00
Richard
667147c2c2 Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 13:57:56 +01:00
e3c8acf5ac Fixed builder. 2013-11-14 13:56:00 +01:00
944faf3815 Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 13:44:48 +01:00
1568581add Removed duplicate final thesis panel in supervisor project view. 2013-11-14 13:44:44 +01:00
Emil Siverhall
b2e8cff5fd Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 13:40:32 +01:00
Emil Siverhall
e9377dae99 supervisors is not allowed to see the grading tab if the projects project class doesn't have a grading report template 2013-11-14 13:40:22 +01:00
Richard
77c3b39348 Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 13:38:56 +01:00
18c64616b1 Fixed faulty compareTo in User. 2013-11-14 13:38:45 +01:00
Richard
7aaa1b754d Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 13:18:55 +01:00
51797a06c4 Fixed faulty builders. 2013-11-14 13:10:57 +01:00
Richard
f7021b3ede Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 13:09:43 +01:00
Richard
61b36bff4b HTML changes to the activity plan templates panels and the activity plan panel. 2013-11-14 13:09:31 +01:00
fred-fri
0bdeef22f6 refactoring 2013-11-14 21:08:28 +09:00
d9457d0c3e Removed UserSettings. 2013-11-14 13:01:17 +01:00
fred-fri
fc80b03a7f refactoring 2013-11-14 20:54:42 +09:00
niklas3
11c9d381f0 More builders. 2013-11-14 12:31:48 +01:00
niklas3
a543ab5e62 Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 12:20:57 +01:00
niklas3
88ceed8828 More builders. 2013-11-14 12:20:52 +01:00
Emil Siverhall
ead5e1c463 made GradingReportExport serializable 2013-11-14 12:19:13 +01:00
fred-fri
097b38dcdd refactoring 2013-11-14 19:23:25 +09:00
Emil Siverhall
dcfe5c153c Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 11:15:59 +01:00
Emil Siverhall
996919f1fe added grading report export object to check if a grading report has been exported to daisy 2013-11-14 11:15:41 +01:00
fred-fri
13467f10d1 refactoring 2013-11-14 19:00:03 +09:00
fred-fri
39490f5f35 refactoring 2013-11-14 18:58:24 +09:00
fred-fri
155ee6a7c5 refactoring 2013-11-14 18:46:24 +09:00
d6968df7a9 Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 10:41:00 +01:00
24c272c937 Suppressed unused private fields due to Lombok. 2013-11-14 10:40:57 +01:00
niklas3
af63f3a134 pushing 2013-11-14 10:37:19 +01:00
niklas3
4b9b6ebec6 Fixd refactoring fail 2013-11-14 10:30:47 +01:00
niklas3
787683b7de Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 10:20:35 +01:00
c37efd5d0b Added final thesis panel to supervisor project details page. 2013-11-14 10:11:14 +01:00
fred-fri
ef269152c8 refactoring filerepo + test 2013-11-14 18:05:46 +09:00
niklas3
0012014c87 Role is now sorted by user and not id. 2013-11-14 09:56:04 +01:00
Richard
96be2755f4 Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 09:46:30 +01:00
7298670508 Implemented getFinishedGradingReports. 2013-11-14 09:40:25 +01:00
fred-fri
63a1bbd08c added daisytarget to ignore 2013-11-14 12:04:53 +09:00
fred-fri
47a7d1819e hiding 2013-11-14 12:02:40 +09:00
9295bda26d Deleted. unused methods.
Removed methods from the interface which was only used inside the implementation itself.
2013-11-13 21:41:12 +01:00
0bbfb0244a Went back in jasperreports version since the latest has a faulty dependency on javax.servlet. 2013-11-13 19:11:25 +01:00
3882cf62b5 Bad niklas causing compilation errors. 2013-11-13 19:10:40 +01:00
niklas3
25041e62f6 Merge remote-tracking branch 'origin/develop' into develop 2013-11-13 17:38:10 +01:00
niklas3
ac8f5f574d Project now has an extended Builder. 2013-11-13 17:37:57 +01:00
Richard
705167b234 Started to style final thesis panels. 2013-11-13 17:30:32 +01:00
niklas3
bfcf66bb7d FinalThesis now has a Builder. Woop. 2013-11-13 16:54:35 +01:00