|
|
da7c091eb9
|
Fixed current user scoping problems in NotificationControllerImpl.
|
2014-04-03 10:26:29 +02:00 |
|
|
|
eb35196f44
|
Removed isIdeaExportable(Idea) method and merged the conditions into the database fetch.
|
2014-04-03 10:01:37 +02:00 |
|
|
|
dc65c600d6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-03 09:28:16 +02:00 |
|
Emil Siverhall
|
37e5c5dff0
|
implemented upload service method for research plans
|
2014-04-02 16:07:57 +02:00 |
|
Emil Siverhall
|
31a81ef2ce
|
basic upload for research plan implemented in panel
|
2014-04-02 15:38:49 +02:00 |
|
Emil Siverhall
|
ae475dabec
|
research_plan entity
|
2014-04-02 14:49:14 +02:00 |
|
Emil Siverhall
|
bab56e79b3
|
cleaning
|
2014-04-02 14:48:38 +02:00 |
|
Emil Siverhall
|
945cea40b4
|
only display approved final theses
|
2014-04-02 12:15:07 +02:00 |
|
Emil Siverhall
|
87d7f404df
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-02 10:41:56 +02:00 |
|
Emil Siverhall
|
00cc8a8b0d
|
all final theses displayed
|
2014-04-02 10:36:26 +02:00 |
|
Golrokh Moattar
|
7a4cc9e528
|
Changed important links to phd links
|
2014-04-02 10:20:52 +02:00 |
|
Emil Siverhall
|
b5ab6fab26
|
make sure master may select ideas..
|
2014-04-02 09:27:04 +02:00 |
|
fred-fri
|
03cd4c7891
|
green stateofmind at start of project
|
2014-04-02 14:45:24 +09:00 |
|
|
|
cc897ccf8c
|
Notifications are now sent when a project is started from an idea.
|
2014-04-01 17:40:57 +02:00 |
|
Golrokh Moattar
|
d72779fe48
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-01 17:21:25 +02:00 |
|
Golrokh Moattar
|
0da12b597e
|
Just 5 latest events can be shown up in the project overview
|
2014-04-01 17:21:17 +02:00 |
|
|
|
bfaef550a8
|
Removed unused dependency.
|
2014-04-01 17:03:44 +02:00 |
|
|
|
5e5d68a371
|
Rewrote IdeaExportWorker so that it no longer is dependent on Daisy to function.
|
2014-04-01 16:37:24 +02:00 |
|
|
|
3f37781c3f
|
Compilation error.
|
2014-04-01 16:00:14 +02:00 |
|
|
|
85b0e2b41e
|
Fixed notifications getting sent outside session scope (so no current user).
|
2014-04-01 15:57:31 +02:00 |
|
|
|
82a69d0652
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-01 15:24:13 +02:00 |
|
Emil Siverhall
|
9f26def716
|
authors full name on opposition reports
|
2014-04-01 14:48:10 +02:00 |
|
Emil Siverhall
|
1666f03322
|
make sure updateOppositionCriteria works with master projects as well, since the criterion title is in english..
|
2014-04-01 13:56:28 +02:00 |
|
Emil Siverhall
|
3cc4380ab3
|
removed unused methods
|
2014-03-31 16:16:56 +02:00 |
|
Emil Siverhall
|
8434890bb1
|
removed isSupervisor from project service
|
2014-03-31 16:11:32 +02:00 |
|
Emil Siverhall
|
61b57fe2dd
|
tests...
|
2014-03-31 15:45:54 +02:00 |
|
Emil Siverhall
|
f1ebbe2571
|
removed isAuthor and isReviewer from project service since this is handled by the project
|
2014-03-31 15:34:49 +02:00 |
|
|
|
8f457984d1
|
Suppressed warnings due to Lombok.
|
2014-03-31 15:20:52 +02:00 |
|
|
|
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 |
|
