mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 01:50:55 +01:00
Code Issues Projects Releases Wiki Activity
89,790 Commits 36 Branches 527 Tags
Commit Graph

89790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shamim Rezaie
30dd3c5d0f MDL-62897 restore: Fix component name in get_string() 2018-07-23 14:37:40 +10: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
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
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
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
Andrew Nicols
4a91bd6f62 Merge branch 'MDL-62849-master' of git://github.com/abgreeve/moodle 2018-07-17 10:31:29 +08:00
Adrian Greeve
f38766e166 MDL-62849 files lib: Add method to return all files. 
Added a function which returns all the files from all directories
in the draftarea.
 2018-07-17 10:25:11 +08:00
AMOS bot
e575ad38c8 Automatically generated installer lang files 2018-07-17 00:08:09 +00:00
sarjona
7fde83584f MDL-60924 core_user: Hold participant filters when clicking some link 2018-07-16 18:03:12 +02:00
David Monllao
c6f64c217d Merge branch 'MDL-52953-master' of git://github.com/abgreeve/moodle 2018-07-16 14:17:56 +02:00
David Monllao
aa59fb2ea2 Merge branch 'MDL-49025' of https://github.com/NeillM/moodle 2018-07-16 13:34:57 +02:00
David Monllao
011c1a4291 Merge branch 'MDL-61019-master' of https://github.com/lucaboesch/moodle 2018-07-16 13:25:06 +02:00
Mihail Geshoski
98f9db0d63 MDL-53972 feedback: Final deprecation in mod/feedback/lib.php 2018-07-16 14:21:18 +08:00
Andrew Nicols
bfeef10af0 Merge branch 'MDL-45851' of git://github.com/timhunt/moodle 2018-07-16 13:10:24 +08:00
Jake Dallimore
bdd410a6f4 MDL-54830 core_course: fix maxbytes logic in course_update web service 
The service should allow the special value of 0 (site limit) to be set.
 2018-07-16 10:41:17 +08:00
Jake Dallimore
fd6d98cc90 MDL-62868 core_group: clear group_grouping cache when changing grouping 2018-07-16 10:34:52 +08:00
Jake Dallimore
c6150f1104 Merge branch 'MDL-45389-master' of https://github.com/lucaboesch/moodle 2018-07-16 10:11:40 +08:00
Neill Magill
650779d609 MDL-49025 assign: Submissions of an empty directory should not save 
Before this change if only a folder was submitted the submission_is_empty
check would return true. This meant that the draft area would be saved.
The is_empty check would then be called which would return false. This
caused the submission form to indicate to the user that the submission
had failed.

Now is_empty and submission_is_empty should both return false if only
folders are submitted.
 2018-07-13 14:03:42 +01:00
Neill Magill
3ebfab9810 MDL-49025 assign: Test than an empty directory will not submit 2018-07-13 14:03:41 +01:00
Luca Bösch
9004441b7b MDL-61019 Theme boost: lesson display issues with buttons/progress bar. 2018-07-13 09:27:06 +02:00
Luca Bösch
5cb24d2299 MDL-45389 theme_bootstrapbase: Forum index page alignment in clean. 2018-07-13 09:26:47 +02:00
Jake Dallimore
8c51626841 weekly release 3.6dev 2018-07-13 12:26:07 +08:00
Jake Dallimore
856602d992 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-07-13 12:26:05 +08:00
Nick Phillips
b6efeb4730 MDL-59447 question: GIFT import to respect multichoice defaults 
Fix GIFT import to respect default answernumbering for new multichoice
questions (introduced in MDL-50011). Default for shuffleanswers is still
ignored, as this is a rather coarse-grained way to do it, and the wrong
setting for shuffleanswers would irreversibly alter the meaning of some
questions.

This is not an ideal long-term fix, but will save significant effort
for anyone who needs to be able to set answernumbering style for
questions imported in GIFT format.
 2018-07-13 13:33:33 +12:00
Adrian Greeve
4bebed4011 MDL-53697 mod: Final deprecation of xxx_get_types(). 2018-07-12 10:19:09 +08:00
Christian Lawson-Perfect
7dcbe6a983 MDL-61355 SCORM: fix correct_response prefix check 
The regexes to detect the optional prefixes at the start of some
interaction types are constructed to optionally match the prefix, so we
need to ensure that the matched group is really there when trying to
strip it from the given value in CRCheckValueNodes.

also remove "check for prefix" from CRcheckValueNodes

prefixes on correct responses patterns are removed in the section above
by CRremovePrefixes, so this block was redundant.
The `.pre` property for each correct_response is not used anywhere
else, so this removes their definitions too.
 2018-07-12 10:44:30 +12:00
David Monllao
2a021ac3a0 Merge branch 'MDL-62618-master' of git://github.com/mickhawkins/moodle 2018-07-11 18:47:57 +02:00