13414 Commits

Author SHA1 Message Date
c842ba378f No longer import any new projects or status, project type, title, authors, supervisors, reviewers, co-supervisors for existing projects. 2014-03-11 12:41:08 +01:00
1230018c37 Fixed some bugs. 2014-03-11 12:31:05 +01:00
fred-fri
c52cefdd7f implementing 2014-03-11 19:11:58 +09:00
8661ed5477 Merge remote-tracking branch 'origin/develop' into develop 2014-03-11 11:03:04 +01:00
77e8ef6adb Export projects to daisy. 2014-03-11 10:39:13 +01:00
leosu
801da8f462 Merge remote-tracking branch 'origin/develop' into develop 2014-03-11 10:31:24 +01:00
leosu
5f3ccb6b9b grade calculation for Master 15 2014-03-11 10:31:09 +01:00
bfb757dc6f Adds new authors. 2014-03-11 10:04:14 +01:00
fred-fri
79a51f48c5 switches and sql 2014-03-11 15:23:31 +09:00
fred-fri
062c5b6a62 switches and sql 2014-03-11 14:42:05 +09:00
fred-fri
530967ca09 switches 2014-03-11 14:37:50 +09:00
fred-fri
ef3d156622 switches 2014-03-11 14:34:42 +09:00
fred-fri
98822365dd switches 2014-03-11 14:32:35 +09:00
fred-fri
0960e04102 switches 2014-03-11 14:24:29 +09:00
fred-fri
6de9b0e426 switches 2014-03-11 14:21:38 +09:00
fred-fri
578e8d8602 switches 2014-03-11 14:20:29 +09:00
fred-fri
8d86f5d9d5 switches 2014-03-11 14:12:41 +09:00
fred-fri
2075015c3c switches 2014-03-11 14:11:10 +09:00
fred-fri
fc6dda7e48 switches 2014-03-11 14:09:51 +09:00
fred-fri
6b3fe40537 switches 2014-03-11 13:55:38 +09:00
fred-fri
93d579a9a9 switch 2014-03-11 13:51:25 +09:00
fred-fri
aa99e995fa switch 2014-03-11 13:50:10 +09:00
fred-fri
4db595718d switch 2014-03-11 13:49:25 +09:00
fred-fri
82dc4d16d3 switch 2014-03-11 13:48:56 +09:00
fred-fri
06d23ddcc0 switch 2014-03-11 13:48:01 +09:00
fred-fri
0dfb8d11cb visibility 2014-03-11 13:47:41 +09:00
fred-fri
4f6a9cc0bd switch 2014-03-11 13:46:42 +09:00
fred-fri
e0a220b6df adding sets to project entity 2014-03-11 11:52:13 +09:00
fred-fri
c1262f258c adding db tables for reviewers and cosupervisors 2014-03-11 11:50:13 +09:00
fred-fri
76bc93f89b model fixes 2014-03-11 10:13:42 +09:00
Emil Siverhall
51adb2ba57 Merge remote-tracking branch 'origin/develop' into develop 2014-03-10 20:51:22 +01:00
Emil Siverhall
6e1a5b38fa readded ajaxification of scrolling save button since form/feedbacks messed up otherwise 2014-03-10 20:47:51 +01:00
leosu
25f89128b4 broke out calculation and renamed GradeCalculator 2014-03-10 16:45:39 +01:00
Golrokh Moattar
1a138e9d3b Merge remote-tracking branch 'origin/develop' into develop 2014-03-10 16:05:23 +01:00
Golrokh Moattar
026dc0e104 Could not fix problem with test methods after removing Select button in KeywordFilterPanel, some one better in test may look at it 2014-03-10 16:05:09 +01:00
leosu
cd94c8b831 Merge remote-tracking branch 'origin/develop' into develop 2014-03-10 15:41:14 +01:00
leosu
fc00b07959 added master templates 2014-03-10 15:37:37 +01:00
a7136516fa Removes deleted authors. 2014-03-10 15:28:29 +01:00
797cafacb5 Refactoring. 2014-03-10 14:38:36 +01:00
Richard
8a3bf897d5 Merge remote-tracking branch 'origin/develop' into develop 2014-03-10 13:35:39 +01:00
Richard
b4395047a1 Improved styling of the SupervisorEditProjectPanel. 2014-03-10 13:35:25 +01:00
Golrokh Moattar
42cb5a5e55 KeywordFilterPanel is invisible when pages renders 2014-03-10 13:34:36 +01:00
Golrokh Moattar
50218f050c KeywordFilterPanel is invisible when pages renders 2014-03-10 13:34:04 +01:00
Golrokh Moattar
2f99e348d5 KeywordFilterPanel is invisible when pages renders 2014-03-10 13:33:12 +01:00
Golrokh Moattar
81458ffd18 There is no Select button in KeywordFilterPanel and the whole panel set to visible/invisible from outside 2014-03-10 13:28:38 +01:00
leosu
bf0f36bc9a credits added to grading report template 2014-03-10 13:21:30 +01:00
Richard
5d02e77100 Merge remote-tracking branch 'origin/develop' into develop 2014-03-10 13:13:49 +01:00
Richard
55b4c7c3f7 Styling of AdminEditActivityPanel.html 2014-03-10 13:13:34 +01:00
Golrokh Moattar
5ed5624ad2 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java
2014-03-10 13:12:21 +01:00
Richard
e642016e68 Styling of EditActivityTemplatePanel.html 2014-03-10 12:59:18 +01:00