mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-10 10:58:38 +01:00
Code Issues Projects Releases Wiki Activity
62,227 Commits 36 Branches 523 Tags
Commit Graph

62227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
e780e5cb8f Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-07-16 01:29:01 +02:00
Eloy Lafuente (stronk7)
adbdb9b5c7 Merge branch 'w29_MDL-40571_m26_adminblocks' of https://github.com/skodak/moodle 2013-07-16 00:26:44 +02:00
Eloy Lafuente (stronk7)
88e4c0848a Merge branch 'MDL-40412' of git://github.com/merrill-oakland/moodle 2013-07-15 22:07:47 +02:00
Eloy Lafuente (stronk7)
37aa0545a1 Merge branch 'wip-MDL-38747-master' of https://github.com/satrun77/moodle 2013-07-15 17:02:01 +02:00
Damyon Wiese
7ce7bb538c Revert "MDL-35131 Caching: Purge all will clear course modinfo cache - Thanks to Thomas for patch" 
This reverts commit 6ab62db65ca1719acdbf13d74756d20dbd987d1b.

This is breaking upgrades from 22 - purgeallcaches gets called during upgrade but
rebuild_course_caches is not a safe api to use in this case.
 2013-07-15 21:24:07 +08:00
Marina Glancy
73221dbdfe Merge branch 'MDL-28466-oldata-remove' of git://github.com/danpoltawski/moodle 2013-07-15 17:28:59 +10:00
Damyon Wiese
44b3927b70 MDL-39563: Change to use $CFG consistently 2013-07-15 15:01:39 +08:00
Damyon Wiese
4d4b938fa3 Merge branch 'MDL-39563' of git://github.com/jleyva/moodle 2013-07-15 14:54:20 +08:00
Dan Poltawski
c2ca2d8e91 MDL-28466 remove the enrol_authorize data 
If there are no records, remove the plugin
 2013-07-15 14:48:23 +08:00
Damyon Wiese
d7bf5fd1f7 Merge branch 'MDL-40440-m' of git://github.com/andrewnicols/moodle 2013-07-15 14:42:10 +08:00
Marina Glancy
5710055d41 Merge branch 'MDL-40633' of git://github.com/timhunt/moodle 2013-07-15 14:41:55 +10:00
Damyon Wiese
fff9752d2a Merge branch 'wip-mdl-35131' of git://github.com/rajeshtaneja/moodle 2013-07-15 11:54:24 +08:00
Damyon Wiese
c49fea3be5 Merge branch 'w29_MDL-40435_m26_componentpermissions' of https://github.com/skodak/moodle 2013-07-15 11:25:37 +08:00
Marina Glancy
3fd0ea3c1e Merge branch 'MDL-28466-master' of git://github.com/danpoltawski/moodle 2013-07-15 13:07:37 +10:00
Damyon Wiese
527b24b104 Merge branch 'w29_MDL-40475_m26_componentcache' of https://github.com/skodak/moodle 2013-07-15 10:58:03 +08:00
Marina Glancy
918cc26541 Merge branch 'wip-MDL-39062-m26' of git://github.com/samhemelryk/moodle 2013-07-15 12:40:46 +10:00
Marina Glancy
78eca0fc3c Merge branch 'wip-MDL-40650-master' of git://github.com/abgreeve/moodle 2013-07-15 12:25:23 +10:00
Dan Poltawski
fdb0dfe7c0 MDL-28466 pluginlib: Add enrol_authorize as standard deleted plugin 
This means we won't bother our users about it in the plugin list

thanks Marina for picking it up!
 2013-07-15 10:25:22 +08:00
Dan Poltawski
317638a3d6 MDL-28466 remove enrol_authorize from standard list of plugins 2013-07-15 10:25:22 +08:00
Dan Poltawski
c06a812ed6 MDL-28466 Remove enrol_authorize - this code is dead 
It does not work and its not maintained.
 2013-07-15 10:25:13 +08:00
Damyon Wiese
5034db3e9f Merge branch 'wip-MDL-40658-master' of git://github.com/marinaglancy/moodle 2013-07-15 09:55:44 +08:00
Adrian Greeve
07d807ac24 MDL-40650 - workshop: Fixed fatal error in workshop cron. 
Line 246 was missing a semicolon at the end and this was causing
errors.
 2013-07-15 09:54:02 +08:00
Marina Glancy
929a0ddd73 MDL-40658 Include tinymce_pdw and tinymce_wrap in the list of standard plugins 2013-07-15 11:49:54 +10:00
Sam Hemelryk
72f968dbee MDL-39062 cache: version bump to update definitions 2013-07-15 11:30:24 +12:00
Sam Hemelryk
10aabcb221 MDL-39062 cache: persist keys now set properly 2013-07-15 11:24:19 +12:00
Petr Škoda
abb043c3a1 MDL-40435 require MOODLE_INTERNAL in core_component 
We need to include db/subplugins.php when building core_component cache,
there are some MOODLE_INTERNALs there…
 2013-07-13 19:25:17 +02:00
Petr Škoda
862a16700d MDL-40435 allow 0 as valid directory permission when using ACL 2013-07-13 16:10:17 +02:00
Petr Škoda
766e04f38a MDL-40435 detect permission setting problems in core_component 2013-07-13 16:08:50 +02:00
Petr Škoda
bf8c71b7fd MDL-40571 work around block editing hacks on admin page 2013-07-12 14:58:57 +02:00
Petr Škoda
d7245e3400 MDL-40475 add alternative component cache location and other improvements 
Improvements include:
* Alternative location might be useful when server administrator wants to maintain
  a local copy of component cache instead of using shared $CFG->cachedir.
* Component caching is now enabled in behat tests which should improve performance.
* Standardised ignoring of component caching.
* Fixed debug mode in ABORT_AFTER_CONFIG scripts.
* General documentation improvements.
 2013-07-12 13:05:41 +02:00
Tim Hunt
e93cdb6915 MDL-40633 filter_urltolink breaking some image links. 
This was a regression caused by MDL-22390. HTML like
<img src="http://www.example.com/logo.gif" />
was being broken.
 2013-07-12 11:41:12 +01:00
Petr Škoda
23ee749bfb MDL-40569 fix empty CSS files after cache purging 2013-07-12 12:34:05 +02:00
Mohamed Alsharaf
dbebd5966f MDL-38747 blocks: course format options 'numsections' is required to display the block 2013-07-12 20:19:49 +12:00
Damyon Wiese
07bbbcf174 weekly release 2.6dev 2013-07-12 09:46:52 +08:00
Damyon Wiese
779545e7fd Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-07-12 09:41:55 +08:00
AMOS bot
ebd69f7abe Automatically generated installer lang files 2013-07-12 00:45:55 +00:00
Juan Leyva
9184d44ded MDL-39563 Fixing mobilecssurl is not being returned in WebService, phpunit tests 2013-07-11 16:25:17 +02:00
David Monllao
3e6899989a MDL-39815 mod_glossary: Fixing behat test 2013-07-11 09:36:32 +02:00
Frederic Massart
cfba97e9a5 MDL-40369 theme: Renaming Afterburner i/roles to i/assignroles 2013-07-11 15:59:31 +10:00
Marina Glancy
bf50508f06 MDL-37565 fixed PDW plugin to calculate number of button rows 2013-07-11 14:47:58 +10:00
Marina Glancy
51230ba88e Merge branch 'wip-MDL-31776-master-alternatenamesfix' of git://github.com/abgreeve/moodle 2013-07-10 20:16:21 +10:00
Adrian Greeve
12b4487ef3 MDL-31776 - lib: Alternate name fields - update of gradebook sql query. 2013-07-10 17:41:06 +08:00
Rajesh Taneja
117e94a050 MDL-40358 Enrolments: Fixed sql when user is suspended 2013-07-10 17:40:20 +10:00
Adrian Greeve
38dff99e64 MDL-31776 - lib: Alternate name fields - fixed up user object in question code. 2013-07-10 15:28:27 +08:00
Adrian Greeve
ec71acb798 MDL-31776 - lib: mod/forums - Fixed discussion sql query. 2013-07-10 15:26:05 +08:00
Marina Glancy
cb88ffb698 Merge branch 'MDL-38366-master' of git://github.com/FMCorz/moodle 2013-07-10 16:22:38 +10:00
Frederic Massart
c122f484c5 MDL-38366 repository_filesystem: Prevent use of empty subdir 2013-07-10 14:03:46 +08:00
Frederic Massart
a76efbcac8 MDL-38366 repository: get_option() returns proper values 
Previously, even when a specific setting had to be returned, this method
would return an empty array. Now, the behaviour is the same whether
some options or none are set: if the requested setting is not found
null is returned.
 2013-07-10 14:03:46 +08:00
Sam Hemelryk
858fc79db8 MDL-40368 tool_capability: fixed regression marking single result selected 2013-07-10 16:23:46 +12:00
Jamie Pratt
76149901a9 MDL-40449 use data generator to create random qs 2013-07-10 15:45:45 +12:00