3962 Commits

Author SHA1 Message Date
fred-fri
082d3f69b8 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-11-03 17:17:10 +09:00
fred-fri
532a484700 final seminar statistics 2014-11-03 17:09:27 +09:00
fred-fri
b07e8db34f final seminar statistics prep 2014-11-03 16:07:42 +09:00
golrokh
4ae354c687 fix initializing gradingCriterionPoints 2014-10-31 12:19:34 +01:00
golrokh
f7243288ae fix styling and description 2014-10-31 12:10:59 +01:00
golrokh
22544bccfe Merge branch 'develop' into radioGroupForPointsInGrading 2014-10-31 11:25:12 +01:00
golrokh
05bb43a3cd Removed Description from GradingCriterion but kept it in Criterion because we need to keep history of descriptions we used in the opposition reports 2014-10-31 11:23:26 +01:00
8b17ca128b Fixed logger to use the correct class. 2014-10-31 09:44:03 +01:00
golrokh
b952229a0b changed after technical review 2014-10-30 16:02:24 +01:00
golrokh
b8e2d28b8b Merge branch 'develop' into radioGroupForPointsInGrading 2014-10-30 14:58:33 +01:00
golrokh
4e9515a615 sql sats for inseritng data to point template 2014-10-30 14:26:30 +01:00
ee70f090bd Added external room booking setting and it is shown on final seminar crud panel if it is set. 2014-10-30 12:51:26 +01:00
golrokh
ca761e48a8 Insert data into template point via script for the production servers, not completed yet 2014-10-29 16:46:43 +01:00
golrokh
a8216f3f0e Insert data into template point via script for the production servers 2014-10-29 15:09:40 +01:00
fred-fri
644e09cc5e refactor 2014-10-29 19:35:21 +09:00
fred-fri
d44f2680a9 moving daisy stuff 2014-10-29 18:14:31 +09:00
golrokh
2d34b03f8b fix sql for inserting old data in the new table 2014-10-28 11:21:12 +01:00
d733bf7a04 Sigh 2014-10-28 11:20:58 +01:00
f7cf026713 Moved the milestone activator related type class instances to the package object. 2014-10-28 10:31:37 +01:00
53b778be83 Removed useless code. 2014-10-28 10:14:01 +01:00
da30aa975a Merge remote-tracking branch 'origin/develop' into develop 2014-10-28 10:11:49 +01:00
3afb6d34c3 Fix Sonar issues. 2014-10-28 10:11:43 +01:00
fred-fri
db5e5a0529 plugin removed 2014-10-28 18:01:37 +09:00
fred-fri
9bdda9565c simple stuff done 2014-10-28 17:48:01 +09:00
fred-fri
4aae6dfc75 simple stuff done 2014-10-28 17:45:52 +09:00
golrokh
3ff40dd7cf merge with develop and fix some problems 2014-10-27 16:05:41 +01:00
golrokh
96bf0492da merge with develop and fix some problems 2014-10-27 16:05:17 +01:00
golrokh
61df2215ad remove alter table from sql sats 2014-10-27 14:24:19 +01:00
golrokh
893b2e3f1c functioning version, tests needs to be fixed 2014-10-27 10:45:50 +01:00
fred-fri
1b329cc2d0 accidentally made all creationreasons null, trying to fix 2014-10-27 16:07:27 +09:00
fred-fri
58acdb5459 longer final seminar reason 2014-10-27 15:30:29 +09:00
fred-fri
4efddf749d submit on download grade report 2014-10-24 17:25:43 +09:00
fred-fri
7f23cbf432 dont remove getters 2014-10-24 10:21:55 +09:00
d996f28d84 "Fixed" test. 2014-10-23 16:03:33 +02:00
a9675369b7 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-10-23 11:18:40 +02:00
858d963add Preliminary grading removed requirement to be filled in before submit. 2014-10-23 11:18:08 +02:00
golrokh
ec5bad9640 Stable in test & ui 2014-10-22 13:54:27 +02:00
fred-fri
08828cdb17 db fix for error that arose when rwanda_grading was renamed to final_grading 2014-10-22 10:22:46 +09:00
000d644271 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-10-21 17:20:12 +02:00
28535e7a94 Added feedback to save & add more users #2300 2 2014-10-21 17:20:01 +02:00
golrokh
5b73bdceee keep required to pass 2014-10-21 16:25:09 +02:00
1973721b8e Changed "initial assessment" to "first version". 2014-10-21 15:24:44 +02:00
fred-fri
d24672d034 fixes and adding panel 2014-10-21 09:25:10 +09:00
fred-fri
28c9506639 Merge remote-tracking branch 'origin/develop' into develop 2014-10-20 17:15:52 +09:00
fred-fri
fe43e2fb6a adding rwandagrade 2014-10-20 17:15:38 +09:00
6f46eac90c Changed to chained calls of StringBuffer#append 2014-10-20 09:56:40 +02:00
c3575bee66 Removed commented out lines of code (check git history). 2014-10-20 09:56:23 +02:00
2023abe8c2 [SCIPRO-20284] Fixed bug when downloading opposition reports and preliminary grading reports. Yay reflection. 2014-10-17 16:48:32 +02:00
210bb297ee Removed problematic preliminary grading reports in the new process. 2014-10-17 16:38:03 +02:00
741816f1f3 Test fixes. 2014-10-17 16:32:27 +02:00