Eloy Lafuente (stronk7)
8181ab5865
Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
2015-01-28 01:02:54 +01:00
Andrew Nicols
557f44d970
MDL-48620 JavaScript: Updated shifted files to comply with coding style
2015-01-23 14:51:24 +08:00
Eric Merrill
3f874a9d24
MDL-48711 gradebook: Properly compute extra-redit status for cat grades
...
When seeing if a grade item for a category is computed for extra-credit
status, we need to use the *grandparent* of the item.
2015-01-20 16:06:38 -05:00
Dave Cooper
93023ceef4
MDL-45848 grading: Added ability to unset grades with advanced grading
...
Thanks to Mohamed Alsharaf for assistance on this patch
2015-01-13 09:19:11 +08:00
David Monllao
3d10161c03
Merge branch 'wip-MDL-48523-master' of git://github.com/abgreeve/moodle
2015-01-07 09:22:48 +08:00
Andrew Nicols
1f8cc2ed90
Merge branch 'MDL-48582-master' of git://github.com/merrill-oakland/moodle
2015-01-05 15:26:43 +08:00
Eric Merrill
8e63ce4e02
MDL-48700 gradereport_history: Don't limit downloads by pages.
2014-12-23 16:11:02 -05:00
Adrian Greeve
fdc934a165
MDL-48523 gradebook: Fix for incorrect behat steps.
2014-12-22 15:00:18 +08:00
Eric Merrill
c45c1b560f
MDL-48582 gradereport_grader: Adding back grade pass/fail CSS
2014-12-18 14:12:48 -05:00
Dan Poltawski
f5360dd16b
Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle
2014-12-16 18:52:40 +00:00
Dan Poltawski
c236f820e1
Merge branch 'MDL-47610-master' of git://github.com/zbdd/moodle
2014-12-16 12:59:45 +00:00
Zachary Durber
3712ee3ed0
MDL-47610 gradebook: Show extra credit icon in grades column
2014-12-16 09:16:41 +08:00
Eloy Lafuente (stronk7)
985a1217bf
Merge branch 'MDL-44642-master' of git://github.com/andrewnicols/moodle
2014-12-16 01:57:58 +01:00
Andrew Nicols
de1c6859cc
MDL-44642 grading: Add session keepalive during advanced grading setup
2014-12-16 08:32:46 +08:00
Eloy Lafuente (stronk7)
05a9873b89
Merge branch 'MDL-47037-master' of git://github.com/jethac/moodle
2014-12-16 01:23:16 +01:00
David Monllao
486ebeb1a4
Merge branch 'wip-MDL-48347-master' of git://github.com/abgreeve/moodle
2014-12-15 13:44:01 +08:00
Avi Levy
573558af5e
MDL-47037 grader_gradereport: Enable sort in other language then English
2014-12-11 07:44:03 +08:00
Frederic Massart
ba55be9151
MDL-43902 output: Final deprecation of classes r0/r1 in table rows
2014-12-09 14:52:30 +08:00
Dan Poltawski
9112aac132
MDL-48273 upgrade.txt version fix
2014-12-08 11:23:40 +00:00
Simey Lameze
f4d1dd1025
MDL-48273 singleview: unit tests of load_user method
2014-12-08 11:19:06 +00:00
Simey Lameze
aac66bef1e
MDL-48273 singleview: add load_user method and other group validations
...
All credits goes to Damyon, thanks!
2014-12-08 11:19:06 +00:00
Adrian Greeve
831829ddf3
MDL-48347 gradebook: More behat tests for single view.
2014-12-08 14:19:13 +08:00
Adrian Greeve
37f308629a
MDL-48347 gradebook: Single view shows all grade items.
...
Manual grade items, course totals, and categroy totals
were not being displayed in the single view.
2014-12-08 09:11:48 +08:00
Andrew Nicols
64e7aa4de1
MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string
2014-12-01 08:32:04 +13:00
Sam Hemelryk
ac8c153862
Merge branch 'MDL-22309_master' of git://github.com/dmonllao/moodle
2014-11-26 09:06:08 +13:00
Jetha Chan
918de7968a
MDL-48191 gradebook: fixed floating headers when emails not displayed
2014-11-26 09:04:25 +13:00
Eloy Lafuente (stronk7)
abe9be7240
Merge branch '48189-29' of git://github.com/samhemelryk/moodle
2014-11-25 11:18:16 +01:00
David Monllao
34f18420ac
MDL-22309 report_singleview: Fixing wrong uses of get_role_users()
2014-11-24 10:53:53 +08:00
Jetha Chan
a71d9d28b7
MDL-48288 gradebook: fix floating footer exception when averages disabled
...
The code we use to update styles on floating elements did not account for
situations where those floating elements don't exist. This was discovered
when a test site didn't have column averages enabled, resulting in no
floating footer element being created, so when _handleScrollEvent was
fired the first time, a null reference exception was thrown trying to
apply styles to a non-existent element.
2014-11-21 11:00:51 +08:00
Sam Hemelryk
cb2cf2fed3
MDL-48189 grade: letters now covered by behat
2014-11-19 11:57:19 +13:00
Gilles-Philippe Leblanc
af14ef657a
MDL-47501 gradebook: Add an indication that the grade letters was overridden
2014-11-18 17:13:40 +00:00
Dan Poltawski
7baf2d1634
Merge branch 'MDL-47700-master' of git://github.com/xow/moodle
2014-11-18 10:04:33 +00:00
Sam Hemelryk
5b9a75e1fe
Merge branch 'MDL-47527_master' of https://github.com/StudiUM/moodle
2014-11-18 13:34:29 +13:00
Sam Hemelryk
993e61d970
Merge branch 'MDL-48171-master' of git://github.com/ankitagarwal/moodle
2014-11-17 13:21:02 +13:00
Ankit Agarwal
74b28381c6
MDL-48171 gradebook: Use proper apis to get item name
2014-11-14 13:25:04 +05:30
Helen Foster
ed10b1d94d
MDL-48214 Merge English strings from the en_fix language pack
2014-11-13 11:29:08 +01:00
John Okely
180acd64e9
MDL-47700 Grades: Fix incorrect config for overview report showrank
2014-11-13 14:26:31 +08:00
Tim Lock
d0fabf1193
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 13:25:31 +08:00
Sam Hemelryk
785887fd0f
Merge branch 'MDL-39692-master' of git://github.com/FMCorz/moodle
2014-11-12 09:41:58 +13:00
Eloy Lafuente (stronk7)
147bae8f7c
MDL-48144 upgrade: add v2.8.0 sep lines
2014-11-10 18:08:15 +01:00
Paula Ardanza Menéndez
7852746292
MDL-47527 gradebook: Allow access to overview report
2014-11-10 11:57:18 -05:00
Frederic Massart
b53a658b26
MDL-39692 grade: Little code clean up of letter boundary deletion
2014-11-10 13:00:01 +08:00
Huy Hoang
1d693611e5
MDL-39692 grade: Ability to delete letter boundary
2014-11-10 12:14:31 +08:00
Jetha Chan
b7ee86966b
MDL-47980 gradebook: fixed label for bulk insert select box
2014-11-06 16:37:23 +08:00
Jetha Chan
dd01789b4f
MDL-47980 gradebook: add labels and legends missing from single view
2014-11-06 10:40:36 +08:00
Dan Poltawski
5a6c9f1cfb
Merge branch 'MDL-48021' of git://github.com/stronk7/moodle
...
Conflicts:
admin/tool/monitor/version.php
mod/lesson/version.php
2014-11-05 12:11:16 +00:00
Dan Poltawski
35d236c1ea
Merge branch 'MDL-48047-master' of git://github.com/lameze/moodle
2014-11-05 12:05:58 +00:00
Dan Poltawski
f3fd919187
Merge branch 'MDL-47981-master' of git://github.com/damyon/moodle
2014-11-05 12:00:19 +00:00
Dan Poltawski
a0cba367bd
Merge branch 'MDL-47982-master' of git://github.com/gurgus/moodle
2014-11-05 11:03:57 +00:00
Simey Lameze
b52b1ee9a4
MDL-48047 gradebook: change the missing ID number to checkbox on XML export
2014-11-05 15:24:09 +08:00
