Damyon Wiese [Tue, 16 Jul 2013 13:23:30 +0000 (21:23 +0800)]
Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 16 Jul 2013 12:59:41 +0000 (20:59 +0800)]
Merge branch 'wip-MDL-39299-master' of git://github.com/phalacee/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 09:41:47 +0000 (11:41 +0200)]
Merge branch 'w29_MDL-40563_m26_themecaching' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 07:57:34 +0000 (09:57 +0200)]
Merge branch 'MDL-40555-master' of git://github.com/FMCorz/moodle
Conflicts:
cache/stores/static/lib.php
Jason Fowler [Fri, 5 Jul 2013 01:19:08 +0000 (09:19 +0800)]
MDL-39299 - Course - Correcting some rendering problems in bootstrapbase
Damyon Wiese [Tue, 16 Jul 2013 07:44:38 +0000 (15:44 +0800)]
Merge branch 'MDL-40464-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 16 Jul 2013 07:14:49 +0000 (15:14 +0800)]
Merge branch 'wip-MDL-40638-master' of git://github.com/abgreeve/moodle
Conflicts:
version.php
Marina Glancy [Tue, 16 Jul 2013 07:07:23 +0000 (17:07 +1000)]
Merge branch 'w29_MDL-40549_m26_oacleanup' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 16 Jul 2013 07:00:46 +0000 (15:00 +0800)]
Merge branch 'MDL-40462_master' of https://github.com/markn86/moodle
Petr Škoda [Tue, 16 Jul 2013 07:00:46 +0000 (09:00 +0200)]
MDL-40549 remove last traces of oacleanup
Thanks Marina!
Damyon Wiese [Tue, 16 Jul 2013 06:49:25 +0000 (14:49 +0800)]
Merge branch 'MDL-40431_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 16 Jul 2013 06:29:59 +0000 (14:29 +0800)]
MDL-40167 tests: The dock subsystem was removed
Fix the unit test that counts the core subsystems.
Marina Glancy [Tue, 16 Jul 2013 06:10:13 +0000 (16:10 +1000)]
Merge branch 'MDL-35851-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 16 Jul 2013 02:00:44 +0000 (10:00 +0800)]
MDL-35851 lesson: removed expensive upgrade step.
Just deal with the bad data when displaying the lesson instead.
Conflicts:
mod/lesson/db/upgrade.php
Damyon Wiese [Tue, 16 Jul 2013 05:33:27 +0000 (13:33 +0800)]
Merge branch 'wip-mdl-40428' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 16 Jul 2013 05:28:52 +0000 (13:28 +0800)]
Merge branch 'MDL-40195' of git://github.com/aolley/moodle
Damyon Wiese [Tue, 16 Jul 2013 05:25:54 +0000 (13:25 +0800)]
Merge branch 'wip-MDL-40167-m26' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 16 Jul 2013 05:19:38 +0000 (15:19 +1000)]
MDL-39812 recompile less for bootstrapbase
Marina Glancy [Tue, 16 Jul 2013 04:29:24 +0000 (14:29 +1000)]
Merge branch 'MDL-39812_bootstrapbase' of git://github.com/rwijaya/moodle
Marina Glancy [Tue, 16 Jul 2013 03:48:27 +0000 (13:48 +1000)]
Merge branch 'wip-MDL-40426-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 16 Jul 2013 03:28:57 +0000 (11:28 +0800)]
Merge branch 'w29_MDL-40558_m26_guestdelete' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 16 Jul 2013 03:24:06 +0000 (11:24 +0800)]
Merge branch 'MDL-40524' of git://github.com/aolley/moodle
Marina Glancy [Tue, 16 Jul 2013 03:07:17 +0000 (13:07 +1000)]
Merge branch 'MDL-13114-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 16 Jul 2013 03:02:54 +0000 (11:02 +0800)]
Merge branch 'MDL-40538' of https://github.com/mr-russ/moodle
Marina Glancy [Tue, 16 Jul 2013 02:16:27 +0000 (12:16 +1000)]
Merge branch 'MDL-30740-master' of git://github.com/danpoltawski/moodle
Rossiani Wijaya [Thu, 20 Jun 2013 05:10:02 +0000 (13:10 +0800)]
MDL-35851 Lesson module: fix page order id for import questions. Add upgrade script to fix lesson pages corrupted links
Sam Hemelryk [Tue, 9 Jul 2013 00:18:45 +0000 (12:18 +1200)]
MDL-40555 cache: implemented unit tests for default search functionality
Eloy Lafuente (stronk7) [Mon, 15 Jul 2013 23:29:01 +0000 (01:29 +0200)]
Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges
Conflicts:
lib/db/upgrade.php
version.php
Eloy Lafuente (stronk7) [Mon, 15 Jul 2013 22:26:44 +0000 (00:26 +0200)]
Merge branch 'w29_MDL-40571_m26_adminblocks' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 15 Jul 2013 20:07:47 +0000 (22:07 +0200)]
Merge branch 'MDL-40412' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Mon, 15 Jul 2013 15:02:01 +0000 (17:02 +0200)]
Merge branch 'wip-MDL-38747-master' of https://github.com/satrun77/moodle
Damyon Wiese [Mon, 15 Jul 2013 13:22:20 +0000 (21:22 +0800)]
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.
Dan Poltawski [Mon, 15 Jul 2013 09:39:26 +0000 (17:39 +0800)]
MDL-30740 skydrive: improve repo metadata
* Add manage link
* Use realthumbnail for lazy loading images
* Add image height/width info
* Add author information to files
Dan Poltawski [Mon, 15 Jul 2013 09:26:12 +0000 (17:26 +0800)]
MDL-30740 skydrive: convert muc to defined cache
Dan Poltawski [Mon, 15 Jul 2013 09:25:17 +0000 (17:25 +0800)]
MDL-30740 Add repository_skydrive to standard plugins
Dan Poltawski [Fri, 28 Jun 2013 04:48:47 +0000 (12:48 +0800)]
MDL-30740 skydrive: bump version for core inclusion
Remove release name and maturity as these will now be inhereted from
core.
Dan Poltawski [Mon, 19 Nov 2012 16:40:47 +0000 (16:40 +0000)]
MDL-30740 skydrive: Add filepicker navigation bar
In order not to get lost in the Sky.
We use a session cache to reduce repeated calls to the skydrive API,
storing the folder name each time we get a listing.
Original concept from Ruslan Kabalin, thanks!
Ruslan Kabalin [Mon, 19 Nov 2012 16:38:39 +0000 (16:38 +0000)]
MDL-30740 skydrive: show albums as essentially they are "folders"
If you create a folder in SkyDrive and add image to it, it will be calssified
as album and, this will not be listed without this patch.
Dan Poltawski [Sun, 13 May 2012 13:42:45 +0000 (21:42 +0800)]
MDL-30740 repository: Add Microsoft Skydrive plugin
Thanks to Universidad Teconológica de Chile (INACAP) who funded this
work initially and LUNS who permitted this to be released open source so
I could continue to work on this.
Adrian Greeve [Mon, 15 Jul 2013 07:49:26 +0000 (15:49 +0800)]
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.
Marina Glancy [Mon, 15 Jul 2013 07:28:59 +0000 (17:28 +1000)]
Merge branch 'MDL-28466-oldata-remove' of git://github.com/danpoltawski/moodle
Damyon Wiese [Mon, 15 Jul 2013 07:01:39 +0000 (15:01 +0800)]
MDL-39563: Change to use $CFG consistently
Damyon Wiese [Mon, 15 Jul 2013 06:54:20 +0000 (14:54 +0800)]
Merge branch 'MDL-39563' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 15 Jul 2013 05:56:39 +0000 (13:56 +0800)]
MDL-28466 remove the enrol_authorize data
If there are no records, remove the plugin
Damyon Wiese [Mon, 15 Jul 2013 06:42:10 +0000 (14:42 +0800)]
Merge branch 'MDL-40440-m' of git://github.com/andrewnicols/moodle
Marina Glancy [Mon, 15 Jul 2013 04:41:55 +0000 (14:41 +1000)]
Merge branch 'MDL-40633' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 15 Jul 2013 03:54:24 +0000 (11:54 +0800)]
Merge branch 'wip-mdl-35131' of git://github.com/rajeshtaneja/moodle
Frederic Massart [Mon, 15 Jul 2013 03:45:34 +0000 (11:45 +0800)]
MDL-13114 tool_uploadcourse: Adding to standard plugins
Damyon Wiese [Mon, 15 Jul 2013 03:25:37 +0000 (11:25 +0800)]
Merge branch 'w29_MDL-40435_m26_componentpermissions' of https://github.com/skodak/moodle
Marina Glancy [Mon, 15 Jul 2013 03:07:37 +0000 (13:07 +1000)]
Merge branch 'MDL-28466-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Mon, 15 Jul 2013 02:58:03 +0000 (10:58 +0800)]
Merge branch 'w29_MDL-40475_m26_componentcache' of https://github.com/skodak/moodle
Marina Glancy [Mon, 15 Jul 2013 02:40:46 +0000 (12:40 +1000)]
Merge branch 'wip-MDL-39062-m26' of git://github.com/samhemelryk/moodle
Marina Glancy [Mon, 15 Jul 2013 02:25:23 +0000 (12:25 +1000)]
Merge branch 'wip-MDL-40650-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 15 Jul 2013 02:15:16 +0000 (10:15 +0800)]
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!
Dan Poltawski [Fri, 5 Jul 2013 07:21:43 +0000 (15:21 +0800)]
MDL-28466 remove enrol_authorize from standard list of plugins
Dan Poltawski [Fri, 5 Jul 2013 06:11:47 +0000 (14:11 +0800)]
MDL-28466 Remove enrol_authorize - this code is dead
It does not work and its not maintained.
Frederic Massart [Mon, 15 Jul 2013 02:02:48 +0000 (10:02 +0800)]
MDL-13114 tool_uploadcourse: Removing use of deprecated get_plugin_list()
Frederic Massart [Thu, 11 Jul 2013 02:13:18 +0000 (10:13 +0800)]
MDL-13114 tool_uploadcourse: Removing summary from mandatory fields
Frederic Massart [Tue, 9 Jul 2013 08:34:31 +0000 (16:34 +0800)]
MDL-13114 tool_uploadcourse: Clean up after scheck scan
Frederic Massart [Tue, 9 Jul 2013 05:34:14 +0000 (13:34 +0800)]
MDL-13114 tool_uploadcourse: Simple Behat tests for create and update
Frederic Massart [Tue, 9 Jul 2013 03:38:11 +0000 (11:38 +0800)]
MDL-13114 tool_uploadcourse: Better Unit Test coverage
Frederic Massart [Mon, 8 Jul 2013 10:15:17 +0000 (18:15 +0800)]
MDL-13114 tool_uploadcourse: Helper uses MUC for caching
Frederic Massart [Tue, 2 Jul 2013 05:58:44 +0000 (13:58 +0800)]
MDL-13114 tool_uploadcourse: Clean up
Frederic Massart [Tue, 2 Jul 2013 03:27:57 +0000 (11:27 +0800)]
MDL-13114 tool_uploadcourse: Optimised the import form
Frederic Massart [Mon, 1 Jul 2013 10:03:19 +0000 (18:03 +0800)]
MDL-13114 tool_uploadcourse: Web UI uses the new classes
Frederic Massart [Mon, 1 Jul 2013 07:59:35 +0000 (15:59 +0800)]
MDL-13114 tool_uploadcourse: Use autoload and clean require_once
Frederic Massart [Mon, 1 Jul 2013 07:54:42 +0000 (15:54 +0800)]
MDL-13114 tool_uploadcourse: CLI uses new classes
Frederic Massart [Mon, 1 Jul 2013 05:55:22 +0000 (13:55 +0800)]
MDL-13114 tool_uploadcourse: Output tracker in place
Frederic Massart [Mon, 1 Jul 2013 05:47:50 +0000 (13:47 +0800)]
MDL-13114 tool_uploadcourse: ID number errors handling
Frederic Massart [Mon, 1 Jul 2013 03:00:14 +0000 (11:00 +0800)]
MDL-13114 tool_uploadcourse: Renaming OUTCOME to DO
Frederic Massart [Mon, 1 Jul 2013 02:42:53 +0000 (10:42 +0800)]
MDL-13114 tool_uploadcourse: Introducing output tracker
Frederic Massart [Mon, 1 Jul 2013 01:51:34 +0000 (09:51 +0800)]
MDL-13114 tool_uploadcourse: Ensure category is properly resolved
Frederic Massart [Thu, 27 Jun 2013 04:52:24 +0000 (12:52 +0800)]
MDL-13114 tool_uploadcourse: Improving the error reporting
Frederic Massart [Fri, 21 Jun 2013 09:11:41 +0000 (17:11 +0800)]
MDL-13114 tool_uploadcourse: Unit tests for introduced classes
Frederic Massart [Fri, 21 Jun 2013 09:11:29 +0000 (17:11 +0800)]
MDL-13114 tool_uploadcourse: Classes for course importation
Piers Harding [Tue, 18 Jun 2013 07:12:09 +0000 (15:12 +0800)]
MDL-13114 tool_uploadcourse: Initial commit
Damyon Wiese [Mon, 15 Jul 2013 01:55:44 +0000 (09:55 +0800)]
Merge branch 'wip-MDL-40658-master' of git://github.com/marinaglancy/moodle
Adrian Greeve [Mon, 15 Jul 2013 01:54:02 +0000 (09:54 +0800)]
MDL-40650 - workshop: Fixed fatal error in workshop cron.
Line 246 was missing a semicolon at the end and this was causing
errors.
Marina Glancy [Mon, 15 Jul 2013 01:49:54 +0000 (11:49 +1000)]
MDL-40658 Include tinymce_pdw and tinymce_wrap in the list of standard plugins
Sam Hemelryk [Sun, 14 Jul 2013 23:30:24 +0000 (11:30 +1200)]
MDL-39062 cache: version bump to update definitions
Sam Hemelryk [Sun, 5 May 2013 22:35:17 +0000 (10:35 +1200)]
MDL-39062 cache: persist keys now set properly
Sam Hemelryk [Mon, 8 Jul 2013 23:56:22 +0000 (11:56 +1200)]
MDL-40167 dock: tidied up className attribute
Sam Hemelryk [Fri, 5 Jul 2013 03:44:23 +0000 (15:44 +1200)]
MDL-40167 dock: tidy up after first peer-review
Sam Hemelryk [Thu, 20 Jun 2013 06:12:28 +0000 (18:12 +1200)]
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.
Petr Škoda [Sat, 13 Jul 2013 17:25:17 +0000 (19:25 +0200)]
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…
Petr Škoda [Sat, 13 Jul 2013 14:10:17 +0000 (16:10 +0200)]
MDL-40435 allow 0 as valid directory permission when using ACL
Petr Škoda [Wed, 10 Jul 2013 07:33:25 +0000 (09:33 +0200)]
MDL-40435 detect permission setting problems in core_component
Petr Škoda [Fri, 12 Jul 2013 21:25:45 +0000 (23:25 +0200)]
MDL-40563 fix race condition in debug styles when purging caches
Petr Škoda [Fri, 12 Jul 2013 21:25:00 +0000 (23:25 +0200)]
MDL-40563 use revisions for theme css cache files and fix potential race condition
Petr Škoda [Fri, 12 Jul 2013 21:17:22 +0000 (23:17 +0200)]
MDL-40563 use revisions for theme js cache files
Petr Škoda [Fri, 12 Jul 2013 20:57:32 +0000 (22:57 +0200)]
MDL-40563 use revisions for theme image cache files
Petr Škoda [Fri, 12 Jul 2013 20:38:56 +0000 (22:38 +0200)]
MDL-40563 improve jquery serving performance
It is not necessary to do full page init to access the plugin locations API.
Petr Škoda [Fri, 12 Jul 2013 20:34:12 +0000 (22:34 +0200)]
MDL-40563 improve yui serving performance
It is not necessary to do full page init to access the plugin locations API.
Petr Škoda [Tue, 9 Jul 2013 05:37:35 +0000 (07:37 +0200)]
MDL-40571 work around block editing hacks on admin page
Petr Škoda [Thu, 4 Jul 2013 17:09:21 +0000 (19:09 +0200)]
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.
Tim Hunt [Fri, 12 Jul 2013 10:41:12 +0000 (11:41 +0100)]
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.
Petr Škoda [Tue, 9 Jul 2013 08:14:37 +0000 (10:14 +0200)]
MDL-40549 remove unused legacy assignment upgrade tool
Petr Škoda [Mon, 8 Jul 2013 09:21:42 +0000 (11:21 +0200)]
MDL-40558 skip admins and guest when deleting incomplete users
Petr Škoda [Tue, 9 Jul 2013 06:04:20 +0000 (08:04 +0200)]
MDL-40569 fix empty CSS files after cache purging
Petr Škoda [Tue, 9 Jul 2013 06:42:41 +0000 (08:42 +0200)]
MDL-40574 remove forgotten $delete from editor subplugins page