|
|
c5b0161559
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-31 14:38:40 +02:00 |
|
|
|
c09a2e265d
|
Fixed CurrentUser in tests.
|
2014-03-31 14:38:30 +02:00 |
|
fred-fri
|
3d9e2cce36
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-31 21:28:26 +09:00 |
|
fred-fri
|
48ab7eb0ef
|
fixed save
|
2014-03-31 21:27:42 +09:00 |
|
|
|
f8bae351cd
|
Changed mail encoding to UTF-8.
|
2014-03-31 14:19:58 +02:00 |
|
|
|
a89663a7e8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-31 14:13:33 +02:00 |
|
|
|
01961db472
|
Clean up old authentication code.
|
2014-03-31 14:13:29 +02:00 |
|
Emil Siverhall
|
6e6d1681b1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-31 14:08:55 +02:00 |
|
Emil Siverhall
|
00f4433927
|
removed setReviewer method
|
2014-03-31 14:07:35 +02:00 |
|
|
|
0a18853268
|
SSO authenticated users are now imported from Daisy if necessary.
|
2014-03-31 14:03:20 +02:00 |
|
|
|
b389365379
|
SSO login is now provided with the daisy-integration module.
|
2014-03-31 13:55:04 +02:00 |
|
|
|
34bb0a1257
|
Redid the authentication.
|
2014-03-31 11:13:35 +02:00 |
|
|
|
76cf06acb2
|
Changed around roles to only work with the same enum everywhere.
|
2014-03-31 10:31:11 +02:00 |
|
|
|
3414d69682
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-31 09:23:44 +02:00 |
|
fred-fri
|
6551bb3fa0
|
sortorder and some fixes
|
2014-03-31 15:23:24 +09:00 |
|
Emil Siverhall
|
32a10cc66c
|
save should actually save
|
2014-03-28 15:26:09 +01:00 |
|
|
|
1fee74c0c9
|
Minor restructuring in among the modules.
|
2014-03-28 14:49:19 +01:00 |
|
|
|
43d0d3c374
|
Moved the 3 interfaces used by MilestoneActivator to the same package.
|
2014-03-28 14:47:57 +01:00 |
|
|
|
dc72a70534
|
Moved ProjectCreatedEvent to the project package.
|
2014-03-28 14:47:01 +01:00 |
|
|
|
215ef41c4d
|
Moved grading report related events to the report package.
|
2014-03-28 14:45:53 +01:00 |
|
|
|
5982151fab
|
Moved final seminar related events to, well, the final seminar package.
|
2014-03-28 14:44:57 +01:00 |
|
Emil Siverhall
|
1ab682c92d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-28 14:37:27 +01:00 |
|
|
|
a53add44ae
|
Removed the last remnants of Spring.
|
2014-03-28 14:37:59 +01:00 |
|
Emil Siverhall
|
7b10deffe2
|
made final seminar respondent service extend generic service to fix problems with saving respondent grades
|
2014-03-28 14:37:15 +01:00 |
|
|
|
77ab246cc2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-28 14:32:05 +01:00 |
|
Emil Siverhall
|
40c47e6046
|
renamed migration script
|
2014-03-28 13:29:08 +01:00 |
|
Emil Siverhall
|
4036140799
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-28 13:27:43 +01:00 |
|
|
|
c7ed065099
|
Added a provider for the current user to the system so that it does not have to be passed around.
|
2014-03-28 11:27:12 +01:00 |
|
fred-fri
|
307d54b5b8
|
urls
|
2014-03-28 18:20:33 +09:00 |
|
fred-fri
|
3b671bfd6e
|
notification fixes
|
2014-03-28 18:07:38 +09:00 |
|
Emil Siverhall
|
d69c11ddda
|
happy days
|
2014-03-28 10:00:08 +01:00 |
|
fred-fri
|
3c4e832033
|
fixes
|
2014-03-28 16:56:11 +09:00 |
|
|
|
198ac1ca3c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-28 08:40:03 +01:00 |
|
Emil Siverhall
|
82545c0fa2
|
moved attachment to mapped superclass to use with both opposition reports and preliminary grading report.
|
2014-03-28 08:32:28 +01:00 |
|
fred-fri
|
4020eb3b6b
|
renaming the non template entities and some of their attributes
|
2014-03-28 16:32:25 +09:00 |
|
fred-fri
|
30fdc5d358
|
renaming projecteventtemplate to activitytemplate, and renaming some atttributes in activityplantemplate
|
2014-03-28 13:45:31 +09:00 |
|
fred-fri
|
adcae9e287
|
renaming everything named scheduletemplate in core to activityplantemplate
|
2014-03-28 12:55:37 +09:00 |
|
fred-fri
|
a7b7ea8b89
|
renamed scheduletemplate attribute in other entities to activityplantemplate
|
2014-03-28 12:48:26 +09:00 |
|
fred-fri
|
38a0b5ae15
|
renamed scheduletemplate entity to activityplantemplate
|
2014-03-28 12:08:01 +09:00 |
|
Emil Siverhall
|
f16ae23cab
|
attachments to opposition report/prel grading report entities
|
2014-03-27 20:56:48 +01:00 |
|
Emil Siverhall
|
73c919994c
|
test
|
2014-03-27 17:17:49 +01:00 |
|
Emil Siverhall
|
bf18e41a5b
|
different feedback when approving opponents if points could be transferred or not
|
2014-03-27 17:14:14 +01:00 |
|
|
|
6cd1a7267f
|
Removed a bunch of Spring-related annotations.
|
2014-03-27 16:42:28 +01:00 |
|
Golrokh Moattar
|
ac8d045e2c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-27 15:16:46 +01:00 |
|
|
|
70d108f919
|
Switched to a property module. Sorting one (sometimes two) items just is not that important.
If sorting really is demanded create LoadableDetachableModel that sorts in load().
|
2014-03-27 15:08:31 +01:00 |
|
Golrokh Moattar
|
7ba3799457
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-27 14:57:38 +01:00 |
|
|
|
d39dd7629e
|
Added missing @Transactional to delete() in AbstractServiceImpl
|
2014-03-27 14:23:20 +01:00 |
|
Golrokh Moattar
|
5fb0992e01
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-27 11:00:05 +01:00 |
|
Emil Siverhall
|
bfd95df37e
|
feedback columns to longtext in criterion/gradingcriterion
|
2014-03-27 09:30:47 +01:00 |
|
Emil Siverhall
|
2dfc3b73ab
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-27 08:25:28 +01:00 |
|
