Damyon Wiese
b30a12db52
Merge branch 'wip-MDL-40621-master' of git://github.com/marinaglancy/moodle
2013-07-16 21:29:58 +08:00
Damyon Wiese
59e649180d
Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle
2013-07-16 21:23:30 +08:00
Damyon Wiese
259e3c2525
Merge branch 'MDL-40464-master' of git://github.com/ankitagarwal/moodle
2013-07-16 15:44:38 +08:00
Damyon Wiese
924ea4845a
Merge branch 'wip-MDL-40638-master' of git://github.com/abgreeve/moodle
...
Conflicts:
version.php
2013-07-16 15:14:49 +08:00
Marina Glancy
3e2b5734dd
Merge branch 'w29_MDL-40549_m26_oacleanup' of https://github.com/skodak/moodle
2013-07-16 17:07:23 +10:00
Damyon Wiese
06c8b60936
Merge branch 'MDL-40462_master' of https://github.com/markn86/moodle
2013-07-16 15:00:46 +08:00
Damyon Wiese
ed9e492087
Merge branch 'MDL-40431_master' of https://github.com/markn86/moodle
2013-07-16 14:49:25 +08:00
Damyon Wiese
792522198a
MDL-40167 tests: The dock subsystem was removed
...
Fix the unit test that counts the core subsystems.
2013-07-16 14:29:59 +08:00
Damyon Wiese
d981272e64
Merge branch 'wip-mdl-40428' of git://github.com/rajeshtaneja/moodle
2013-07-16 13:33:27 +08:00
Damyon Wiese
6ec1f2f2eb
Merge branch 'wip-MDL-40167-m26' of git://github.com/samhemelryk/moodle
2013-07-16 13:25:54 +08:00
Marina Glancy
792e6059be
Merge branch 'wip-MDL-40426-master' of git://github.com/abgreeve/moodle
2013-07-16 13:48:27 +10:00
Damyon Wiese
8eb3e1f94f
Merge branch 'w29_MDL-40558_m26_guestdelete' of https://github.com/skodak/moodle
2013-07-16 11:28:57 +08:00
Marina Glancy
ff2ca3ef3d
Merge branch 'MDL-13114-master' of git://github.com/FMCorz/moodle
2013-07-16 13:07:17 +10:00
Marina Glancy
50d1d9949b
Merge branch 'MDL-30740-master' of git://github.com/danpoltawski/moodle
2013-07-16 12:16:27 +10:00
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
Damyon Wiese
7ce7bb538c
Revert "MDL-35131 Caching: Purge all will clear course modinfo cache - Thanks to Thomas for patch"
...
This reverts commit 6ab62db65c
.
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
9af02a3b36
MDL-40121 Added format_singleactivity in standard package
2013-07-15 21:42:04 +10:00
Dan Poltawski
562525dcc9
MDL-30740 Add repository_skydrive to standard plugins
2013-07-15 17:57:43 +08:00
Adrian Greeve
7809d1557c
MDL-40638 - Administration: Update of version number to avoid alternate name fields breaking before upgrade.
...
With the alteration of the user table to include the new alternate name fields anyone
upgrading from one version to another will receive errors until they run the upgrade.
Forcing a redirect if major version upgrade will bypass this issue.
2013-07-15 15:49:26 +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
fff9752d2a
Merge branch 'wip-mdl-35131' of git://github.com/rajeshtaneja/moodle
2013-07-15 11:54:24 +08:00
Frederic Massart
c122e7845d
MDL-13114 tool_uploadcourse: Adding to standard plugins
2013-07-15 11:45:34 +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
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
Damyon Wiese
5034db3e9f
Merge branch 'wip-MDL-40658-master' of git://github.com/marinaglancy/moodle
2013-07-15 09:55:44 +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
10aabcb221
MDL-39062 cache: persist keys now set properly
2013-07-15 11:24:19 +12:00
Sam Hemelryk
b69a3f1ceb
MDL-39814 html_writer: Remove superfluous new lines from html_writer::alist
2013-07-15 10:24:05 +12:00
Sam Hemelryk
61b223a632
MDL-40635 moodle_url: can now set anchor during construction
2013-07-15 10:17:49 +12:00
Sam Hemelryk
a783d21066
MDL-40167 dock: tidied up className attribute
2013-07-15 09:46:03 +12:00
Sam Hemelryk
a69a7e89b8
MDL-40167 dock: tidy up after first peer-review
2013-07-15 09:46:03 +12:00
Sam Hemelryk
84192d7836
MDL-40167 dock: converted the dock JS to a YUI shifted module.
...
The patch converts the dock into a YUI shifter module and at
the same time improves several aspects of its operation.
The features of this patch include:
* Dock Module conversion.
* A loader that ensures we don't include the dock JS or its
requirements unless actually required.
* We no longer include the dock JS for themes that don't
enable it.
* Blocks no longer add registration events to the page
instead a dockable attribute is added to the html and the
loader looks for that.
* The dock module is properly documented and running YUIDoc
gives good quality documentation.
* We no longer need the dock module registration or
subcomponent.
* All events that can be delegated are now delegated.
* Removed unused variables and code left over after fixes.
* Support for docking blocks renderered using the new blocks
render method. Better support for custom block regions.
2013-07-15 09:46:03 +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
701b063791
MDL-40611 fix context cache size expectation
2013-07-13 15:37:31 +02:00
Petr Škoda
ff74627e62
MDL-40546 send proper caching headers when $CFG->cachejs = 0
...
This should help developers writing old style JS that is served via lib/javascript.php.
2013-07-12 22:22:56 +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
Petr Škoda
72e3a3c9cd
MDL-40549 remove unused legacy assignment upgrade tool
2013-07-12 12:40:55 +02:00
Petr Škoda
98aa874617
MDL-40558 skip admins and guest when deleting incomplete users
2013-07-12 12:36:57 +02:00
Petr Škoda
23ee749bfb
MDL-40569 fix empty CSS files after cache purging
2013-07-12 12:34:05 +02:00
Petr Škoda
485392f308
MDL-40574 remove forgotten $delete from editor subplugins page
2013-07-12 12:33:05 +02:00
David Monllao
8aea365f05
MDL-40315 behat: Performance improvement
...
We look for exceptions after each step, this patch
includes a pre-checking query to avoid multiple queries
for each step when most of the time they are not necessary.
2013-07-12 12:16:18 +02:00
Frederic Massart
2e4c0c9181
MDL-40424 libraries: Deprecate context_instance_preload_sql()
2013-07-12 17:41:49 +08:00