e530410232
Merge branch 'MDL-48993-27' of git://github.com/merrill-oakland/moodle into MOODLE_27_STABLE
2015-02-17 17:24:56 +08:00
3adfe5f72f
Merge branch 'MDL-48215_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE
2015-02-17 13:24:47 +08:00
175883c223
MDL-48215 gradingform_guide: Name length validation
...
Validating both criterion name and guide name to be 255 chars.
2015-02-15 21:53:02 -08:00
3bd8407407
Merge branch 'MDL-40776_27' of git://github.com/s-cenni/moodle into MOODLE_27_STABLE
2015-02-16 10:35:41 +08:00
56e9f5c166
MDL-48993 gradebook: When importing new items, treat blank or - as empty
2015-02-12 17:18:30 -05:00
20b114ec27
Revert "Merge branch 'MDL-36009-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE"
...
This reverts commit abb41a53632b8b2e876e
2015-02-12 13:46:59 +08:00
4d65e9527e
MDL-40776 grade: fix query for report outcomes
...
Add a missing space to the query for report outcomes to avoid error with Oracle.
2015-02-10 12:10:07 +01:00
b2792006aa
Merge branch 'MDL-47953-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
2015-02-09 10:21:44 +00:00
3be4c8751c
MDL-36009 grader_gradereport: filler and extra user cells should not be headers
2015-02-09 13:52:59 +08:00
87914aa407
MDL-47953 gradereport_grader: Accurate pagination with suspended users
...
Thanks to Zvonko Martinovic for pointing out the source of the bug.
2015-02-05 15:08:00 +08:00
4758a64934
MDL-48907 grades: fixed display of grade tabs
2015-01-21 10:30:53 +13:00
db8006919a
MDL-47037 grader_gradereport: Enable sort in other language then English
2014-12-11 07:40:32 +08:00
8c0edd2692
MDL-48189 grade: letters now covered by behat
2014-11-25 15:37:25 +13:00
8bcd939123
MDL-47700 Grades: Fix incorrect config for overview report showrank
2014-11-13 14:48:45 +08:00
09a9270640
MDL-47700 Grades: Sitewide overview report isn't visible in some cases
...
Showing a overview report rank sitewide isn't visible to student in same cases
2014-11-13 14:48:45 +08:00
21a51e41a8
MDL-39692 grade: Little code clean up of letter boundary deletion
2014-11-10 13:06:32 +08:00
5b29dbc781
MDL-39692 grade: Ability to delete letter boundary
2014-11-10 13:06:28 +08:00
25612b59ee
Merge branch 'MDL-48010_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
2014-11-03 17:15:49 +08:00
1dd7fab104
MDL-47275 Grades: Sum of grades bug in max grade with extra credit
...
Sum of grades is not calculating max grade with extra credit for students
2014-11-03 16:56:48 +08:00
c2b8c7c8c2
MDL-26447 gradebook: Default gradedisplaytype fixed for all locales
2014-11-03 13:56:56 +08:00
82bf77561f
MDL-48010 grade import from URL: don't corrupt the URL.
2014-10-31 19:53:34 +00:00
c268bbc9e6
MDL-48008 gradeimport_xml: report errors usefully
2014-10-31 19:53:33 +00:00
af4417f0aa
MDL-33939 gradingform_guide: use correct max grade for scales.
2014-10-29 13:23:46 +08:00
a0088bb79b
Merge branch 'wip-MDL-47760-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE
2014-10-24 15:18:33 +01:00
9cc49c2f58
MDL-47706 gradebook: Update pageload time between changes
...
Since MDL-38732 we reject changes if another change has been made more
recently. As a result, if process_data is called, and then we roll into the
next millisecond period before process_data is called again, the change is
rejected.
Different errors were seen because the millisecond rollover occurred at
different time within the test.
Different error conditions were seen because not all of the tests check for
an error from the call to process_data(), instead just checking that the
value had been updated correctly.
2014-10-22 13:19:23 +08:00
c274f4dd62
Merge branch 'MDL-46527-27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE
2014-10-22 10:24:06 +08:00
0fdb3d3fdc
MDL-46527 grades: grade_get_grades external function rewritten
2014-10-21 12:33:40 +02:00
97f240e7b6
Merge branch 'MDL-38065-fix-27' of git://github.com/jmarthaler/moodle into MOODLE_27_STABLE
2014-10-20 14:08:34 +08:00
a23348da27
MDL-47760 grades: dim category name if hidden
2014-10-20 14:05:50 +08:00
4fab973d4b
MDL-38065 gradebook: Fix issue with hidden categories breaking rowspan.
...
Hidden subcategories break the rowspan in the gradebook; this fix corrects
the calculation of the rowspan.
2014-10-16 22:26:45 -05:00
8b3c12ec5b
Merge branch 'MDL-38732-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
2014-10-15 08:41:13 +01:00
f1c933f470
MDL-38732 gradereport_grader: Undefined variable in unit tests
2014-10-15 12:23:34 +08:00
450e3f27c9
Merge branch 'MDL-38732-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
2014-10-14 19:02:11 +01:00
84dd6d42ce
MDL-38732 gradereport_grader: Handle simultaneous graders
2014-10-14 13:50:17 +08:00
2baeeeb9fa
MDL-46546 core_grades: Move error checking after csv load.
2014-10-14 10:31:03 +08:00
cdc1f7f709
MDL-46546 gradebook: Grade import gives error on bad csv upload.
2014-10-13 10:48:40 +08:00
b1cdf13013
MDL-47492 core_grades: Behat test for using scales and mingrade in gradebook
2014-10-02 15:59:53 +08:00
28dfc4eebc
MDL-46818 core_grade: Prevent form checker to catch move fields
2014-09-10 10:44:02 +08:00
78c55e13a2
MDL-46997 Grades: Fix aggregation when hiding is excluded and items have nested dependencies
...
Includes a unit test for the dependency flattening function.
2014-09-09 14:02:13 +08:00
b5415ecd9d
MDL-46997 Grades: Improve the behat tests for grade aggregation
...
The tests now cover hidden grades in sub categories for all aggregation types. This change
includes a data generator for grade categories, with unit tests and behat tests for
the generator.
Conflicts:
admin/tool/behat/tests/behat/data_generators.feature
grade/tests/behat/grade_aggregation.feature
lib/tests/behat/behat_data_generators.php
2014-09-09 14:02:06 +08:00
dc2e48bda7
Merge branch 'MDL-46818_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE
2014-09-08 14:05:06 +08:00
09deaef4e9
Merge branch 'MDL-46821-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE
2014-09-08 13:49:28 +08:00
d99bb10f68
MDL-46821 gradereport_user: Fix background color of user report
2014-09-03 12:12:18 +05:30
9d4861fa75
MDL-46818 core_grades: added YUI form change validation
2014-09-01 23:02:33 -07:00
14eb0c478d
MDL-46812 gradereport_grader: Hide vertical scrollbar of scroller
2014-08-27 10:44:02 +08:00
44088a5aeb
Merge branch 'wip-MDL-46874-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE
2014-08-25 22:11:17 +02:00
0dc138d47c
MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824
...
Squashed commit of the following:
commit 4ae57a823ba6fa1d627d2bad296cdf905b1930ee
Author: Mary Evans <lazydaisy@visible-expression.co.uk >
Date: Thu Aug 21 02:05:35 2014 +0100
MDL-46812 grade/report/grader: Reset previous commit for left scroller.
commit 7e3d27d3cc9d22ffe8e1dbb54eb705a65153a6b0
Author: Mary Evans <lazydaisy@visible-expression.co.uk >
Date: Thu Aug 21 01:23:09 2014 +0100
MDL-46812 grade/report/grader: Added jsenabled css body class to rtl style.
commit 0b5c3341b79c4b4bfefcd82eef1940964448ccba
Author: Mary Evans <lazydaisy@visible-expression.co.uk >
Date: Thu Aug 21 01:13:34 2014 +0100
MDL-46812 theme_base: Removed more redundant CSS.
commit 8c44e8a4c644a9139d1750af498bed6a14decf5c
Author: Mary Evans <lazydaisy@visible-expression.co.uk >
Date: Wed Aug 20 15:44:42 2014 +0100
MDL-46812 theme_base: Removed redundent grade/report/grader CSS in style/grade.css
commit 7c69b546fab03163d3863044ab9d1d9130c1cdd9
Author: Mary Evans <lazydaisy@visible-expression.co.uk >
Date: Thu Aug 14 12:50:14 2014 +0100
MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824
1. fixed gradebook layout when JS is disabled
2. added height and background color to scroller when JS is enabled
3. removed redundent top margin in user-grades table
2014-08-21 11:23:27 +01:00
d23d771071
Merge branch 'wip-mdl-46817-m27' of git://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE
2014-08-19 14:04:05 +08:00
5f690a9be6
Merge branch 'MDL-43197-27-2nd' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
2014-08-19 13:26:01 +08:00
7c4e3db7c0
MDL-46874 gradereport: replace usage of class hidden with dimmed_text
2014-08-19 12:56:11 +08:00
David Monllao