Damyon Wiese [Tue, 26 Mar 2013 05:23:53 +0000 (13:23 +0800)]
Merge branch 'MDL-38380' of git://github.com/lazydaisy/moodle
Damyon Wiese [Tue, 26 Mar 2013 05:12:29 +0000 (13:12 +0800)]
Merge branch 'MDL-38390' of git://github.com/jonof/moodle
Damyon Wiese [Tue, 26 Mar 2013 04:59:53 +0000 (12:59 +0800)]
Merge branch 'MDL-38429' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 26 Mar 2013 04:19:05 +0000 (12:19 +0800)]
Merge branch 'MDL-38569-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 26 Mar 2013 02:41:33 +0000 (10:41 +0800)]
Merge branch 'wip-mdl-36882' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 26 Mar 2013 02:04:31 +0000 (10:04 +0800)]
Merge branch 'wip-mdl-36125' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 26 Mar 2013 01:38:46 +0000 (09:38 +0800)]
Merge branch 'wip-MDL-38650_master' of git://github.com/gjb2048/moodle
Gareth J Barnard [Mon, 25 Mar 2013 10:26:35 +0000 (10:26 +0000)]
MDL-38650 theme_mymobile: Convert to new jQuery support infrastructure.
Damyon Wiese [Mon, 25 Mar 2013 08:00:00 +0000 (16:00 +0800)]
Merge branch 'MDL-38674-m' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 25 Mar 2013 07:51:01 +0000 (15:51 +0800)]
Merge branch 'MDL-38668' of git://github.com/stronk7/moodle
Damyon Wiese [Mon, 25 Mar 2013 07:36:25 +0000 (15:36 +0800)]
Merge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/moodle
Rossiani Wijaya [Mon, 25 Mar 2013 06:07:18 +0000 (14:07 +0800)]
MDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase.
Damyon Wiese [Mon, 25 Mar 2013 06:05:17 +0000 (14:05 +0800)]
MDL-38654 Deprecating gdversion setting: Fix typo for new install
Damyon Wiese [Mon, 25 Mar 2013 06:02:31 +0000 (14:02 +0800)]
Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle
Conflicts:
lang/en/admin.php
Roman Tsukanov [Mon, 25 Mar 2013 05:07:18 +0000 (13:07 +0800)]
MDL-38429: lesson report - Improve lesson statistics code.
Damyon Wiese [Mon, 25 Mar 2013 04:27:32 +0000 (12:27 +0800)]
Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 25 Mar 2013 03:30:36 +0000 (11:30 +0800)]
Merge branch 'MDL-38044-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 25 Mar 2013 03:15:03 +0000 (11:15 +0800)]
Merge branch 'wip-MDL-34917_master' of git://github.com/gjb2048/moodle
Damyon Wiese [Mon, 25 Mar 2013 02:30:54 +0000 (10:30 +0800)]
MDL-31681: Formatting changes to fix indentation
Also removed/refactored some confusing use of references.
Damyon Wiese [Mon, 25 Mar 2013 02:15:38 +0000 (10:15 +0800)]
Merge branch 'MDL-31681' of https://github.com/Lightwork-Marking/moodle
Damyon Wiese [Mon, 25 Mar 2013 01:20:53 +0000 (09:20 +0800)]
MDL-37033 Environment - Fix indenting in XML
Damyon Wiese [Mon, 25 Mar 2013 01:13:50 +0000 (09:13 +0800)]
Merge branch 'MDL-37033' of git://github.com/stronk7/moodle
Frederic Massart [Fri, 22 Mar 2013 03:39:19 +0000 (11:39 +0800)]
MDL-38569 form: No advanced settings in Common module settings
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 22:40:50 +0000 (23:40 +0100)]
Merge branch 'MDL-38658-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 22:39:07 +0000 (23:39 +0100)]
Merge branch 'MDL-36927-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 22:26:55 +0000 (23:26 +0100)]
Merge branch 'w13_MDL-38581_m25_forumtests' of git://github.com/skodak/moodle
Petr Škoda [Sun, 24 Mar 2013 21:17:36 +0000 (22:17 +0100)]
MDL-38654 add full $CFG->gdversion backwards compatibility for now
Paul Charsley [Wed, 20 Mar 2013 22:00:59 +0000 (11:00 +1300)]
MDL-31681 added core_grade_get_definitions web service function
Petr Škoda [Sun, 24 Mar 2013 17:59:33 +0000 (18:59 +0100)]
MDL-38675 import tcpdf 5.9.209
Andrew Robert Nicols [Sun, 24 Mar 2013 17:24:00 +0000 (17:24 +0000)]
MDL-38674 JavaScript: Migrate moodle-filter_glossary-autolink to use Shifter
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 09:42:28 +0000 (10:42 +0100)]
MDL-38668 timezones: update to tzdata 2013b
Gareth J Barnard [Sat, 23 Mar 2013 17:01:32 +0000 (17:01 +0000)]
MDL-34917 course: Jump to section navigation for 'One section per page'.
Jonathon Fowler [Sat, 16 Mar 2013 11:25:22 +0000 (21:25 +1000)]
MDL-38390 qformat_blackboard_six: use pool title as category name
If the category title is empty, generate a sequentially-numbered
title to use instead.
Andrew Robert Nicols [Fri, 22 Mar 2013 17:29:56 +0000 (17:29 +0000)]
MDL-38658 JavaScript: Correct fullpath for dndupload definition
Petr Škoda [Fri, 22 Mar 2013 15:51:18 +0000 (16:51 +0100)]
MDL-38654 do not test $CFG->gdversion
GD PHP extension is now required. Add-ons need to remove $CFG->gdversion tests. The worst case regression is that add-on will think GD is not available.
Eloy Lafuente (stronk7) [Fri, 22 Mar 2013 15:08:07 +0000 (16:08 +0100)]
MDL-37033 environment: add 2.5 brach details
Petr Škoda [Wed, 20 Mar 2013 18:41:46 +0000 (19:41 +0100)]
MDL-38581 move forum discussion and post generators to proper place
Petr Škoda [Tue, 19 Mar 2013 10:47:31 +0000 (11:47 +0100)]
MDL-15727 basic jQuery support
See http://docs.moodle.org/dev/jQuery for more details.
Frederic Massart [Thu, 14 Mar 2013 09:54:14 +0000 (17:54 +0800)]
MDL-38044 form: Added collapse/expand all buttons
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
Rajesh Taneja [Fri, 22 Mar 2013 04:39:24 +0000 (12:39 +0800)]
MDL-36125 course: Added aria-describedby for editing activity title
Rajesh Taneja [Thu, 21 Mar 2013 09:28:00 +0000 (17:28 +0800)]
MDL-36882 course: Added aria-live for manual completion
This is required so that assistive technologies can notify user about change on completion status
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
Ankit Agarwal [Wed, 20 Mar 2013 06:11:09 +0000 (14:11 +0800)]
MDL-36927 Reports: Page layout is not defined in course/recent.php
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
Mary Evans [Tue, 19 Mar 2013 20:30:30 +0000 (20:30 +0000)]
MDL-38380 theme_magazine: Fixed typo in style/core.css at line 980.
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
