David Monllao
ad704e2c49
Merge branch 'mdl51440-master' of git://github.com/tlock/moodle
2015-09-30 10:48:25 +08:00
Dan Poltawski
23e1a54f57
Merge branch 'MDL-51305_master_too_many_gradeitem_fetches' of https://github.com/colin-umn/moodle
2015-09-28 16:25:54 +01:00
Juan Leyva
4485f7c549
MDL-49821 webservice: Add active user checks in external functions
2015-09-25 11:33:13 +02:00
Tim Lock
52296930dc
MDL-51440 gradeimport_direct: fix config require statement
2015-09-17 14:51:24 +09:30
Simey Lameze
8c55a50dba
MDL-50959 gradebook: fix XML grade export
2015-09-17 10:34:50 +08:00
Eloy Lafuente (stronk7)
62652cdc63
Merge branch 'MDL-50959-master' of git://github.com/lameze/moodle
2015-09-15 23:36:14 +02:00
Eloy Lafuente (stronk7)
4deecee44f
Merge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle
2015-09-15 23:12:22 +02:00
David Monllao
785ebcdbe6
Merge branch 'MDL-51008-master' of git://github.com/marinaglancy/moodle
2015-09-15 11:21:22 +08:00
Simey Lameze
e6c990ad21
MDL-50959 gradebook: fix XML grade publishing score
2015-09-14 09:04:14 +08:00
Mark Nelson
53914e4465
MDL-51051 core_grades: 'Categories and items' => 'Gradebook setup'
2015-09-14 08:23:32 +08:00
Colin Campbell
9901bdf7eb
MDL-51305 grade: Fix slow grade operations by setting grade_item early.
...
Exports were fetching the grade item for every item-user combination.
Setting the grade_item object on the grade_item early prevents that.
2015-09-11 15:41:20 -05:00
Marina Glancy
278b8d18a2
MDL-50892 mod: allow activity to have name '0'
2015-09-11 10:51:52 +08:00
Marina Glancy
d6bef7e706
MDL-51008 grades: show correct default value in overview report
2015-09-08 10:11:20 +08:00
David Monllao
433eb975a0
Merge branch 'MDL-50529_dupe' of git://github.com/andyjdavis/moodle
2015-09-02 09:58:17 +08:00
rajesh Taneja
a9c9ae52e5
MDL-50963 behat: fixed error string in behat
2015-09-01 14:48:11 +08:00
Dan Poltawski
4ae71e93a8
MDL-49826 grade: hide singleview links when no permissions
...
Singleview only supports grade editors not viewers at this time.
2015-08-27 13:16:44 +02:00
Andrew Davis
d66c9f0d7b
MDL-50529 core_grade: removed duplicate code
2015-08-25 21:14:47 +08:00
David Monllao
61e44f4033
Merge branch 'mdl-50957' of git://github.com/cdsmith-umn/moodle
2015-08-25 10:06:49 +08:00
Clement Smith
368c1bb674
MDL-50957 grade/report/user: Fix division by zero
...
When using "sum of grades" and $grademax is zero, a division by zero
error occurs in fill_contributions_column() in
grade/report/user/lib.php.
2015-08-24 09:05:30 -05:00
Dan Poltawski
7ee1695850
Merge branch 'MDL-49826_grade_single_view' of git://github.com/davosmith/moodle
2015-08-24 10:39:06 +01:00
Davo Smith
4021aa45ce
MDL-49826 gradereport_singleview: fix permission check
...
Users with capability 'moodle/grade:edit' should be able to edit grade values
- 'moodle/grade:manage' is not needed, as grade items are not being changed.
2015-08-20 14:55:56 +01:00
Dan Poltawski
a9334960dd
Merge branch 'wip-MDL-30315-master' of git://github.com/abgreeve/moodle
2015-08-19 18:30:33 +02:00
Adrian Greeve
9b272cc069
MDL-30315 grades: Fix up function doc block.
...
This was annoying me no end so here is a commit
to set it right.
2015-08-18 17:02:46 +08:00
Adrian Greeve
a9ef9c5e82
MDL-30315 grades: Unit tests for grade import.
2015-08-18 17:02:46 +08:00
Adrian Greeve
0305798c62
MDL-30315 gradebook: Uploading feedback doesn't override grades.
2015-08-18 17:02:45 +08:00
David Monllao
fd76204a8b
Merge branch 'MDL-51100-master' of git://github.com/andrewnicols/moodle
2015-08-17 08:50:49 +08:00
Andrew Nicols
711b1d6b3e
MDL-51100 behat: Remove javascript tag from usermenu steps
...
These tests only needed the javascript tag because of the user menu.
Now that issue has been resolved, they do not need it.
Note: Some were also not using the singleselect feature, so would fail
without changes to use this too as they were not handling proper selection
of the singleselect element.
2015-08-14 08:52:29 +08:00
Frederic Massart
ca81f8c4b2
MDL-50062 grades: Behat tests for aggregation changes
2015-08-06 11:56:44 +08:00
Frederic Massart
e1c5d6618d
MDL-50062 grades: Fix false positives in Behat tests
2015-08-06 10:24:26 +08:00
Frederic Massart
5419cbc9eb
MDL-50062 grades: Carry agg. settings between categories when possible
2015-08-06 10:24:25 +08:00
Dave Cooper
135efd5116
MDL-50062 gradebook: Fixed behaviour when changing aggregation mathods.
2015-08-06 10:24:25 +08:00
Mark Nelson
bc5d93c766
MDL-50535 core_grades: fixed behat failing
2015-07-29 14:23:06 +08:00
Daniel Neis Araujo
9de0c83086
MDL-50834 gradebook: Add help text and link to xml grade import
2015-07-24 09:54:34 -03:00
Andrew Nicols
8aa8a7465b
Merge branch 'MDL-49176_marking_guide' of git://github.com/davosmith/moodle
2015-07-21 11:25:42 +08:00
Eloy Lafuente (stronk7)
b164e2ec30
Merge branch 'MDL-50049-master' of git://github.com/ankitagarwal/moodle
2015-07-09 20:24:13 +02:00
Marina Glancy
6e4b8381bf
MDL-48239 grades: corrected docs url for calculation changes
2015-07-02 15:49:48 +08:00
Marina Glancy
f677ece516
MDL-48239 grades: fix notification class
2015-07-02 15:49:46 +08:00
Eloy Lafuente (stronk7)
3950aa134f
Merge branch 'wip-MDL-48239-master' of git://github.com/abgreeve/moodle
2015-07-02 05:42:08 +02:00
Adrian Greeve
6a7c8feb10
MDL-48239 gradebook: Change to calculated grade item min and max.
...
Regardless of the setting 'Min and max grades used in calculation'
Calculated grade items will always update the min and max raw grade.
2015-07-02 11:13:26 +08:00
Adrian Greeve
f44ffb724a
MDL-48239 gradebook: Behat tests for calculated grade items.
2015-07-02 11:13:25 +08:00
Adrian Greeve
4d4dcc2718
MDL-48239 gradebook: Calculated grades maxgrade now able to be set.
2015-07-02 11:13:25 +08:00
Dan Poltawski
0b45c56da1
Merge branch 'wip-mdl-50481' of https://github.com/rajeshtaneja/moodle
2015-06-30 12:25:52 +02:00
Ankit Agarwal
2149326b8c
MDL-50049 deprecation: Remove usage of deprecated api and cleanup
2015-06-29 17:15:50 +05:30
David Monllao
94f73fdbcc
MDL-50283 gradeform_rubric: No need to escape HTML entities
2015-06-24 11:21:56 +08:00
Dan Poltawski
782300f3a8
Merge branch 'MDL-50283_master' of https://github.com/dmonllao/moodle
2015-06-23 12:37:05 +01:00
Dan Poltawski
20a16512ee
Merge branch 'wip-MDL-49257-master' of git://github.com/marinaglancy/moodle
2015-06-23 11:20:08 +01:00
Marina Glancy
46267b7b25
MDL-49257 grades: behat tests for extra credit
2015-06-23 14:25:50 +08:00
Marina Glancy
deb3d5ed00
MDL-49257 grades: introduce calculation freeze
...
In order to prevent changes in the existing grades when we fix bugs
we are introducing the gradebook code versioning. Each course may
"freeze" the code version to the older date. Freezing is usually done
during upgrade or restore and can be removed by the teacher by pressing
the button and accepting potential grade changes. There is no visible
setting and not possible to change the version back manually.
See MDL-50432 and MDL-50522
2015-06-23 14:25:47 +08:00
Eloy Lafuente (stronk7)
cd1d7c2993
Merge branch 'MDL-50089-master' of git://github.com/merrill-oakland/moodle
2015-06-22 19:58:53 +02:00
Eric Merrill
394ade5f2b
MDL-50089 grades: Use grade item min/max in exports
2015-06-22 12:58:40 -04:00
