David Monllao
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
David Monllao
20b114ec27
Revert "Merge branch 'MDL-36009-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE"
...
This reverts commit abb41a5363 , reversing
changes made to 2b8b2e876e .
2015-02-12 13:46:59 +08:00
Sara Cenni
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
Dan Poltawski
b2792006aa
Merge branch 'MDL-47953-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
2015-02-09 10:21:44 +00:00
Jetha Chan
3be4c8751c
MDL-36009 grader_gradereport: filler and extra user cells should not be headers
2015-02-09 13:52:59 +08:00
Frederic Massart
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
Avi Levy
db8006919a
MDL-47037 grader_gradereport: Enable sort in other language then English
2014-12-11 07:40:32 +08:00
John Okely
8bcd939123
MDL-47700 Grades: Fix incorrect config for overview report showrank
2014-11-13 14:48:45 +08:00
Tim Lock
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
Marina Glancy
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
Jon Marthaler
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
Frederic Massart
84dd6d42ce
MDL-38732 gradereport_grader: Handle simultaneous graders
2014-10-14 13:50:17 +08:00
Damyon Wiese
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
Marina Glancy
09deaef4e9
Merge branch 'MDL-46821-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE
2014-09-08 13:49:28 +08:00
Ankit Agarwal
d99bb10f68
MDL-46821 gradereport_user: Fix background color of user report
2014-09-03 12:12:18 +05:30
Frederic Massart
14eb0c478d
MDL-46812 gradereport_grader: Hide vertical scrollbar of scroller
2014-08-27 10:44:02 +08:00
Eloy Lafuente (stronk7)
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
Mary Evans
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
Marina Glancy
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
Marina Glancy
7c4e3db7c0
MDL-46874 gradereport: replace usage of class hidden with dimmed_text
2014-08-19 12:56:11 +08:00
Frederic Massart
01327cfcf5
MDL-43197 gradereport_user: Parents/mentors can see all the relevant grades
2014-08-19 10:48:11 +08:00
Eloy Lafuente (stronk7)
8b9c45b666
Merge branch 'MDL-46697_27' of git://github.com/aolley/moodle into MOODLE_27_STABLE
2014-08-13 02:08:16 +02:00
Dan Poltawski
6a9a7005b0
Merge branch 'MDL-43824-M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-08-12 11:08:11 +01:00
Mary Evans
2271f1845c
MDL-43824 core/grade/report/grader: Fix for misalignment of static rows with scale grades.
2014-08-11 23:53:36 +01:00
Dan Poltawski
a623fdf11b
Merge branch 'wip-MDL-30668-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE
2014-08-11 10:41:42 +01:00
Damyon Wiese
ec297cc65b
MDL-35984 Grades: Fix deprecation of grade_category::aggregate_values
2014-08-11 14:22:27 +08:00
Damyon Wiese
5e33ee65e5
MDL-35984 grade: Recalculate min/max for sum of grades when hidden grades are involved.
2014-08-11 14:22:27 +08:00
Marina Glancy
db14163584
MDL-30668 gradereport_grader: split user preferences into individual courses
...
This solves the DB exception when users were trying to insert very large string in DB
2014-08-08 15:16:32 +08:00
Adam Olley
a175c5d1ba
MDL-46697 gradebook: Only count active users when needed (and only id)
...
The code only needs the id column to perform its count. On courses with a lot of users
fetching the whole user record for them all easily adds up to several hundred MB of
memory.
2014-08-06 15:58:11 +09:30
Eloy Lafuente (stronk7)
538bf99ece
MDL-45486 Bump all versions to planned release
...
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Andrew Davis
08b90682e4
MDL-45314 core_grade: a JS fix for the grader report
2014-05-02 11:13:45 +08:00
Andrew Davis
85b609c938
MDL-45314 core_grade: keep the two grader report scrollbars the same when the table changes width
2014-05-01 11:57:45 +08:00
Dan Poltawski
a935cccb2b
Merge branch 'MDL-31679' of git://github.com/aolley/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-04-09 12:49:35 +08:00
sam marshall
8d1f33e122
MDL-44070 Conditional availability enhancements (6): core changes
...
Changes core code to use new API instead of the old one when
checking user access to activities and sections.
Includes changes to other libraries that are necessary after
adding the availability system and removing old conditional tables
etc.
2014-04-07 20:11:48 +01:00
Marina Glancy
b3d75528de
Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle
2014-04-01 17:40:35 +08:00
Marina Glancy
e57f83a5c0
Merge branch 'MDL-44701' of git://github.com/aolley/moodle
2014-04-01 11:06:23 +08:00
Petr Škoda
ffe60f5bbd
MDL-40910 add new core event user_graded
...
This event is triggered when teacher manually edits the grade in gradebook.
2014-03-29 15:34:11 +08:00
Adam Olley
0f204015a6
MDL-44701 gradereport_grader: Display warning on navigation if unsaved grades are present
2014-03-27 11:10:25 +10:30
Frederic Massart
40c0903edf
MDL-44357 gradereport_grader: Fix wrong style causing LESS to fail
2014-03-24 15:15:03 +08:00
Adam Olley
19213efb98
MDL-31679 gradereport_grader: Add a horizontal scroll bar to the top of the grader report
2014-03-19 16:27:21 +10:30
Frederic Massart
fb95da6f5b
MDL-41688 gradebook: Improved grading layout on bootstrapbase themes
2014-01-20 10:34:03 +01:00
Adrian Greeve
1301a07a3e
MDL-31597 gradebook: Removed the percentage symbol from weights in the gradebook.
2014-01-14 11:59:01 +08:00
Tony Butler
0aff7a5517
MDL-43408 gradereport_grader: Display users with expired enrolments as inactive in grader report
2014-01-02 16:39:13 +00:00
Sam Hemelryk
ec6219a2e7
Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
2013-12-05 08:25:35 +13:00
sam marshall
8ff1fb6ffe
MDL-42084 Fix breakage in grader preferences page
2013-12-04 17:00:08 +00:00
Sam Hemelryk
a59a423926
Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
2013-12-03 11:12:34 +13:00
Sam Hemelryk
b5fd2497d6
Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle
2013-12-03 10:25:26 +13:00
Damyon Wiese
2b267d31c8
MDL-32888: Whitespace fixes (grr)
2013-12-02 15:14:26 +08:00
Damyon Wiese
7363aacb65
Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle
2013-12-02 15:01:37 +08:00
Petr Škoda
a377754770
MDL-41819 try to work around max_input_vars restriction
2013-12-02 08:29:08 +08:00