13629 Commits

Author SHA1 Message Date
Golrokh Moattar
8d374f7192 Merge remote-tracking branch 'origin/develop' into develop 2014-03-11 16:00:59 +01:00
Golrokh Moattar
f376718e83 Calculation for Master 30hp 2014-03-11 16:00:44 +01:00
2f83be6c65 Removed debug stuff. 2014-03-11 15:58:47 +01:00
01f61480dc Shibb header debugging thingies. 2014-03-11 15:49:06 +01:00
e9375f5a2f Merge remote-tracking branch 'origin/develop' into develop 2014-03-11 15:35:46 +01:00
leosu
16e738cb1a added special case of Deadline criterion required for A 2014-03-11 14:27:27 +01:00
leosu
a378bc77ff Merge remote-tracking branch 'origin/develop' into develop 2014-03-11 13:58:28 +01:00
leosu
fec3216950 adds correct calculator and shows correct template info when grading 2014-03-11 13:57:50 +01:00
9dffac01d8 Moved PasswordHandler to system package. 2014-03-11 13:24:22 +01:00
c2db9479ba Removed and reduced visibility of methods not used from the outside. 2014-03-11 13:21:11 +01:00
5fc40af5f2 Moved Module enum to system package. 2014-03-11 13:14:39 +01:00
e616950120 Mails are now sent every minute instead of every third. 2014-03-11 13:02:03 +01:00
da9abf754b Project state of mind is now set to fine when status is set to completed. 2014-03-11 12:58:45 +01:00
7c1ce28ac5 Removed fitnesse. 2014-03-11 12:50:43 +01:00
9359042f68 Removed invalid test. No projects are imported. 2014-03-11 12:48:34 +01:00
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