89813 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
252905427c Merge branch 'MDL-60874-master-enrolautocomplete' of git://github.com/mudrd8mz/moodle 2018-07-24 19:03:32 +02:00
Amaia Anabitarte
9c7b226579 MDL-55778 enrol_self: New string for 'Notify before..' options
AMOS BEGIN
 CPY [expirynotifyall,core_enrol],[expirynotifyall,enrol_self]
 CPY [expirynotifyenroller,core_enrol],[expirynotifyenroller,enrol_self]
AMOS END
2018-07-24 18:41:00 +02:00
Eloy Lafuente (stronk7)
402d1c538a Merge branch 'MDL-62925_master' of git://github.com/markn86/moodle 2018-07-24 18:31:48 +02:00
Jun Pataleta
f7497ace8a Merge branch 'MDL-62919-master' of git://github.com/cescobedo/moodle 2018-07-24 16:24:39 +08:00
Jun Pataleta
07249cbb3a Merge branch 'MDL-62939-master-cleanhtmluserdesc' of git://github.com/mudrd8mz/moodle 2018-07-24 11:58:38 +08:00
Andrew Nicols
9266d24827 Merge branch 'MDL-35977-master' of git://github.com/mihailges/moodle 2018-07-23 15:30:51 +08:00
Jun Pataleta
60bf79ac88 Merge branch 'MDL-62948-master' of git://github.com/andrewnicols/moodle 2018-07-23 15:20:47 +08:00
Jun Pataleta
6ab64dde9c Merge branch 'MDL-62949-master' of git://github.com/andrewnicols/moodle 2018-07-23 14:55:18 +08:00
Andrew Nicols
1f16daa4cf Merge branch 'MDL-62962-master' of git://github.com/junpataleta/moodle 2018-07-23 14:51:18 +08:00
Andrew Nicols
a6034c9611 Merge branch 'MDL-54742-master' of git://github.com/mihailges/moodle 2018-07-23 14:29:55 +08:00
Mihail Geshoski
10bd37fabd MDL-54742 general: Remove strings deprecated in 3.2 2018-07-23 14:25:14 +08:00
Jun Pataleta
f0ccce9af7 MDL-62962 tool_dataprivacy: Move user generation within the test 2018-07-23 13:35:50 +08:00
Andrew Nicols
653c30708d Merge branch 'MDL-61707-master' of git://github.com/mihailges/moodle 2018-07-23 11:33:20 +08:00
Andrew Nicols
311199f52e Merge branch 'MDL-29701-master' of https://github.com/phuchau1509/moodle 2018-07-23 09:42:24 +08:00
Mihail Geshoski
204178d646 MDL-61707 authentication: Remove presignup session upon user signup 2018-07-23 09:33:08 +08:00
Mihail Geshoski
329a84b489 MDL-35977 comments: Missing label in blog and assignment comment area 2018-07-23 08:55:14 +08:00
Andrew Nicols
0180369b27 weekly release 3.6dev 2018-07-20 15:09:02 +08:00
Andrew Nicols
5794a467e2 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-07-20 15:09:00 +08:00
Andrew Nicols
2585f77a11 MDL-62949 calendar: Fix behat nav to calendar 2018-07-20 11:48:15 +08:00
Andrew Nicols
e06f0c44ea MDL-62948 tool_policy: Increase window size
In the default window size the floating footer detaling the privacy
policies covers the "Login as guest" button.
2018-07-20 11:10:49 +08:00
Jake Hau
b6976f1a87 MDL-29701 editor: mform disableif doesn't work on editor element 2018-07-19 11:38:26 +07:00
Jun Pataleta
a766f5dc00 Merge branch 'MDL-62811' of git://github.com/timhunt/moodle 2018-07-19 08:46:51 +08:00
Jun Pataleta
432e755f2b Merge branch 'MDL-62769' of https://github.com/timhunt/moodle 2018-07-19 08:46:50 +08:00
Jun Pataleta
76ca5c61d0 Merge branch 'MDL-62781-master' of git://github.com/junpataleta/moodle 2018-07-19 08:46:49 +08:00
David Monllao
3ffb8d2317 Merge branch 'MDL-59447-master' of https://github.com/nwp90/moodle 2018-07-19 08:46:48 +08:00
David Monllao
810f12c25b Merge branch 'MDL-53972-master' of git://github.com/mihailges/moodle 2018-07-19 08:46:48 +08:00
David Monllao
1f9964a6e0 Merge branch 'MDL-54830-master' of https://github.com/snake/moodle 2018-07-19 08:46:47 +08:00
David Monllao
98b5b9d8a5 Merge branch 'MDL-61355' of git://github.com/danmarsden/moodle 2018-07-19 08:46:46 +08:00
David Monllao
7485089c91 Merge branch 'MDL-61351_master' of git://github.com/markn86/moodle 2018-07-19 08:46:45 +08:00
David Monllao
523704d9ec Merge branch 'MDL-62868-master' of https://github.com/snake/moodle 2018-07-19 08:46:44 +08:00
David Monllao
a02f330b5d Merge branch 'MDL-62663' of https://github.com/andrewhancox/moodle 2018-07-19 08:46:43 +08:00
David Mudrák
067d0efe85 MDL-62939 user: Fix field type of the user profile description
As this is an editor element field, the it is supposed to be PARAM_RAW.
Otherwise it cleans-up certain non-HTML syntax such as Markdown
blockquote characters.
2018-07-18 14:27:14 +02:00
Jun Pataleta
061e9f4b11 MDL-62781 core_question: Remove unnecessary assertion 2018-07-18 09:57:49 +08:00
Tim Hunt
7ca1b32808 MDL-62781 question/privacy: fix tests with CodeRunner is installed
The tests were assuming that no plugin ever created questions on
install.

Also change the tests to do the counting in the DB. That is more
efficient.
2018-07-18 09:57:49 +08:00
AMOS bot
7c66d04911 Automatically generated installer lang files 2018-07-18 00:07:26 +00:00
cescobedo
9de1a91532 MDL-62919 auth_shibboleth: Use the right shibboleth_auth_instructions
Change $CFG->auth_instructions by shibboleth/auth_instructions in the index_form.html
2018-07-17 21:06:44 +02:00
Tim Schroeder
0f1dffe6af MDL-61351 auth_shibboleth: removed redundant session handler class check 2018-07-17 16:45:20 +08:00
Tim Schroeder
81f55e41a7 MDL-61351 core: added \core\session\manager\get_handler_class()
* This is needed e.g. by the shibboleth logout handler to check which
type of sessions are used.
2018-07-17 16:45:20 +08:00
Mark Nelson
4beca90f3d MDL-61351 auth_shibboleth: move new functions to separate class
This reduces the amount of code to an already confusing logout.php
file and prevents conflicts if someone else happens to be using
the same function name in a file.
2018-07-17 16:45:20 +08:00
David Monllao
e385230046 Merge branch 'MDL-60924-master' of git://github.com/sarjona/moodle 2018-07-17 09:38:04 +02:00
Tim Schroeder
1e737e38f9 MDL-61351 shibboleth: Logout: fix session handler class not being used
* use $CFG->session_handler_class to determine which type of session is
  used
* if not set, use $CFG->dbsession instead
2018-07-17 15:27:26 +08:00
Andrew Nicols
9e52f4adc2 Merge branch 'MDL-62889_master' of git://github.com/markn86/moodle 2018-07-17 12:11:34 +08:00
Mark Nelson
b77e5841f8 MDL-62889 message_popup: redirect using moodle_url
Without this relative URLs passed (like /message/index.php)
were being redirected to HOST/message/index.php rather than
$CFG->wwwroot/message/index.php.
2018-07-17 11:54:52 +08:00
Mark Nelson
c5fcbd1081 MDL-62889 message_popup: redirect to notification page if url is empty
If you pass a URL that is not a valid URL (for example
';') it is cleaned to an empty string which redirects to
$CFG->wwwroot/message/output/popup/ which is not a valid
page.
2018-07-17 11:54:52 +08:00
Mark Nelson
7d5b9da80c MDL-62889 message_popup: allow redirects to external URLs
Many institutions create notifications that link to an
external service. We need to allow redirects to these
systems.
2018-07-17 11:44:41 +08:00
Mark Nelson
d2eb1ca91e MDL-62889 message_popup: only add redirecturl if it exists
We allow notifications to have a null value for the 'contexturl'.
In this case we should not be appending a 'redirecturl' param to
the URL when it is going to be empty.
2018-07-17 11:44:41 +08:00
Andrew Nicols
affd85ce24 Merge branch 'MDL-53697-master' of git://github.com/abgreeve/moodle 2018-07-17 11:36:44 +08:00
Andrew Nicols
38036e73c2 Merge branch 'MDL-53808-master' of git://github.com/cescobedo/moodle 2018-07-17 11:34:59 +08:00
Mark Nelson
94a1861c84 MDL-62925 mod_wiki: style 'Search wikis' button 2018-07-17 11:31:20 +08:00
Andrew Nicols
4a91bd6f62 Merge branch 'MDL-62849-master' of git://github.com/abgreeve/moodle 2018-07-17 10:31:29 +08:00