6886 Commits

Author SHA1 Message Date
Leo
eb0c374d05 fixed tests failing because of matched ideas now requiring application periods 2013-12-06 13:24:25 +01:00
Emil Siverhall
a24440142d final seminars panel with wrong date styling 2013-12-06 13:11:04 +01:00
Leo
7d3fcfe76d Merge remote-tracking branch 'origin/develop' into develop 2013-12-06 12:58:53 +01:00
Leo
cf0df96b96 basic error handling 2013-12-06 12:58:45 +01:00
b43b1ab11f Moved session to its own package in an attempt to discover the real package tangling. 2013-12-06 08:52:31 +01:00
fred-fri
286343c0db fixed tests 2013-12-06 14:34:56 +09:00
fred-fri
6ff0ed55c2 fixed crash 2013-12-06 14:16:51 +09:00
Leo
abc24cbcb2 Merge remote-tracking branch 'origin/develop' into develop 2013-12-05 16:26:44 +01:00
Leo
a640918624 fixed broken tests 2013-12-05 16:26:25 +01:00
Richard
e31da653bc Changed info-text on FillOutGradingReportPanel.html 2013-12-05 16:13:21 +01:00
Leo
148816ef10 Merge remote-tracking branch 'origin/develop' into develop 2013-12-05 16:12:37 +01:00
Richard
abbf1abfe0 Merge remote-tracking branch 'origin/develop' into develop 2013-12-05 16:10:25 +01:00
Richard
96bf276cf0 Fixed problems with sneaky sneak. 2013-12-05 16:10:14 +01:00
Emil Siverhall
132c802476 Merge remote-tracking branch 'origin/develop' into develop 2013-12-05 14:43:42 +01:00
Emil Siverhall
8750a2940b made sure we actually save the date when updating a cancelled seminar time 2013-12-05 14:34:22 +01:00
Leo
f7bff97274 new naming for .pdf's downloaded from FillOutGradingReportPanel 2013-12-05 13:53:53 +01:00
Emil Siverhall
c11d572390 renamed some logging/labels in thesis upload deadline worker from delete to cancel since this is what we show the users. 2013-12-05 11:53:09 +01:00
Leo
48604213b8 shows total points 2013-12-05 11:46:35 +01:00
Emil Siverhall
c5fc7069e8 allow update of final seminar date even if original date has passed in the case were seminar has been cancelled 2013-12-05 11:39:39 +01:00
Leo
25b7724fe5 fixed a clumsy error with the tabs 2013-12-05 10:35:32 +01:00
Leo
1d968b1a16 removed unnecessary javascript and listener, fixed a test 2013-12-05 09:47:56 +01:00
Leo
11085b9e26 tabs now work again, while still saving 2013-12-05 09:27:37 +01:00
717ae57c0b Attempt at fixing broken tabs. 2013-12-04 17:23:02 +01:00
7e1f1c0f96 Fixed double feedback. 2013-12-04 17:19:40 +01:00
82deeff0d5 Refactored FillOutGradingReportPanel so that it saves all the report when clicking on a tab. 2013-12-04 16:52:08 +01:00
6de66d5ac3 Clean up around grading report and made sure no one can modify it. 2013-12-04 15:59:40 +01:00
3a9a163118 Added grade label to grading report panel. 2013-12-04 15:14:19 +01:00
4990683768 Removed stupid code. 2013-12-04 14:59:45 +01:00
0de9342880 Removed dead code. 2013-12-04 14:57:19 +01:00
938a6c6cee Changed test to not randomly failed if test execution takes too long. 2013-12-04 14:52:11 +01:00
c6cc29d3a3 Split grading criterion templates into two types (individual and project). 2013-12-04 13:46:18 +01:00
6675753a44 Merge remote-tracking branch 'origin/develop' into develop 2013-12-04 13:38:59 +01:00
99c2b306ff Grade is automatically calculated for A-F (but not Fx) 2013-12-04 13:38:54 +01:00
fred-fri
41b219551c fixed date filtering boolean 2013-12-04 20:59:48 +09:00
fred-fri
41321fe4aa Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-12-04 20:25:52 +09:00
fred-fri
45a820339c removed duplicate status column 2013-12-04 20:21:29 +09:00
283301349e Refactor of domain model related to grading reports complete. 2013-12-04 11:58:14 +01:00
b071fa3790 Merge remote-tracking branch 'origin/develop' into develop 2013-12-04 11:25:24 +01:00
Leo
d17b68528f fixed a test 2013-12-04 10:56:02 +01:00
97c1f9858e Refactored out a base class from GradingCriterionTemplate. 2013-12-04 10:14:15 +01:00
ae99c46b04 Renamed GradingAnswer to GradingCriterion. 2013-12-04 09:30:52 +01:00
23caf5df5d Renamed GradingCriterion to GradingCriterionTemplate. 2013-12-04 09:22:24 +01:00
8fbc6100de Merge remote-tracking branch 'origin/develop' into develop 2013-12-04 08:58:10 +01:00
04bbff4987 Removed ability to set a manual grade. 2013-12-04 08:58:05 +01:00
fred-fri
703fa879ae removed logging of password in clear text 2013-12-04 14:16:43 +09:00
8c08be14a8 Removed some package tangling. 2013-12-03 22:05:25 +01:00
Richard
5c76ff81e6 - Changes to the sneaky sneak script to make it work in more than one tab.
- Changes to the scipro.js file which fixed an issue where the fixed div on the gradingReportPanel only worked in the first tab.
2013-12-03 17:47:21 +01:00
a6c24e7ecc Merge remote-tracking branch 'origin/develop' into develop 2013-12-03 17:00:31 +01:00
a3214e3559 Creating GradingReports is done from a template. 2013-12-03 17:00:25 +01:00
Richard
bb9a89c5dc CSS changes to the feedbackPanel on the gradingReportPanel. 2013-12-03 16:26:31 +01:00