fred-fri
|
e8e0fee816
|
refactored storefinalthesis method
|
2013-11-15 12:27:03 +09:00 |
|
fred-fri
|
08827a0a41
|
Merge branch 'per' into develop
|
2013-11-15 11:05:01 +09:00 |
|
Per Lundholm
|
95422c5f12
|
Method storeForumFile made private part of ForumService
|
2013-11-14 17:10:14 +01:00 |
|
Emil Siverhall
|
8dfd0e7d9d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:43:58 +01:00 |
|
Emil Siverhall
|
70346b6cf7
|
changed grading report text resource test to go with locale changes
|
2013-11-14 16:43:45 +01:00 |
|
|
|
96833f83fc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:39:38 +01:00 |
|
|
|
ac08bc8f95
|
Updated date format in the jasper generated pdf.
|
2013-11-14 16:39:34 +01:00 |
|
Emil Siverhall
|
9e577d710c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:36:14 +01:00 |
|
Emil Siverhall
|
832d781946
|
changed turnitinsettingspagetest to fit new datetextfield
|
2013-11-14 16:35:56 +01:00 |
|
niklas3
|
89ac27e49f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:34:42 +01:00 |
|
niklas3
|
414f32626e
|
Project builder igen...
|
2013-11-14 16:34:23 +01:00 |
|
|
|
6dd12e01ae
|
Fixed test to use proper date formatting.
|
2013-11-14 16:33:36 +01:00 |
|
|
|
301ea0c744
|
Went down in MySQL version to get rid of the memory leak caused by the abandoned connection cleanup thread.
|
2013-11-14 16:24:36 +01:00 |
|
Emil Siverhall
|
3b058447c0
|
changed datefield on turnitin settings page
|
2013-11-14 16:22:51 +01:00 |
|
|
|
cb904e9bc5
|
Changed to English locale and updated StylableDateTimeField to use system wide date-format settings and 24-hour format.
|
2013-11-14 16:21:14 +01:00 |
|
|
|
e1d4a847b3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:07:49 +01:00 |
|
niklas3
|
fc761ed351
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:03:16 +01:00 |
|
niklas3
|
737de64995
|
fix'd
|
2013-11-14 16:02:57 +01:00 |
|
|
|
a4cd8ab3ff
|
Guarded against null since the component is an ajax fallback link.
|
2013-11-14 15:53:38 +01:00 |
|
Emil Siverhall
|
d123c82b07
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-11-14 15:49:29 +01:00 |
|
Emil Siverhall
|
86604e5777
|
make sure download of grading report txt works even without reviewer on the project
|
2013-11-14 15:49:21 +01:00 |
|
|
|
abb0abaf4d
|
Removed unused private fields.
|
2013-11-14 15:29:09 +01:00 |
|
|
|
6108b2c1c1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 15:24:10 +01:00 |
|
|
|
bf4d5b169c
|
Remove non-printable characters from project title before persisting.
|
2013-11-14 15:24:06 +01:00 |
|
Emil Siverhall
|
58330a4f30
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 15:01:13 +01:00 |
|
Emil Siverhall
|
b5b4435627
|
removed unused constructor parameter
|
2013-11-14 14:53:34 +01:00 |
|
|
|
2f68d528e4
|
Suppressed unused private field due to Lombok.
|
2013-11-14 14:52:14 +01:00 |
|
Emil Siverhall
|
da34b36077
|
removed some logging
|
2013-11-14 14:49:07 +01:00 |
|
|
|
099f7294d2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 14:49:05 +01:00 |
|
|
|
36148600c4
|
Removed unused hibernate imports.
|
2013-11-14 14:49:00 +01:00 |
|
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 |
|
