fred-fri
|
0e5fe3794e
|
sql fixes
|
2013-12-10 10:12:37 +09:00 |
|
fred-fri
|
29a1f687e2
|
sql fixes
|
2013-12-10 09:20:25 +09:00 |
|
Emil Siverhall
|
f7c197b594
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 20:13:09 +01:00 |
|
Emil Siverhall
|
c24980d0aa
|
motivering i stället för omdöme i pdf-mallen
|
2013-12-09 20:12:47 +01:00 |
|
Per Lundholm
|
451607cd5c
|
Renamed DegreeLevel to ProjectType
|
2013-12-09 17:10:46 +01:00 |
|
|
|
a6b24245a7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 16:20:04 +01:00 |
|
Richard
|
06bc63cb60
|
Minor styling to FillOutGradingReportPanel:
- Text before grade is shown changed.
- Feedbackpanel moved up above the input for points.
|
2013-12-09 16:15:01 +01:00 |
|
Richard
|
77c0d1b442
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 16:02:27 +01:00 |
|
Emil Siverhall
|
ea504e5620
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 15:59:36 +01:00 |
|
Emil Siverhall
|
dce3431323
|
added author name to pdf header
|
2013-12-09 15:59:24 +01:00 |
|
Richard
|
f87fa9d170
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 15:59:11 +01:00 |
|
Richard
|
b8e8981982
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 15:58:42 +01:00 |
|
Richard
|
ce0a1e540b
|
Aligned filters on SupervisorMyProjectsPanel so that all three are on the same row.
|
2013-12-09 15:58:36 +01:00 |
|
Per Lundholm
|
ecf78cf800
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 15:58:32 +01:00 |
|
Leo
|
e8f38aba54
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 15:58:10 +01:00 |
|
Leo
|
ee3106da03
|
changed from "omdöme" to "motivering"
|
2013-12-09 15:58:04 +01:00 |
|
Per Lundholm
|
e2ac1fe48f
|
Renamed DegreeLevel to ProjectType
|
2013-12-09 15:52:43 +01:00 |
|
|
|
e23aa5c275
|
Criteria are not considered assessed until both points and feedback have been set.
|
2013-12-09 15:32:32 +01:00 |
|
|
|
6873e51135
|
Made it nullable until the dust settles.
|
2013-12-09 15:18:12 +01:00 |
|
|
|
63da734ba5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 14:58:10 +01:00 |
|
|
|
ffb7003fa6
|
Added degree level enum to degree level the entity :)
|
2013-12-09 14:57:30 +01:00 |
|
Emil Siverhall
|
741b0861b7
|
project class filter on all supervisor ideas panel
|
2013-12-09 14:20:51 +01:00 |
|
|
|
07813c0efc
|
Removed unused class.
|
2013-12-09 14:19:53 +01:00 |
|
Emil Siverhall
|
94ea4c53b2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 14:02:50 +01:00 |
|
Emil Siverhall
|
9e0ed9c534
|
project class filter in mail panel
|
2013-12-09 14:02:40 +01:00 |
|
|
|
39736d4f72
|
Removed findByName from ProjectClassService.
|
2013-12-09 13:29:28 +01:00 |
|
Leo
|
ccc18e88f1
|
new filter for SupervisorMyProjectsPanel
|
2013-12-09 13:21:51 +01:00 |
|
Leo
|
5d8522c9d9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-09 13:00:41 +01:00 |
|
Leo
|
b1866660d8
|
some renaming
|
2013-12-09 13:00:35 +01:00 |
|
|
|
347fef149e
|
Fixed stupid code.
|
2013-12-09 12:05:34 +01:00 |
|
|
|
c28d73a58b
|
Removed unused method.
|
2013-12-09 12:02:47 +01:00 |
|
|
|
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 |
|
|
|
108749ea63
|
Removed old degree level categories.
|
2013-12-09 11:20:21 +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 |
|
|
|
c8c601703f
|
Implemented new method.
|
2013-12-09 10:46:36 +01:00 |
|
|
|
717eeac9ba
|
Fixed generic parameter name after project class got renamed.
|
2013-12-09 10:46:30 +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
|
8d60f850f8
|
fixed magic numbers
|
2013-12-09 10:27:50 +01:00 |
|
|
|
e95e9b4ede
|
Added connection between checklist template and project class (degree level).
|
2013-12-09 10:23:31 +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 |
|
