6891 Commits

Author SHA1 Message Date
Golrokh Moattar
75764ccc3c Activate milestone from overview 2014-02-28 16:08:57 +01:00
a86304e7ec Renamed turnitin package to plagiarism 2014-02-28 16:06:42 +01:00
e9a0045bfc Moved PlagiarismControl to turnitin package. 2014-02-28 15:59:55 +01:00
8d48226b64 Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 15:53:10 +01:00
85494e4202 Updated test to better and improved code. 2014-02-28 15:53:06 +01:00
Golrokh Moattar
5f5793e8a0 Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 15:48:36 +01:00
Richard
afa2cd7b9d Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 15:43:14 +01:00
Richard
489aad9c59 Improved the design on the request peer review page.
Added 10px bottom margin on feedback panels.
2014-02-28 15:43:06 +01:00
41a58815ff Changing targets now saves the new target instead of cascading via employee. 2014-02-28 15:37:00 +01:00
ca2c380ff5 Massive improvement to Target.
Annotations are fun.
2014-02-28 15:20:17 +01:00
Golrokh Moattar
aff58b048d Commented on a method 2014-02-28 14:08:25 +01:00
6786fb756f Moved program from match to system. Like unit it is not part of the match process but as part of a student (or employee for unit). 2014-02-28 13:54:06 +01:00
2fb74a23f6 Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 13:51:50 +01:00
11b55e1fcf Fixed NPE when idea status is pending. 2014-02-28 13:51:44 +01:00
Emil Siverhall
d202070550 Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 13:37:43 +01:00
Richard
4c256a2aa1 Added information about PhD authors not being able to activate all milestones themselves. 2014-02-28 13:26:47 +01:00
Richard
dbab38a26b Added heading to the phdLinkPanel on SupervisorProjectDetailsPage. 2014-02-28 13:23:52 +01:00
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