mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 05:00:06 +01:00
Code Issues Projects Releases Wiki Activity
87,300 Commits 36 Branches 523 Tags
Commit Graph

87300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
39377f8083 Merge branch 'MDL-44667-master' of https://github.com/snake/moodle 2017-12-12 10:26:08 +08:00
Damyon Wiese
740a81eeb2 Merge branch 'MDL-60968-master' of git://github.com/lameze/moodle 2017-12-12 10:19:00 +08:00
Damyon Wiese
8cae085071 Merge branch 'MDL-60976-master' of https://github.com/matt-catalyst/moodle 2017-12-12 09:56:20 +08:00
Brendan Heywood
b588373656 MDL-60968 auth: Allow more flexibility with mapping attributes 2017-12-12 09:37:35 +08:00
Damyon Wiese
4786443998 Merge branch 'MDL-60041' of https://github.com/NeillM/moodle 2017-12-12 09:13:43 +08:00
Damyon Wiese
34adfcb4ee Merge branch 'MDL-54021-master' of git://github.com/mihailges/moodle 2017-12-12 08:55:57 +08:00
Damyon Wiese
807ba44cc6 Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle 
Conflicts:
	theme/boost/scss/moodle/modules.scss
 2017-12-11 16:55:27 +08:00
Damyon Wiese
42cec80673 Merge branch 'MDL-56197-master' of git://github.com/mihailges/moodle 2017-12-11 16:47:19 +08:00
Neill Magill
61fad215f1 MDL-60041 dml: MOODLELIB sql file must have Unix line endings 
If the file does not have Unix line endings then the regular expression
in oci_native_moodle_database::attempt_oci_package_install() does
not split it correctly.

This leads to an invalid package being created in Oracle.

The .gitattribute file changes for oci_native_moodle_package.sql
force it to have Unix style line endings when the branch is checked
out and the file does not already exist.

The file has been modified so that the Unix style line endings are
applied even if the file already exists, for example when pulling in
this change to an existing branch.
 2017-12-11 08:40:58 +00:00
Mihail Geshoski
83b9a7c88c MDL-56197 lesson: Multichoice answers not on same line as radio button 2017-12-11 15:49:24 +08:00
Andrew Nicols
10cc00b4af Merge branch 'MDL-58272-master-2' of https://github.com/snake/moodle 2017-12-11 14:58:14 +08:00
Damyon Wiese
67c0e18ca2 Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle 2017-12-11 14:54:46 +08:00
Simey Lameze
5c1ea9aea5 MDL-60057 mod_lesson: add unit tests for callbacks 2017-12-11 14:45:04 +08:00
Simey Lameze
f077e0af7e MDL-60057 mod_lesson: add calendar drag and drop callbacks 
AMOS BEGIN
        CPY [openafterclose,mod_choice],[openafterclose,mod_lesson]
	CPY [closebeforeopen,mod_choice],[closebeforeopen,mod_database]
	CPY [openafterclose,mod_choice],[openafterclose,mod_database]
AMOS END
 2017-12-11 14:29:16 +08:00
Damyon Wiese
5258525f0a Merge branch 'MDL-60060-master' of git://github.com/lameze/moodle 2017-12-11 14:08:08 +08:00
Simey Lameze
61ac58a887 MDL-60060 mod_data: add unit tests for callbacks 2017-12-11 14:05:00 +08:00
Simey Lameze
5e401a2a51 MDL-60060 mod_data: add calendar drag and drop callbacks 2017-12-11 14:05:00 +08:00
Damyon Wiese
fe955c5645 Merge branch 'wip-MDL-45500-master' of git://github.com/marinaglancy/moodle 2017-12-11 12:56:18 +08:00
Damyon Wiese
c6a507e9e7 Merge branch 'MDL-60948-master' of git://github.com/andrewnicols/moodle 2017-12-11 12:52:23 +08:00
Andrew Nicols
b9819842d9 MDL-60948 tool_httpsreplace: Correct use of test URLs 2017-12-11 12:05:57 +08:00
Damyon Wiese
917923c860 Merge branch 'MDL-60043' of git://github.com/timhunt/moodle 2017-12-11 11:49:40 +08:00
Damyon Wiese
5ec2ce20f5 Merge branch 'MDL-54106-master' of https://github.com/lucaboesch/moodle 2017-12-11 11:37:48 +08:00
Damyon Wiese
e82c025e60 Merge branch 'wip-MDL-31436-master' of git://github.com/marinaglancy/moodle 2017-12-11 11:27:28 +08:00
Luca Bösch
7f8773ffb8 MDL-54106 task: Deleting unconfirmed users after $CFG->deleteunconfirmed 2017-12-08 14:12:57 +01:00
Tomek Muras
aceb84ad76 MDL-60043 accesslib: improve query performance by removing ORDER BY 
then add back the minimal necessary sorting in PHP. That part was
added by Tim Hunt.
 2017-12-08 12:08:44 +00:00
Mihail Geshoski
473391b667 MDL-40790 lesson: Lesson content button runs off the edge of the page 2017-12-08 09:55:36 +08:00
Mihail Geshoski
d381732329 MDL-54021 blocks: Course completion block lang problem 2017-12-08 09:24:03 +08:00
Jake Dallimore
46878ed87f MDL-58272 core_files: get converters from file extension not mimetype 2017-12-08 09:07:29 +08:00
Matt Clarkson
1c06098b6b MDL-60976 dml: Optimise replace_all_text() 
Avoid updating fields that do not match the search string.
 2017-12-08 12:35:56 +13:00
Jun Pataleta
109aa07648 weekly release 3.5dev 2017-12-08 09:09:53 +13:00
Andrew Nicols
f017a30ff3 Merge branch 'MDL-60880-master-fix1' of http://github.com/damyon/moodle 2017-12-07 16:18:28 +08:00
Damyon Wiese
6f7daa5e48 MDL-60880 core_search: Behat fix for clean theme 
The navigation block is visible in clean so "I should not see courses" finds the link in the navigation block
 2017-12-07 15:54:03 +08:00
Jun Pataleta
4ffbf22046 Merge branch 'MDL-60951-master' of git://github.com/damyon/moodle 2017-12-07 17:33:41 +13:00
Damyon Wiese
97812f14c1 Merge branch 'MDL-60880-master' of https://github.com/sammarshallou/moodle 2017-12-06 19:53:37 +13:00
Andrew Nicols
e3b699eab7 Merge branch 'MDL-59159' of git://github.com/stronk7/moodle 2017-12-06 19:53:36 +13:00
Jun Pataleta
b908c1add2 Merge branch 'MDL-32350-master' of https://github.com/lucaboesch/moodle 2017-12-06 19:53:35 +13:00
Jun Pataleta
1396cb6346 Merge branch 'wip-MDL-60926-master' of git://github.com/marinaglancy/moodle 2017-12-06 19:53:35 +13:00
Damyon Wiese
bfb5d3ba26 Merge branch 'MDL-37933_master' of git://github.com/markn86/moodle 2017-12-06 19:53:34 +13:00
David Herney
d52e5dd32d MDL-60443 dataformat lib: Change a wrong variable name 
The variable $type really is $dataformat. I have changed it for
prevent the error and show a correct error message.
 2017-12-06 19:53:34 +13:00
Jun Pataleta
f013112752 Merge branch 'wip-MDL-34161-master' of git://github.com/marinaglancy/moodle 2017-12-06 19:53:33 +13:00
Andrew Nicols
adbe17ec68 Merge branch 'MDL-60801' of https://github.com/andrewhancox/moodle 2017-12-06 19:53:32 +13:00
Andrew Nicols
9501b1eb76 Merge branch 'MDL-60857-master' of https://github.com/sammarshallou/moodle 2017-12-06 19:53:32 +13:00
Andrew Nicols
0ea7278f64 Merge branch 'MDL-60899-master' of git://github.com/damyon/moodle 2017-12-06 19:53:31 +13:00
Damyon Wiese
a569a33097 Merge branch 'MDL-59875_m35v1' of https://github.com/sbourget/moodle 2017-12-06 19:53:31 +13:00
Jun Pataleta
1b98e553a7 Merge branch 'MDL-36056-master-fix1' of http://github.com/damyon/moodle 2017-12-06 19:53:31 +13:00
Andrew Nicols
9e51dc406f Merge branch 'MDL-47114-master' of git://github.com/rezaies/moodle 2017-12-06 19:53:30 +13:00
Damyon Wiese
387f7aae0d MDL-36056 forms: Don't validate disabled fields 
When fields are disabled, the value comes through as null so we need to specifically check for it
before validation.
 2017-12-06 19:53:30 +13:00
Andrew Nicols
ebe2fafa8b Merge branch 'wip-MDL-37757-master' of git://github.com/abgreeve/moodle 2017-12-06 19:53:29 +13:00
Damyon Wiese
3715c59ef9 MDL-60951 travis: Disable redis on travis 
Redis unit tests are currently failing on php 7.2 due to https://bugs.php.net/bug.php?id=75628
 2017-12-06 10:59:54 +08:00
sam marshall
7f9fb2c846 MDL-60880 core_search: Allow search of specific context (front-end) 2017-12-05 17:42:40 +00:00