85365 Commits

Author SHA1 Message Date
Luca Bösch
da15576180 MDL-58928 enrol: delete and edit icon alt attribute 2017-07-31 17:31:07 +02:00
Dan Poltawski
d509f80c48 weekly release 3.4dev 2017-07-27 10:10:46 +01:00
Dan Poltawski
88ac888040 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-07-27 10:10:44 +01:00
Andrew Nicols
048009ea35 Merge branch 'MDL-57791_master-fix5' of git://github.com/dmonllao/moodle 2017-07-27 14:23:52 +08:00
David Monllao
cbf4c391c2 MDL-57791 analytics: Fix error message for no evaluation models 2017-07-27 08:15:02 +02:00
Andrew Nicols
81af47b7cf Merge branch 'MDL-59369-master-fix' of git://github.com/junpataleta/moodle 2017-07-27 11:34:43 +08:00
Jun Pataleta
91b099dbed MDL-59369 enrol: Fix add_to_group Behat tests
Tab to the next element after selecting groups in order for
the autocomplete element to close and be able to click on the
"Save changes" link.
2017-07-27 11:17:33 +08:00
David Monllao
ab4ae50603 Merge branch 'MDL-58906-master' of git://github.com/ankitagarwal/moodle 2017-07-26 14:42:38 +02:00
Dan Poltawski
1ea5164833 Merge branch 'MDL-57698-master-fix' of https://github.com/xow/moodle 2017-07-26 09:42:10 +01:00
Dan Poltawski
75535f1692 Merge branch 'MDL-57791_master-fix4' of git://github.com/dmonllao/moodle 2017-07-26 09:34:21 +01:00
Ankit Agarwal
9b5d887967 MDL-58906 calendar: Remove check for _refresh_events exists 2017-07-26 12:51:27 +05:30
David Monllao
4a210b0688 MDL-57791 analytics: Predictions deleted context management 2017-07-26 09:17:58 +02:00
Andrew Nicols
a5164e85f2 Merge branch 'MDL-59499-master-classfix' of github.com:snake/moodle 2017-07-26 14:53:39 +08:00
Andrew Nicols
9e27e298c3 Merge branch 'MDL-59367-master-fix2' of http://github.com/damyon/moodle 2017-07-26 14:03:22 +08:00
Damyon Wiese
e640eb5cc3 MDL-59367 behat: Close the autocomplete
Close the auto complete suggestions list so it does not obscure the save changes button in chrome
2017-07-26 13:48:16 +08:00
Andrew Nicols
b67caad9f5 Merge branch 'MDL-57791-master-inarrayfix' of github.com:snake/moodle 2017-07-26 13:38:03 +08:00
Andrew Nicols
d59be47602 MDL-59367 participants: Whitespace fix 2017-07-26 13:30:44 +08:00
Andrew Nicols
a8168eb981 Merge branch 'MDL-59367-master-fix1' of http://github.com/damyon/moodle 2017-07-26 13:26:12 +08:00
Jake Dallimore
0eb594401d MDL-57791 analytics: fix for in_array 2017-07-26 13:25:37 +08:00
Damyon Wiese
0ae28fad3a MDL-59367 participants: Reduce db queries
Fetch all role assignments for the course in a single query, instead of for each of the listed users.

More data but less queries.
2017-07-26 11:21:59 +08:00
Jake Dallimore
9e9ed46a99 MDL-59499 admin: class fix for course category expansion icons 2017-07-26 11:11:09 +08:00
John Okely
d1b79250c6 MDL-57698 backup: Decrease deadlock fixture size 2017-07-26 10:45:58 +08:00
Andrew Nicols
7740e186e1 Merge branch 'MDL-59369-master' of git://github.com/junpataleta/moodle 2017-07-26 09:47:26 +08:00
Jun Pataleta
90ffcfa83a MDL-59369 user: IR fixes
* Moved status_field to core_user\output namespace.
* Assigned status flags for the template context in order to determine
  which label class to use for the given status.

Part of MDL-59290.
2017-07-26 09:44:33 +08:00
Jun Pataleta
4544451aff MDL-59369 user: Render status as highlighted labels 2017-07-26 09:44:33 +08:00
Jun Pataleta
06aa592315 MDL-59369 enrol: Behat tests for plugin enrol actions 2017-07-26 09:44:33 +08:00
Jun Pataleta
642bea179c MDL-59369 user: Behat tests involving the Status column 2017-07-26 09:44:33 +08:00
Jun Pataleta
80d13bfe8d MDL-59369 user: User enrolment status JS controls
* Add actions for editing user enrolment and unenrol
* Render user enrolment details in a modal
2017-07-26 09:44:33 +08:00
Jun Pataleta
fd0a43be1b MDL-59369 enrol: Introduce data-action attribute for enrol action links 2017-07-26 09:44:33 +08:00
Jun Pataleta
ea758b85e4 MDL-59369 enrol: Cleanup enrol pages
* Cleanup edit enrolment form.
* Improve edit enrol form validation error message.
* Add modal custom data flag to edit enrolment form to hide action
  buttons if loaded via fragment.
* Point return URLs of edit enrolment and user unenrol pages back to
  participants page.
2017-07-26 09:44:02 +08:00
Jun Pataleta
5719f2ca50 MDL-59369 enrol: Edit user enrolment fragment 2017-07-26 09:44:02 +08:00
Jun Pataleta
58c20c8108 MDL-59369 enrol: New ws core_enrol_external::edit_user_enrolment 2017-07-26 09:43:16 +08:00
Jun Pataleta
fb7929677a MDL-59369 user: Add status column to the participants table 2017-07-26 09:42:38 +08:00
AMOS bot
34e9b90b7a Automatically generated installer lang files 2017-07-26 00:07:06 +08:00
Dan Poltawski
afa752eb12 Merge branch 'MDL-57698-master' of https://github.com/xow/moodle 2017-07-25 11:48:09 +01:00
Dan Poltawski
35699ba2ff Merge branch 'MDL-57791_master-fix3' of git://github.com/dmonllao/moodle 2017-07-25 11:37:54 +01:00
Dan Poltawski
7de5101d4e Merge branch 'MDL-58761_bad_regex_in_custom_step' of https://github.com/gthomas2/moodle 2017-07-25 11:06:27 +01:00
David Monllao
10f9517c22 Merge branch 'MDL-59453-master' of git://github.com/jleyva/moodle 2017-07-25 11:53:00 +02:00
Dan Poltawski
7a39523e0e Merge branch 'MDL-59425-master' of https://github.com/abias/moodle 2017-07-25 10:51:10 +01:00
David Monllao
a2b326c232 Merge branch 'MDL-59544-master-filemanagervalidation' of git://github.com/mudrd8mz/moodle 2017-07-25 11:17:07 +02:00
David Monllao
6d6b35fd24 Merge branch 'MDL-59485' of https://github.com/IMSGlobal/moodle 2017-07-25 11:11:09 +02:00
David Monllao
55399cd776 Merge branch 'MDL-59578-master' of git://github.com/junpataleta/moodle 2017-07-25 11:09:44 +02:00
David Monllao
85e50ba405 MDL-57791 analytics: Set logstore during install
get_analytics_logstore updated to fix an edge case.
2017-07-25 11:05:03 +02:00
Dan Poltawski
69340d49dc Merge branch 'MDL-59238-master' of git://github.com/jleyva/moodle 2017-07-25 09:52:03 +01:00
Dan Poltawski
a13277a740 Merge branch 'MDL-59268-master' of git://github.com/jleyva/moodle 2017-07-25 09:04:59 +01:00
Andrew Nicols
11b31ab857 MDL-59367 user: Documentation fix 2017-07-25 15:04:57 +08:00
Andrew Nicols
e18ebf3999 Merge branch 'MDL-59367-master' of git://github.com/damyon/moodle 2017-07-25 15:02:55 +08:00
Dan Poltawski
6fc41d0241 Merge branch 'MDL-59432-master' of git://github.com/lameze/moodle 2017-07-25 07:58:23 +01:00
Dan Poltawski
a1e094f9dd Merge branch 'MDL-59240-master' of git://github.com/jleyva/moodle 2017-07-25 07:31:34 +01:00
Andrew Nicols
d3e69bee38 Merge branch 'MDL-56751-master' of git://github.com/jleyva/moodle 2017-07-25 10:44:05 +08:00