Damyon Wiese [Fri, 22 Mar 2013 05:38:50 +0000 (13:38 +0800)]
weekly release 2.5dev
Damyon Wiese [Fri, 22 Mar 2013 05:35:24 +0000 (13:35 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
David Monllao [Thu, 21 Mar 2013 02:42:24 +0000 (10:42 +0800)]
MDL-38414_master behat: Changing expand fieldsets test to forum form
AMOS bot [Thu, 21 Mar 2013 00:37:26 +0000 (00:37 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 20 Mar 2013 16:06:22 +0000 (17:06 +0100)]
Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle
sam marshall [Wed, 20 Mar 2013 14:05:36 +0000 (14:05 +0000)]
MDL-38035 Conditional availability: Support multilang custom user fields
David Monllao [Wed, 20 Mar 2013 07:45:00 +0000 (15:45 +0800)]
MDL-38364 phpunit: PHPUnit autoload uses capital A
Damyon Wiese [Wed, 20 Mar 2013 06:08:55 +0000 (14:08 +0800)]
Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle
Conflicts:
lib/db/caches.php
version.php
Damyon Wiese [Wed, 20 Mar 2013 05:24:18 +0000 (13:24 +0800)]
Merge branch 'wip-MDL-38387-m25' of https://github.com/samhemelryk/moodle
Damyon Wiese [Wed, 20 Mar 2013 04:32:29 +0000 (12:32 +0800)]
MDL-38373 Auth - Additional strict warning fix for radius authentication
Sam Hemelryk [Wed, 20 Mar 2013 03:06:07 +0000 (16:06 +1300)]
MDL-38387 cache: removed call to plugins API from cache API
Sam Hemelryk [Wed, 20 Mar 2013 01:02:20 +0000 (14:02 +1300)]
MDL-38350 cache: fixed issue with siteidentifier === false
Sam Hemelryk [Fri, 8 Mar 2013 01:07:13 +0000 (14:07 +1300)]
MDL-38387 cache: fixed inifinite initialisation loop with site id
Damyon Wiese [Wed, 20 Mar 2013 03:05:38 +0000 (11:05 +0800)]
Merge branch 'MDL-38373' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Wed, 20 Mar 2013 00:47:52 +0000 (01:47 +0100)]
Merge branch 'MDL-38470-m' of https://github.com/andrewnicols/moodle
Andrew Robert Nicols [Thu, 14 Mar 2013 00:18:37 +0000 (00:18 +0000)]
MDL-38470 JavaScript: Rebuild moodle-core-tooltip with Shifter
Eloy Lafuente (stronk7) [Wed, 20 Mar 2013 00:21:05 +0000 (01:21 +0100)]
Merge branch 'MDL-38414-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 20 Mar 2013 00:19:17 +0000 (01:19 +0100)]
Merge branch 'MDL-38330-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 20 Mar 2013 00:02:45 +0000 (01:02 +0100)]
MDL-38515 JavaScript: Partially revert
4f65d03b08
It was going to cause some continuous logging in the console
annoying developers on 2.5 all the time. It may be reintroduced
once filepickers are converted to proper YUI modules.
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:55:32 +0000 (00:55 +0100)]
Revert "MDL-38515 JavaScript: Correct module dependencies for core_filepicker"
This reverts commit
babf34d5cfc7845e8f42b850a39646bf9a9c17c3.
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:43:09 +0000 (00:43 +0100)]
Merge branch 'MDL-38490' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:34:52 +0000 (00:34 +0100)]
Merge branch 'MDL-38416-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:30:49 +0000 (00:30 +0100)]
Merge branch 'MDL-38370-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:17:35 +0000 (00:17 +0100)]
Merge branch 'w12_MDL-38364_m25_phpunitloading' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:13:51 +0000 (00:13 +0100)]
Merge branch 'MDL-38166-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:09:43 +0000 (00:09 +0100)]
MDL-38035 api: doc get_condition_user_fields() new param.
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:54:27 +0000 (23:54 +0100)]
Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:31:21 +0000 (23:31 +0100)]
Merge branch 'MDL-37664-master' of https://github.com/lucisgit/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:27:50 +0000 (23:27 +0100)]
Merge branch 'MDL-38433_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:26:01 +0000 (23:26 +0100)]
Merge branch 'MDL-38411_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:20:31 +0000 (23:20 +0100)]
Merge branch 'MDL-38410_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:17:39 +0000 (23:17 +0100)]
Merge branch 'MDL-38424_master' of git://github.com/kordan/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:15:04 +0000 (23:15 +0100)]
Merge branch 'MDL-38418-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:06:06 +0000 (23:06 +0100)]
Merge branch 'MDL-38395' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 20:02:48 +0000 (21:02 +0100)]
Merge branch 'MDL-38363' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 20:00:21 +0000 (21:00 +0100)]
Merge branch 'MDL-38355' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 18:15:09 +0000 (19:15 +0100)]
Merge branch 'w12_MDL-38558_m25_preupgrade' of git://github.com/skodak/moodle
Petr Škoda [Tue, 19 Mar 2013 17:48:38 +0000 (18:48 +0100)]
MDL-38558 add preupgrade script support
This is intended things like undoing of local hacks, it is similar to older pre 2.0 upgrade hack.
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 17:47:39 +0000 (18:47 +0100)]
Merge branch 'MDL-38388' of git://github.com/jonof/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 17:27:57 +0000 (18:27 +0100)]
Merge branch 'MDL-33680-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 17:20:47 +0000 (18:20 +0100)]
Merge branch 'MDL-38412' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 17:17:11 +0000 (18:17 +0100)]
Merge branch 'w12_MDL-38329_m25_webkit' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 16:58:55 +0000 (17:58 +0100)]
Merge branch 'w12_MDL-38180_m25_enrolpics' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 16:16:32 +0000 (17:16 +0100)]
Merge branch 'MDL-38497-admintree-beforesibling' of git://github.com/mudrd8mz/moodle
Conflicts:
lib/upgrade.txt
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 15:51:45 +0000 (16:51 +0100)]
Merge branch 'w12_MDL-38202_m25_loginas' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 15:48:37 +0000 (16:48 +0100)]
Merge branch 'MDL-38542' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 15:33:28 +0000 (16:33 +0100)]
Merge branch 'MDL-38444' of https://github.com/ppichet/moodle
Tim Hunt [Tue, 19 Mar 2013 13:40:51 +0000 (13:40 +0000)]
MDL-38542 shortanswer qtype: was broken for responses of '0'.
This was a regression caused by MDL-37157 & MDL-37746.
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 12:31:46 +0000 (13:31 +0100)]
Merge branch 'MDL-38507-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 12:22:50 +0000 (13:22 +0100)]
Merge branch 'w12_MDL-38319_m25_roleperf' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 12:21:17 +0000 (13:21 +0100)]
Bump (to better detect other issues incrementing it)
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 12:17:51 +0000 (13:17 +0100)]
Merge branch 'MDL-38391-m' of git://github.com/andrewnicols/moodle
Andrew Robert Nicols [Tue, 19 Mar 2013 12:09:43 +0000 (12:09 +0000)]
MDL-38391 lib: Add missing string for YUI cachedef
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 11:51:47 +0000 (12:51 +0100)]
Merge branch 'MDL-38515-m' of git://github.com/andrewnicols/moodle
Andrew Robert Nicols [Sat, 16 Mar 2013 20:45:02 +0000 (20:45 +0000)]
MDL-38515 JavaScript: Correct module dependencies for core_filepicker
Andrew Robert Nicols [Sat, 16 Mar 2013 20:42:55 +0000 (20:42 +0000)]
MDL-38515 JavaScript: Detect use of invalid module names in YUI dependencies
A warning is shown in the browser console if debugging is set, but it is
not possible to return from the configFn and stop the module load attempt
from continuing.
The error is caught and an additional error is shown by yui_combo.php
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 11:34:45 +0000 (12:34 +0100)]
Merge branch 'MDL-38391-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 11:28:01 +0000 (12:28 +0100)]
Merge branch 'MDL-38397' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 09:24:23 +0000 (10:24 +0100)]
Merge branch 'wip-mdl-38431' of git://github.com/rajeshtaneja/moodle
David Monllao [Tue, 12 Mar 2013 03:18:16 +0000 (11:18 +0800)]
MDL-38411 behat: New test
David Monllao [Tue, 12 Mar 2013 03:56:14 +0000 (11:56 +0800)]
MDL-38433 behat: New tests
According to MDLQA-48
David Monllao [Tue, 12 Mar 2013 03:00:54 +0000 (11:00 +0800)]
MDL-38410 behat: Adding basic step and test for mod_choice
David Monllao [Tue, 12 Mar 2013 02:54:57 +0000 (10:54 +0800)]
MDL-38410 behat: Adding new form fields
David Monllao [Tue, 12 Mar 2013 02:54:25 +0000 (10:54 +0800)]
MDL-38410 behat: Step to select from radio inputs
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 08:36:43 +0000 (09:36 +0100)]
Merge branch 'MDL-36872-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 19 Mar 2013 08:17:41 +0000 (16:17 +0800)]
Merge branch 'MDL-38368-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 19 Mar 2013 07:59:41 +0000 (15:59 +0800)]
MDL-30790 folder : Whitespace fixes
Damyon Wiese [Tue, 19 Mar 2013 07:47:35 +0000 (15:47 +0800)]
Merge branch 'MDL-30790_25' of git://github.com/rlorenzo/moodle
Damyon Wiese [Tue, 19 Mar 2013 07:18:13 +0000 (15:18 +0800)]
Merge branch 'wip-mdl-36395-m' of git://github.com/rajeshtaneja/moodle
Conflicts:
version.php
Damyon Wiese [Tue, 19 Mar 2013 07:01:02 +0000 (15:01 +0800)]
Merge branch 'w12_MDL-38320_m25_logininfo' of git://github.com/skodak/moodle
Damyon Wiese [Tue, 19 Mar 2013 06:54:40 +0000 (14:54 +0800)]
Merge branch 'MDL-37959-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/formslib.php
Damyon Wiese [Tue, 19 Mar 2013 06:36:43 +0000 (14:36 +0800)]
Merge branch 'MDL-38426_dnd_plain_text' of git://github.com/davosmith/moodle
Damyon Wiese [Tue, 19 Mar 2013 06:02:23 +0000 (14:02 +0800)]
Merge branch 'MDL-38456-mdeploy-paths' of git://github.com/mudrd8mz/moodle
Damyon Wiese [Tue, 19 Mar 2013 05:03:11 +0000 (13:03 +0800)]
MDL-37079 Course create/update module. Remove use of "continue 2".
Damyon Wiese [Tue, 19 Mar 2013 04:15:48 +0000 (12:15 +0800)]
Merge branch 'MDL-38453-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 19 Mar 2013 03:52:51 +0000 (11:52 +0800)]
Merge branch 'MDL-38049-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 19 Mar 2013 03:20:39 +0000 (11:20 +0800)]
MDL-37079 Course create/update module. Fix indenting, some comment formatting and whitespace.
Damyon Wiese [Tue, 19 Mar 2013 03:13:23 +0000 (11:13 +0800)]
Merge branch 'MDL-37079-master2' of git://github.com/mouneyrac/moodle
Damyon Wiese [Tue, 19 Mar 2013 01:55:39 +0000 (09:55 +0800)]
MDL-38367 Course dnduploadlib : deprecated add_* functions as they are internal to the class.
Damyon Wiese [Tue, 19 Mar 2013 01:31:07 +0000 (09:31 +0800)]
Merge branch 'MDL-38367_dnd_ui_improvements' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 00:46:11 +0000 (01:46 +0100)]
Merge branch 'MDL-38524_master' of git://github.com/dmonllao/moodle
Andrew Robert Nicols [Mon, 18 Mar 2013 23:52:39 +0000 (23:52 +0000)]
MDL-38391 lib: Also include core subsystems in YUI_config.modules
Andrew Robert Nicols [Mon, 18 Mar 2013 23:29:57 +0000 (23:29 +0000)]
MDL-38391 lib: Rename moodle_metadata adder
This is a bit of a grey area. This function does not get and return a value
to the caller, and does not set a value taken from the caller. Instead it
gets a value from get_moodle_metadata and adds it to the current instance
of YUI_config. This rename will hopefully improve clarity here.
Andrew Robert Nicols [Mon, 18 Mar 2013 23:16:59 +0000 (23:16 +0000)]
MDL-38391 lib: Add note about use of camelCase variables names in YUI_config
Andrew Robert Nicols [Mon, 18 Mar 2013 23:13:12 +0000 (23:13 +0000)]
MDL-38391 lib: Remove clearing of YUI MUC cache on cache purge
purge_all_caches() handles clearing of all MUC caches so we don't need to
additionally clear the cache here too.
Eloy Lafuente (stronk7) [Mon, 18 Mar 2013 22:56:34 +0000 (23:56 +0100)]
Merge branch 'w12_MDL-36198_m25_yuireset' of git://github.com/skodak/moodle
Davo Smith [Mon, 18 Mar 2013 18:47:04 +0000 (18:47 +0000)]
MDL-38367 course dndupload - deprecate public 'add_type' function, remove non-YUI3 API call to _node
David Monllao [Mon, 18 Mar 2013 08:32:13 +0000 (16:32 +0800)]
MDL-38524 behat: Using wildcard instead of hardcoded version
Jerome Mouneyrac [Mon, 18 Mar 2013 08:08:52 +0000 (16:08 +0800)]
MDL-37079 missed one modedit.php change since started to work on the issue
Jerome Mouneyrac [Fri, 15 Mar 2013 09:45:56 +0000 (17:45 +0800)]
MDL-37079 switch the modedit.php functions into course/modedit.php
Jerome Mouneyrac [Tue, 22 Jan 2013 06:03:48 +0000 (14:03 +0800)]
MDL-37079 remove TODO, add . in comments
Jerome Mouneyrac [Tue, 22 Jan 2013 02:52:47 +0000 (10:52 +0800)]
MDL-37079 Added many assertEquals + generic test function (easy to test new module) + now process next advanced grading screens
Jerome Mouneyrac [Wed, 2 Jan 2013 05:58:42 +0000 (13:58 +0800)]
MDL-37079 create/update_module()
Damyon Wiese [Mon, 18 Mar 2013 06:11:09 +0000 (14:11 +0800)]
MDL-38005 formslib: Removing additional duplicate headers in calculated question form.
Damyon Wiese [Mon, 18 Mar 2013 05:45:41 +0000 (13:45 +0800)]
Merge branch 'MDL-38005-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 18 Mar 2013 05:24:45 +0000 (13:24 +0800)]
Merge branch 'MDL-38340-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 18 Mar 2013 05:08:41 +0000 (13:08 +0800)]
Merge branch 'MDL-38435-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 18 Mar 2013 03:41:00 +0000 (11:41 +0800)]
Merge branch 'MDL-38215-workshop-oracle' of git://github.com/mudrd8mz/moodle
Petr Škoda [Sun, 17 Mar 2013 21:21:27 +0000 (22:21 +0100)]
MDL-38180 do not add links for enrol and other users candidates
Petr Škoda [Sun, 17 Mar 2013 20:13:28 +0000 (21:13 +0100)]
MDL-38320 fix role name display when roles switched
