Golrokh Moattar
|
88e677413f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 16:27:54 +02:00 |
|
Golrokh Moattar
|
bd4f3ce970
|
GenericDataPanel used in Supervisor->MyProject-> Opposition & Active participations
|
2014-04-08 16:27:35 +02:00 |
|
|
|
3b9fba07d6
|
Moved Daisy-related exception to Daisy module.
|
2014-04-08 15:56:41 +02:00 |
|
|
|
7044f1f522
|
Removed unused constructor.
|
2014-04-08 15:56:14 +02:00 |
|
|
|
737dd6026b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 15:50:12 +02:00 |
|
|
|
e664412d6d
|
Moved the project exporter and user bulk import to the daisy-integration module.
|
2014-04-08 15:49:45 +02:00 |
|
|
|
7310ff6b59
|
Moved the project exporter and user bulk import to the daisy-integration module.
|
2014-04-08 15:38:43 +02:00 |
|
|
|
33a5096ce9
|
Removed all the static stuff that was left in the Scheduler and hid the implementation behind an interface.
|
2014-04-08 15:26:53 +02:00 |
|
Golrokh Moattar
|
c801597c4a
|
bootstrap styling on navigations
|
2014-04-08 14:51:07 +02:00 |
|
|
|
18d16710f7
|
Broke out separate Schedule class.
|
2014-04-08 14:35:54 +02:00 |
|
|
|
5a4c8b8dfc
|
Moved worker-related stuff to core.
|
2014-04-08 14:16:41 +02:00 |
|
Emil Siverhall
|
31a6da8e90
|
feedback for department service panel
|
2014-04-08 13:57:13 +02:00 |
|
Emil Siverhall
|
68e1aa612b
|
list all department services
|
2014-04-08 13:17:01 +02:00 |
|
Emil Siverhall
|
75bf466ee1
|
department_service module added
|
2014-04-08 10:05:21 +02:00 |
|
Emil Siverhall
|
e1b54cfac8
|
make sure getCurrent actually checks for the current user as well
|
2014-04-08 08:16:03 +02:00 |
|
fred-fri
|
f9a2bae9f9
|
increasing length of thesissummary
|
2014-04-08 13:38:28 +09:00 |
|
Golrokh Moattar
|
5fe83f890e
|
in SupervisorMyProjectsPanel, GenericDataPanel changed to GenericDataPanel2
|
2014-04-07 17:19:19 +02:00 |
|
Emil Siverhall
|
55cc94d702
|
implemented service method
|
2014-04-07 14:34:54 +02:00 |
|
Emil Siverhall
|
a9866c1661
|
basic form implementations
|
2014-04-07 13:00:29 +02:00 |
|
|
|
d00fb9718b
|
Added the concept of life-cycles to the Guice components.
|
2014-04-07 11:27:01 +02:00 |
|
Emil Siverhall
|
5e03282998
|
entity for department service
|
2014-04-07 10:19:27 +02:00 |
|
|
|
474a4003c9
|
Made DataInitializer save stuff with EntityManager instead of a bunch of otherwise unused repos/services.
|
2014-04-05 22:02:02 +02:00 |
|
|
|
da077a5826
|
Removed checks that could never be false.
|
2014-04-05 21:43:52 +02:00 |
|
|
|
6c1a6da598
|
Removed check that could never be false.
|
2014-04-05 21:40:58 +02:00 |
|
|
|
051d8c107e
|
Removed some unused methods.
|
2014-04-05 21:38:00 +02:00 |
|
|
|
dc46b8cce3
|
Removed StudyPlanRepository.
|
2014-04-05 21:33:59 +02:00 |
|
|
|
37524bc576
|
Removed unused class.
|
2014-04-05 21:26:33 +02:00 |
|
Emil Siverhall
|
ed97aaa7ec
|
system setting to show/hide sso login
|
2014-04-04 13:33:03 +02:00 |
|
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 |
|
