Richard
|
62c99e3ade
|
Added heading for the phd links panel.
Added link to the phd handbook.
Removed button on phd link.
Removed target="blank" on phd link.
|
2014-02-28 13:21:22 +01:00 |
|
Emil Siverhall
|
279973de1a
|
failing test
|
2014-02-28 13:08:43 +01:00 |
|
Richard
|
f9ef585278
|
Removed <br> above Study plan on ProjectDetailsPage.
|
2014-02-28 13:02:18 +01:00 |
|
Emil Siverhall
|
3899eb0b03
|
unit unit unit
|
2014-02-28 12:51:11 +01:00 |
|
Emil Siverhall
|
72dac46408
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/admin/panels/AbstractAdminIdeaPanel.java
|
2014-02-28 12:40:04 +01:00 |
|
Emil Siverhall
|
ca0bc22d06
|
create application period..
|
2014-02-28 12:39:04 +01:00 |
|
Emil Siverhall
|
ce8156ae06
|
filter changes
for seminar exemption page and milestone statistics
|
2014-02-28 12:34:20 +01:00 |
|
|
|
8c4874f31b
|
Moved ProjectFollower to the project package.
|
2014-02-28 11:24:15 +01:00 |
|
|
|
dfa82748cc
|
Moved MailEvent to the system package.
|
2014-02-28 11:19:51 +01:00 |
|
|
|
4314d05528
|
Moved Unit to the system package.
|
2014-02-28 11:13:03 +01:00 |
|
Emil Siverhall
|
8200e0d295
|
match filters should take only project types with match module switched on
|
2014-02-28 11:07:57 +01:00 |
|
|
|
4618ce8317
|
Moved Event to the system package.
|
2014-02-28 10:48:47 +01:00 |
|
|
|
474b542d6c
|
Moved Role hierarchy to system package
|
2014-02-28 10:42:24 +01:00 |
|
|
|
5c2f43708c
|
Added PhDLinkPanel to the STUDY_PLAN module.
|
2014-02-28 10:30:51 +01:00 |
|
fred-fri
|
4f362ba238
|
moving projecttype
|
2014-02-28 18:20:35 +09:00 |
|
fred-fri
|
3e5d0f510f
|
moving generic stuff
|
2014-02-28 18:02:31 +09:00 |
|
fred-fri
|
002e13cfdd
|
moved general system settings stuff
|
2014-02-28 17:29:54 +09:00 |
|
fred-fri
|
4f813735a2
|
moving misc stuff
|
2014-02-28 17:19:32 +09:00 |
|
fred-fri
|
f94aaa8680
|
moving date stuff
|
2014-02-28 17:11:07 +09:00 |
|
fred-fri
|
7015a83bf5
|
moved worker stuff
|
2014-02-28 16:47:58 +09:00 |
|
fred-fri
|
a94cc1c506
|
moved nonwork stuff
|
2014-02-28 16:30:56 +09:00 |
|
fred-fri
|
320161c917
|
moving report stuff
|
2014-02-28 16:25:16 +09:00 |
|
fred-fri
|
a146e341fb
|
moving gradingreportstuff
|
2014-02-28 16:13:46 +09:00 |
|
fred-fri
|
31221b0537
|
moving grading stuff
|
2014-02-28 16:08:21 +09:00 |
|
fred-fri
|
71f4d3c002
|
moved report stuff
|
2014-02-28 16:05:22 +09:00 |
|
fred-fri
|
8786f71809
|
moving report stuff
|
2014-02-28 15:49:10 +09:00 |
|
fred-fri
|
54f0815b07
|
moved program
|
2014-02-28 15:41:48 +09:00 |
|
fred-fri
|
cbc7c8266f
|
moved password
|
2014-02-28 15:36:11 +09:00 |
|
fred-fri
|
09acc722ed
|
moved researcharea
|
2014-02-28 15:33:25 +09:00 |
|
fred-fri
|
9d12839525
|
moved language
|
2014-02-28 15:21:55 +09:00 |
|
fred-fri
|
33a180e3c2
|
moving username
|
2014-02-28 14:12:56 +09:00 |
|
fred-fri
|
50579f648a
|
moved user
|
2014-02-28 13:52:04 +09:00 |
|
fred-fri
|
1a645ddbe6
|
merged project stuff
|
2014-02-28 13:42:20 +09:00 |
|
fred-fri
|
db871764a3
|
moving idea stuff
|
2014-02-28 12:58:57 +09:00 |
|
fred-fri
|
09be79b317
|
moving projectpartner stuff
|
2014-02-28 12:49:42 +09:00 |
|
fred-fri
|
8224ec1901
|
moving finalseminarrespondent to finalseminar
|
2014-02-28 12:40:57 +09:00 |
|
fred-fri
|
6c214459fe
|
removing commentable from project and finalseminar
|
2014-02-28 12:38:09 +09:00 |
|
fred-fri
|
062be5fd22
|
moving and merging match stuff
|
2014-02-28 12:23:37 +09:00 |
|
fred-fri
|
b0d1db64f3
|
fixed type error
|
2014-02-28 12:01:09 +09:00 |
|
|
|
ba99cf8f7d
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java
view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPage.java
|
2014-02-27 17:45:04 +01:00 |
|
|
|
9df5b01de0
|
StudyPlan is now created when a project is created with the STUDY_PLAN module activated via the event bus.
|
2014-02-27 17:42:44 +01:00 |
|
Golrokh Moattar
|
8a5271aed8
|
Fix phd link panel in SupervisorProjectDetailsPage
|
2014-02-27 17:39:04 +01:00 |
|
Golrokh Moattar
|
25d73524a1
|
Fix phd link panel
|
2014-02-27 17:18:50 +01:00 |
|
|
|
6dccdfdafb
|
Renamed PhDPanel to StudyPlanPanel and hooked it up to the STUDY_PLAN module.
Fixed some cascade issues.
|
2014-02-27 16:58:41 +01:00 |
|
Emil Siverhall
|
5f05aecd22
|
updated tests
|
2014-02-27 16:47:03 +01:00 |
|
Emil Siverhall
|
09e8e53060
|
seminar-annotations
|
2014-02-27 16:24:09 +01:00 |
|
Emil Siverhall
|
98f63bd104
|
seminar panel on overview should go by the strategy as well
|
2014-02-27 16:12:44 +01:00 |
|
Emil Siverhall
|
ec3b09ce86
|
opposition pages to module FinalSeminar. remove first or second cycle checks when adding tab menu items, use module based strategy instead.
|
2014-02-27 16:11:01 +01:00 |
|
|
|
94a79e3b9d
|
Renamed PhDFacade StudyPlanService
|
2014-02-27 16:07:47 +01:00 |
|
|
|
fcd26b43cc
|
Tightened up the domain model a bit.
|
2014-02-27 16:05:23 +01:00 |
|
