2636 Commits

Author SHA1 Message Date
Dan Poltawski
fd5772e691 Merge branch 'wip_MDL-36501_master' of https://github.com/mtpmcdermott/moodle 2017-06-14 12:30:39 +01:00
Dan Poltawski
cafd4bc67e Merge branch 'MDL-59086_master' of git://github.com/markn86/moodle 2017-06-06 08:44:46 +01:00
Matt McDermott
d55c1ef2d2 MDL-36501 grades: Include 'Parent Category' on create grade item
Force the edit and creat grade item forms to include the same content. This is accomplished by creating a new grade item and setting the correct category. From there the same logic applied when editing a grade item is applied when creating a grade item.
2017-06-05 09:22:28 -07:00
Dan Poltawski
64fe8bfe94 Merge branch 'MDL-49040-master' of https://github.com/jebarviabb/moodle 2017-05-30 11:42:23 +01:00
Mark Nelson
9bd705e3dd MDL-59086 gradereport_grader: style 'Save changes' button 2017-05-30 13:43:37 +08:00
Josh Ebarvia
f0242b4d95 MDL-49040 gradereport_grader: Fix feedback truncation after & char 2017-05-23 13:05:00 +09:30
Eloy Lafuente (stronk7)
5e27228335 MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts 2017-05-19 19:22:07 +02:00
Josh Ebarvia
0a0e2843fd MDL-58795 gradereport_grader: Prevent duplicates in grader report
Currently, the sorting being used for the grader report table
(asc/desc arrows) is just the grade_grades.finalgrade.
This adds grade_grades.userid in the sort to prevent duplicate
in records returned when using pages.
2017-05-16 18:29:24 +09:30
Eloy Lafuente (stronk7)
d989ee1e03 MDL-58853 versions: bump all versions and requires near release
version = 2017051500 release version
requires= 2017050500 current rc1 version
2017-05-09 02:58:28 +02:00
Simey Lameze
fdeeaff954 MDL-58265 core_test: replace I turn editing on steps
Also remove few more unnecessary steps that redirects behat to
site home page to actually get to the course.

Part of MDL-55611 epic.
2017-04-03 11:37:07 +08:00
Simey Lameze
93be3f730c MDL-58265 core_test: remove unnecessary steps
This commmit removes steps that take behat to site home page
to actually get to a course page.

Part of MDL-55611 epic.
2017-04-03 11:37:07 +08:00
Simey Lameze
c987d1b2ef MDL-58265 core_test: replace all uses of I follow course steps
Part of MDL-55611 epic.
2017-04-03 11:37:07 +08:00
Marina Glancy
f9f30189dd MDL-58092 gradingform_guide: behat to demonstrate double quote fix 2017-03-24 13:27:24 +08:00
gthomas2
cc65414a04 MDL-58092 grading methods: Fix double escape for freq used questions 2017-03-24 13:21:27 +08:00
Damyon Wiese
8857c715d1 MDL-40759 icons: Behat fixes for font-awesome 2017-03-17 15:52:18 +08:00
Damyon Wiese
663640f5b3 MDL-40759 icons: convert uses of pix_url to pix_icon
Also change filepicker to use scaled svgs instead of sets of custom pngs. The svgs are taken from font-awesome.
2017-03-17 15:52:17 +08:00
Andrew Nicols
ef452d9cbc Merge branch 'MDL-47354_gradereport_singleview_perpage' of git://github.com/davosmith/moodle 2017-03-15 11:17:49 +08:00
Marina Glancy
6e65554ea1 MDL-58010 user: allow to update only whitelisted user preferences 2017-03-10 18:04:47 +00:00
Davo Smith
c6dd683cd0 MDL-47354 gradereport_singleview: allow choice of 'perpage' values 2017-03-08 11:39:29 +00:00
Dan Poltawski
6dba6a5a6a Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle 2017-03-07 11:12:32 -03:00
Zoe Bogner
004738e03d MDL-57999 grades: Add itemname to gradereport_user_get_grade_items 2017-02-28 21:29:59 +10:30
Adam Olley
767761b7d8 MDL-58030 gradingform_guide: Init $commentchooser before use
The initialisation of $commentschooser was moved into an IF condition,
whilst still using it outside of that IF conditions scope. As such, if
there are no comments to choose from, the variable is never init'd but
it still goes to use it, emitting a PHP notice.
2017-02-21 14:31:20 +10:30
Andrew Nicols
f417416cf1 Merge branch 'MDL-57296-master' of git://github.com/ankitagarwal/moodle 2017-01-31 08:35:41 +08:00
Ankit Agarwal
6c6bd6e1ad MDL-57296 gradelib: Fix get_hidding_effect for grade_type_none items 2017-01-30 13:37:48 +05:30
Eloy Lafuente (stronk7)
ae8e8e6aa1 Merge branch 'MDL-55915_master' of https://github.com/rezaies/moodle 2017-01-24 22:03:48 +01:00
Ankit Agarwal
bba75cb186 MDL-57296 gradebook: Fix issue with gradebook while collapsing grades 2017-01-24 15:48:36 +05:30
Shamim Rezaie
20b2bbb966 MDL-55915 Gradebook: let fullname() know if user has viewfullnames cap
Instruct fullname() to format names on the gradebook grader report with alternativefullnameformat when user
has moodle/site:viewfullnames capability.
2017-01-20 20:29:39 +11:00
Eloy Lafuente (stronk7)
6214e08f6a Merge branch 'MDL-57629-master' of git://github.com/jleyva/moodle 2017-01-17 20:55:05 +01:00
Dan Poltawski
75cb891b5a Merge branch 'MDL-57601-master' of https://github.com/sammarshallou/moodle 2017-01-16 12:23:55 +00:00
Juan Leyva
9db43c7341 MDL-57629 webservice: Fix external functions phpdoc
Replace external_external_function_parameters with
external_function_parameters
2017-01-11 16:56:25 +01:00
Eloy Lafuente (stronk7)
777361983c Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle 2017-01-11 02:42:29 +01:00
sam marshall
b5f661b111 MDL-57601 Grade report: Error for ungraded quiz without view hidden
If a course contains an ungraded quiz (max grade set to 0), and there
is a user account which can view the grader reports but does not have
permission to view hidden grades, they will get errors.
2017-01-09 15:32:25 +00:00
John Okely
b7c822a546 MDL-57282 behat: Deprecate I go to X in the course gradebook 2017-01-06 13:47:19 +08:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors 2017-01-03 09:12:54 +08:00
Adrian Greeve
4d91497153 MDL-57216 navigation: Added missing grade overview link.
For theme_boost the grade overview link has been added
to the user profile page.
2016-12-09 10:19:32 +08:00
Andrew Nicols
75af0aa680 Merge branch 'MDL-57266' of git://github.com/stronk7/moodle 2016-12-07 09:53:16 +08:00
Rajesh Taneja
9bad658aaf
MDL-56614 behat: Fixed steps to use new definition 2016-12-07 07:10:35 +08:00
Andrew Nicols
5b67c9ecd1 Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle 2016-12-06 13:37:33 +08:00
Marina Glancy
44f460c32a MDL-56614 behat: rename step for navigating in the gradebook 2016-12-06 11:49:14 +08:00
Marina Glancy
e5287f9b3b MDL-56614 behat: navigate without navigation and admin blocks 2016-12-06 11:49:14 +08:00
Marina Glancy
ebcff7e256 MDL-56614 behat: new steps for navigation without blocks 2016-12-06 11:49:11 +08:00
Andrew Nicols
80a35e6d1f Merge branch 'MDL-57255-master' of git://github.com/jleyva/moodle 2016-12-06 10:16:38 +08:00
Eloy Lafuente (stronk7)
75c57a08fb MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts 2016-12-05 17:10:20 +01:00
Andrew Nicols
feda939e2f Merge branch 'MDL-56893-MOODLE_master-edit-grade-item-bug' of https://github.com/mspall/moodle 2016-12-05 12:04:43 +08:00
Juan Leyva
f104a58fe0 MDL-57255 gradereport_user: Fix default value for graderaw
graderaw is a PARAM_FLOAT, the default to empty string was incorrect
2016-12-02 12:29:51 +00:00
Michael Spall
d27e1c7519 MDL-56893 grades: Fix edit grade item when grade_report_showmin is false
Check to make sure $data['grademin'] exists. When grade_report_showmin
is false $data['grademin'] doesn't exist.
2016-11-30 11:57:57 -07:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release
version = 2016120500 release version
requires= 2016112900 current rc4 version
2016-11-29 22:57:05 +01:00
Eloy Lafuente (stronk7)
eb80018202 Merge branch 'MDL-57133-master-enfix' of git://github.com/mudrd8mz/moodle 2016-11-29 22:36:29 +01:00
David Mudrák
5e45c34221 MDL-57133 lang: Reword the strings in Behat tests too 2016-11-29 01:59:31 +01:00
Helen Foster
67823776a0 MDL-57133 lang: Merge English strings from the en_fix language pack 2016-11-29 01:49:28 +01:00