Emil Siverhall
|
96ff5d20ef
|
bachelorCountDate and masterCountDate in GeneralSystemSettings haven't been used for years..
|
2014-04-04 13:20:21 +02:00 |
|
|
|
40b8ade56a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-04 09:49:38 +02:00 |
|
|
|
0abaeb4fa8
|
Useless check.
|
2014-04-04 09:49:33 +02:00 |
|
Emil Siverhall
|
7396ee61d3
|
public contructor
|
2014-04-04 09:41:51 +02:00 |
|
Emil Siverhall
|
1c5c9d3b13
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-04 09:38:16 +02:00 |
|
|
|
060992b3f6
|
Made class final.
|
2014-04-04 09:37:19 +02:00 |
|
Emil Siverhall
|
b8fbf67246
|
removed old thesislink table
|
2014-04-04 09:37:03 +02:00 |
|
|
|
577e353d7d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-04 09:32:49 +02:00 |
|
|
|
38c39caaea
|
Removed commented out code.
|
2014-04-04 09:13:16 +02:00 |
|
Emil Siverhall
|
f5ae2e0ffc
|
removed all thesis link entities
|
2014-04-04 09:12:17 +02:00 |
|
Emil Siverhall
|
51b2c8b209
|
delete of research plans
|
2014-04-04 09:06:50 +02:00 |
|
|
|
bdc0b597ae
|
Removed old code from IdeaServiceImpl
|
2014-04-04 09:04:57 +02:00 |
|
Emil Siverhall
|
e95f905498
|
working removeBasicContract
|
2014-04-03 15:13:38 +02:00 |
|
Emil Siverhall
|
d3d380fc1b
|
removed study plan creator
|
2014-04-03 15:05:30 +02:00 |
|
Emil Siverhall
|
d6de5de274
|
add a new study panel on upload of basic contract instead of when creating project.
|
2014-04-03 15:04:13 +02:00 |
|
Emil Siverhall
|
65c17f4c5b
|
removed phdservice since this should be part of study plan service
|
2014-04-03 14:25:45 +02:00 |
|
Emil Siverhall
|
6fbc67c69c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-03 13:41:06 +02:00 |
|
Emil Siverhall
|
963c911c74
|
research plan module + feedback
|
2014-04-03 13:22:12 +02:00 |
|
fred-fri
|
a0f971386e
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java
|
2014-04-03 19:35:08 +09:00 |
|
fred-fri
|
cd63c9f656
|
externalfile
|
2014-04-03 19:32:43 +09:00 |
|
Emil Siverhall
|
1cc8adb8b2
|
display current research plan, if existing
|
2014-04-03 11:14:49 +02:00 |
|
|
|
cbb385a0b5
|
Added an empty set of IdeaCreationJudge to prevent errors when no external module registers one.
|
2014-04-03 10:26:54 +02:00 |
|
|
|
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 |
|
