6007 Commits

Author SHA1 Message Date
74f7909ea0 Updated visibility in the checklist list under projects since the state "peer only" no longer exists, every checklist has associations with degree levels. 2013-12-09 11:58:39 +01:00
da58be853c Added column displaying the associated degree levels in the checklist template table. 2013-12-09 11:58:03 +01:00
aa8818ef33 Added render to draw degree levels nicely. 2013-12-09 11:15:20 +01:00
5deac7a0aa Can now add/remove degree level associations to checklist templates. 2013-12-09 11:11:54 +01:00
1390a1978f Code cleaning. 2013-12-09 10:50:47 +01:00
c71405e3f0 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/panels/ListCheckListTemplatePanel.java
	view/src/test/java/se/su/dsv/scipro/panels/ListCheckListTemplatePanelTest.java
2013-12-09 10:38:38 +01:00
e2363ad523 Updated checklist template list panel to only show templates relevant for the given project. 2013-12-09 10:36:48 +01:00
Per Lundholm
9b3c5c9bab Merge remote-tracking branch 'origin/develop' into develop 2013-12-09 10:35:14 +01:00
Leo
4e343358fc stopped import, export and turnitin for all profiles except PROD 2013-12-09 10:14:41 +01:00
Per Lundholm
46ea4f3b25 Renamed ProjectClass to DegreeLevel 2013-12-09 10:07:42 +01:00
Emil Siverhall
4d0c6a67d4 fixed criticial issue in seminar thesis panel 2013-12-09 09:00:23 +01:00
Emil Siverhall
02b148a608 don't show inactive ideas on supervisor -> all supervisor ideas 2013-12-09 08:50:24 +01:00
Emil Siverhall
19237c9cc5 Merge remote-tracking branch 'origin/develop' into develop 2013-12-09 08:29:53 +01:00
fred-fri
18c1207c61 removed date from student milestones 2013-12-09 16:23:31 +09:00
fred-fri
ffe2fe2f79 removed dates from supervisor milestones 2013-12-09 16:08:35 +09:00
fred-fri
3819b833a5 clarified donotreply 2013-12-09 15:50:44 +09:00
fred-fri
a6fa4e6eeb moved admin project partner page 2013-12-09 14:58:16 +09:00
7a77957f5a Removed stray W in markup. 2013-12-08 22:55:38 +01:00
Emil Siverhall
74e24d3513 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaOverviewPanel.java
2013-12-06 23:15:22 +01:00
fb16db5d1f Fixed warnings. 2013-12-06 22:01:27 +01:00
Emil Siverhall
c0d7435205 create history(match) object when switching to/from inactive status 2013-12-06 21:43:38 +01:00
fcd71f545f Removed useless middle-man that added an obsolete css class. 2013-12-06 21:39:07 +01:00
b05b549890 Fixed generics warning. 2013-12-06 21:35:01 +01:00
c2fb376a41 Fixed deprecation warning. 2013-12-06 21:34:03 +01:00
70d488db15 Fixed unchecked warning. 2013-12-06 21:29:55 +01:00
ff4bd7e972 Fixed deprecation warning. 2013-12-06 21:28:47 +01:00
62c7648bfb Fixed compilation warnings. 2013-12-06 21:11:17 +01:00
Emil Siverhall
0cc16f5f82 feedback when switching status to/from inactive 2013-12-06 20:38:51 +01:00
Emil Siverhall
4ca62a6ef5 Added filtering on Inactive status on Admin-> Match 2013-12-06 20:18:18 +01:00
1822b65290 Heh, ops. 2013-12-06 20:17:29 +01:00
057bf7e893 Removed unused authorization strategy. 2013-12-06 19:52:15 +01:00
4a388628ff Removed unused code. 2013-12-06 19:50:37 +01:00
7a4491a714 Removed dead code. 2013-12-06 19:46:06 +01:00
b8263f57fa Removed dead code. 2013-12-06 19:44:33 +01:00
34502e99b7 Removed unused parameter. 2013-12-06 19:39:55 +01:00
e0d7fa406f Clean up. 2013-12-06 19:38:28 +01:00
fbf93505cd Removed unused code. 2013-12-06 19:25:16 +01:00
e739c5b1a6 Removed unused parameter. 2013-12-06 19:23:49 +01:00
184d82c55e Made protected method private. 2013-12-06 19:19:09 +01:00
1dae16e4cc Removed unused private field. 2013-12-06 19:14:42 +01:00
400750a399 Removed unused private field. 2013-12-06 19:14:22 +01:00
d3473676d0 Removed unused private field. 2013-12-06 19:13:09 +01:00
30bea6f0e9 Clean up. 2013-12-06 19:12:36 +01:00
98df93fb3c Removed unused private field. 2013-12-06 19:05:53 +01:00
98f34fb8b7 Removed unused private field. 2013-12-06 19:05:21 +01:00
1ad260bb20 Removed unused private field. 2013-12-06 19:04:55 +01:00
a8ef66e8b6 Removed unused methods. 2013-12-06 18:57:12 +01:00
4b889c62e7 Removed unused methods. 2013-12-06 18:31:28 +01:00
840752aba8 Removed unused private field. 2013-12-06 17:44:33 +01:00
e578a80801 Removed class by moving the one method to the one place where that method was used. 2013-12-06 17:34:50 +01:00