moodle.git
8 years agoMerge branch 'MDL-38528' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 26 Mar 2013 06:57:04 +0000 (14:57 +0800)]
Merge branch 'MDL-38528' of git://github.com/timhunt/moodle

8 years agoMDL-35875: Version bump for CSS changes
Damyon Wiese [Tue, 26 Mar 2013 06:50:18 +0000 (14:50 +0800)]
MDL-35875: Version bump for CSS changes

8 years agoMerge branch 'MDL-35875-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 26 Mar 2013 06:49:34 +0000 (14:49 +0800)]
Merge branch 'MDL-35875-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/upgrade.txt

8 years agoMerge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 26 Mar 2013 06:29:57 +0000 (14:29 +0800)]
Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle

8 years agoMDL-38147 Course: Added version bump for cache definitions.
Damyon Wiese [Tue, 26 Mar 2013 06:22:35 +0000 (14:22 +0800)]
MDL-38147 Course: Added version bump for cache definitions.

8 years agoMerge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 26 Mar 2013 06:22:11 +0000 (14:22 +0800)]
Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle

Conflicts:
lib/upgrade.txt

8 years agoMerge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 26 Mar 2013 05:46:29 +0000 (13:46 +0800)]
Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle

Conflicts:
course/moodleform_mod.php
lib/upgrade.txt

8 years agoMDL-38598 Forms: Version bump for js changes.
Damyon Wiese [Tue, 26 Mar 2013 05:33:52 +0000 (13:33 +0800)]
MDL-38598 Forms: Version bump for js changes.

8 years agoMerge branch 'MDL-38598-master-int' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 26 Mar 2013 05:28:57 +0000 (13:28 +0800)]
Merge branch 'MDL-38598-master-int' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-38380' of git://github.com/lazydaisy/moodle
Damyon Wiese [Tue, 26 Mar 2013 05:23:53 +0000 (13:23 +0800)]
Merge branch 'MDL-38380' of git://github.com/lazydaisy/moodle

8 years agoMDL-38147 bug fix, changed usage of non-existing function
Marina Glancy [Tue, 26 Mar 2013 05:17:34 +0000 (16:17 +1100)]
MDL-38147 bug fix, changed usage of non-existing function

8 years agoMerge branch 'MDL-38390' of git://github.com/jonof/moodle
Damyon Wiese [Tue, 26 Mar 2013 05:12:29 +0000 (13:12 +0800)]
Merge branch 'MDL-38390' of git://github.com/jonof/moodle

8 years agoMerge branch 'MDL-38429' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 26 Mar 2013 04:59:53 +0000 (12:59 +0800)]
Merge branch 'MDL-38429' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-38569-master' of git://github.com/FMCorz/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

8 years agoMDL-38147 fixed small bug on changed categories cache
Marina Glancy [Tue, 26 Mar 2013 03:09:00 +0000 (14:09 +1100)]
MDL-38147 fixed small bug on changed categories cache

8 years agoMerge branch 'wip-mdl-36882' of git://github.com/rajeshtaneja/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

8 years agoMerge branch 'wip-mdl-36125' 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

8 years agoMerge branch 'wip-MDL-38650_master' of git://github.com/gjb2048/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

8 years agoMDL-38650 theme_mymobile: Convert to new jQuery support infrastructure.
Gareth J Barnard [Mon, 25 Mar 2013 10:26:35 +0000 (10:26 +0000)]
MDL-38650 theme_mymobile: Convert to new jQuery support infrastructure.

8 years agoMerge branch 'MDL-38674-m' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 25 Mar 2013 08:00:00 +0000 (16:00 +0800)]
Merge branch 'MDL-38674-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38668' of git://github.com/stronk7/moodle
Damyon Wiese [Mon, 25 Mar 2013 07:51:01 +0000 (15:51 +0800)]
Merge branch 'MDL-38668' of git://github.com/stronk7/moodle

8 years agoMerge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/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

8 years agoMDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase.
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.

8 years agoMDL-38654 Deprecating gdversion setting: Fix typo for new install
Damyon Wiese [Mon, 25 Mar 2013 06:05:17 +0000 (14:05 +0800)]
MDL-38654 Deprecating gdversion setting: Fix typo for new install

8 years agoMerge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle
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

8 years agoMDL-38429: lesson report - Improve lesson statistics code.
Roman Tsukanov [Mon, 25 Mar 2013 05:07:18 +0000 (13:07 +0800)]
MDL-38429: lesson report - Improve lesson statistics code.

8 years agoMerge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle
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

8 years agoMDL-30438 Lesson Module: fixed input text editable capability after checking/unchecki...
Rossiani Wijaya [Mon, 25 Mar 2013 03:47:05 +0000 (11:47 +0800)]
MDL-30438 Lesson Module: fixed input text editable capability after checking/unchecking unmask option

8 years agoMerge branch 'MDL-38044-master' of git://github.com/FMCorz/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

8 years agoMDL-30438 Lesson Module: improve password field to disabled when password protect...
Rossiani Wijaya [Mon, 11 Mar 2013 05:09:23 +0000 (13:09 +0800)]
MDL-30438 Lesson Module: improve password field to disabled when password protect is set to no.

8 years agoMerge branch 'wip-MDL-34917_master' of git://github.com/gjb2048/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

8 years agoMDL-31681: Formatting changes to fix indentation
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.

8 years agoMDL-38147 Added functions coursecat::search_courses(), get_courses()
Marina Glancy [Tue, 5 Mar 2013 00:41:16 +0000 (11:41 +1100)]
MDL-38147 Added functions coursecat::search_courses(), get_courses()

Also search_courses_count(), get_courses_count();
Added unittests

8 years agoMDL-38147 fixes to phpdocs and avoid using deprecated context functions
Marina Glancy [Fri, 22 Mar 2013 01:59:03 +0000 (12:59 +1100)]
MDL-38147 fixes to phpdocs and avoid using deprecated context functions

8 years agoMDL-38147 changed logic for building list in make_categories_list()
Marina Glancy [Mon, 18 Mar 2013 04:00:55 +0000 (15:00 +1100)]
MDL-38147 changed logic for building list in make_categories_list()

8 years agoMDL-38147 Improvements to caching of course categories, coursecat::get_children(...
Marina Glancy [Thu, 28 Feb 2013 01:29:15 +0000 (12:29 +1100)]
MDL-38147 Improvements to caching of course categories, coursecat::get_children() improvements

- Course categories caches are purged by event now
- session cache has additional 10 minutes ttl to clear itself and accomodate for permission changes that do not trigger event purging
- additional request-level cache for coursecat::get()
- We store only children of one category in one cache key
- Function coursecat::get_children() can return results sorted and/or paginated. Added tests

8 years agoMDL-38147 Performance improvements to coursecat class:
Marina Glancy [Wed, 27 Feb 2013 00:35:35 +0000 (11:35 +1100)]
MDL-38147 Performance improvements to coursecat class:

- Retrieve and cache only often-used fields of course category
- Removed function coursecat::get_all_visible() as potentially causing performance issues
- removed function coursecat::get_all_parents() as ineffective and unnecessary, replaced with get_parents()
- retrieve all fields from course_categories when unretrieved field is accessed

Also some code improvements:
- rename functions starting with _ , rename arguments, etc.

8 years agoMDL-38147 deprecated get_categories(), change usage to coursecat
Marina Glancy [Wed, 20 Feb 2013 09:51:21 +0000 (20:51 +1100)]
MDL-38147 deprecated get_categories(), change usage to coursecat

8 years agoMDL-38147 deprecated get_child_categories(), change usage to coursecat
Marina Glancy [Fri, 22 Feb 2013 01:24:40 +0000 (12:24 +1100)]
MDL-38147 deprecated get_child_categories(), change usage to coursecat

8 years agoMDL-38147 deprecated get_all_subcategories()
Marina Glancy [Thu, 21 Feb 2013 23:45:07 +0000 (10:45 +1100)]
MDL-38147 deprecated get_all_subcategories()

8 years agoMDL-38147 deprecated create_course_category(), change usage to coursecat. Also avoid...
Marina Glancy [Thu, 21 Feb 2013 00:33:15 +0000 (11:33 +1100)]
MDL-38147 deprecated create_course_category(), change usage to coursecat. Also avoid direct DB update of table course_categories

changed to usage of
- coursecat::create()
- coursecat::update()

8 years agoMDL-38147 deprecated get_course_category(), change usage to coursecat
Marina Glancy [Thu, 21 Feb 2013 00:22:20 +0000 (11:22 +1100)]
MDL-38147 deprecated get_course_category(), change usage to coursecat

8 years agoMDL-38147 deprecated move_category(), course_category_hide(), course_category_show...
Marina Glancy [Wed, 20 Feb 2013 23:55:35 +0000 (10:55 +1100)]
MDL-38147 deprecated move_category(), course_category_hide(), course_category_show(), change usage to coursecat

All usages in core replaced with:
- coursecat::change_parent()
- coursecat::hide()
- coursecat::show()

8 years agoMDL-38147 deprecated category_delete_move(), category_delete_full(), change usage...
Marina Glancy [Wed, 20 Feb 2013 23:46:52 +0000 (10:46 +1100)]
MDL-38147 deprecated category_delete_move(), category_delete_full(), change usage to coursecat

8 years agoMDL-38147 deprecated make_categories_list(), change usage to coursecat
Marina Glancy [Wed, 20 Feb 2013 23:37:52 +0000 (10:37 +1100)]
MDL-38147 deprecated make_categories_list(), change usage to coursecat

8 years agoMDL-38147 Added coursecatlib_test.php, changed other tests to use coursecat::create...
Marina Glancy [Thu, 21 Feb 2013 00:30:12 +0000 (11:30 +1100)]
MDL-38147 Added coursecatlib_test.php, changed other tests to use coursecat::create() for creating category

8 years agoMDL-38147 Created class coursecat, added cache definition and lang strings
Marina Glancy [Wed, 20 Feb 2013 22:57:40 +0000 (09:57 +1100)]
MDL-38147 Created class coursecat, added cache definition and lang strings

8 years agoMerge branch 'MDL-31681' of https://github.com/Lightwork-Marking/moodle
Damyon Wiese [Mon, 25 Mar 2013 02:15:38 +0000 (10:15 +0800)]
Merge branch 'MDL-31681' of https://github.com/Lightwork-Marking/moodle

8 years agoMDL-34311 mod_url: Missing setType on the external url
Dan Poltawski [Mon, 25 Mar 2013 01:38:56 +0000 (09:38 +0800)]
MDL-34311 mod_url: Missing setType on the external url

8 years agoMDL-34311 course: add missing type on cm idnumber
Dan Poltawski [Mon, 25 Mar 2013 01:26:10 +0000 (09:26 +0800)]
MDL-34311 course: add missing type on cm idnumber

We must use PARAM_RAW for idnumbers because external systems could use
any characters and this is a linking field for external systems.

8 years agoMDL-34311 course: prevent course edit form warnings
Dan Poltawski [Fri, 22 Mar 2013 08:40:30 +0000 (16:40 +0800)]
MDL-34311 course: prevent course edit form warnings

There is a placeholder element.

8 years agoMDL-34311 formslib: warn when no param type set
Dan Poltawski [Fri, 22 Mar 2013 08:38:10 +0000 (16:38 +0800)]
MDL-34311 formslib: warn when no param type set

Params without a type set will not be getting cleaned, so if developers
really do not want cleaning, they should set it explicitly.

8 years agoMDL-37033 Environment - Fix indenting in XML
Damyon Wiese [Mon, 25 Mar 2013 01:20:53 +0000 (09:20 +0800)]
MDL-37033 Environment - Fix indenting in XML

8 years agoMerge branch 'MDL-37033' of git://github.com/stronk7/moodle
Damyon Wiese [Mon, 25 Mar 2013 01:13:50 +0000 (09:13 +0800)]
Merge branch 'MDL-37033' of git://github.com/stronk7/moodle

8 years agoMDL-38569 form: No advanced settings in Common module settings
Frederic Massart [Fri, 22 Mar 2013 03:39:19 +0000 (11:39 +0800)]
MDL-38569 form: No advanced settings in Common module settings

8 years agoMDL-38598 form: Prevent flickering due to advanced fields
Frederic Massart [Fri, 22 Mar 2013 02:26:50 +0000 (10:26 +0800)]
MDL-38598 form: Prevent flickering due to advanced fields

8 years agoMerge branch 'MDL-38658-m' of git://github.com/andrewnicols/moodle
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

8 years agoMerge branch 'MDL-36927-master' of git://github.com/ankitagarwal/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

8 years agoMerge branch 'w13_MDL-38581_m25_forumtests' of git://github.com/skodak/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

8 years agoMDL-38654 add full $CFG->gdversion backwards compatibility for now
Petr Škoda [Sun, 24 Mar 2013 21:17:36 +0000 (22:17 +0100)]
MDL-38654 add full $CFG->gdversion backwards compatibility for now

8 years agoMDL-31681 added core_grade_get_definitions web service function
Paul Charsley [Wed, 20 Mar 2013 22:00:59 +0000 (11:00 +1300)]
MDL-31681 added core_grade_get_definitions web service function

8 years agoMDL-38675 import tcpdf 5.9.209
Petr Škoda [Sun, 24 Mar 2013 17:59:33 +0000 (18:59 +0100)]
MDL-38675 import tcpdf 5.9.209

8 years agoMDL-38674 JavaScript: Migrate moodle-filter_glossary-autolink to use Shifter
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

8 years agoMDL-38668 timezones: update to tzdata 2013b
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 09:42:28 +0000 (10:42 +0100)]
MDL-38668 timezones: update to tzdata 2013b

8 years agoMDL-34917 course: Jump to section navigation for 'One section per page'.
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'.

8 years agoMDL-38390 qformat_blackboard_six: use pool title as category name
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.

8 years agoMDL-38658 JavaScript: Correct fullpath for dndupload definition
Andrew Robert Nicols [Fri, 22 Mar 2013 17:29:56 +0000 (17:29 +0000)]
MDL-38658 JavaScript: Correct fullpath for dndupload definition

8 years agoMDL-38654 do not test $CFG->gdversion
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.

8 years agoMDL-37033 environment: add 2.5 brach details
Eloy Lafuente (stronk7) [Fri, 22 Mar 2013 15:08:07 +0000 (16:08 +0100)]
MDL-37033 environment: add 2.5 brach details

8 years agoMDL-38581 move forum discussion and post generators to proper place
Petr Škoda [Wed, 20 Mar 2013 18:41:46 +0000 (19:41 +0100)]
MDL-38581 move forum discussion and post generators to proper place

8 years agoMDL-15727 basic jQuery support
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.

8 years agoMDL-38528 qtype_calc* dataset forms: disable short-forms for now.
Tim Hunt [Tue, 19 Mar 2013 12:10:40 +0000 (12:10 +0000)]
MDL-38528 qtype_calc* dataset forms: disable short-forms for now.

At the moment using short-forms no these forms really does not work. In
future is may be possible to do a complete overhaul, but for now, just
disabling short-forms is a simple fix.

8 years agoMDL-38044 form: Added collapse/expand all buttons
Frederic Massart [Thu, 14 Mar 2013 09:54:14 +0000 (17:54 +0800)]
MDL-38044 form: Added collapse/expand all buttons

8 years agoweekly release 2.5dev
Damyon Wiese [Fri, 22 Mar 2013 05:38:50 +0000 (13:38 +0800)]
weekly release 2.5dev

8 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Damyon Wiese [Fri, 22 Mar 2013 05:35:24 +0000 (13:35 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

8 years agoMDL-36125 course: Added aria-describedby for editing activity title
Rajesh Taneja [Fri, 22 Mar 2013 04:39:24 +0000 (12:39 +0800)]
MDL-36125 course: Added aria-describedby for editing activity title

8 years agoMDL-36882 course: Added aria-live for manual completion
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

8 years agoMDL-38414_master behat: Changing expand fieldsets test to forum form
David Monllao [Thu, 21 Mar 2013 02:42:24 +0000 (10:42 +0800)]
MDL-38414_master behat: Changing expand fieldsets test to forum form

8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 21 Mar 2013 00:37:26 +0000 (00:37 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle
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

8 years agoMDL-38035 Conditional availability: Support multilang custom user fields
sam marshall [Wed, 20 Mar 2013 14:05:36 +0000 (14:05 +0000)]
MDL-38035 Conditional availability: Support multilang custom user fields

8 years agoMDL-38364 phpunit: PHPUnit autoload uses capital A
David Monllao [Wed, 20 Mar 2013 07:45:00 +0000 (15:45 +0800)]
MDL-38364 phpunit: PHPUnit autoload uses capital A

8 years agoMDL-36927 Reports: Page layout is not defined in course/recent.php
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

8 years agoMerge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle
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

8 years agoMerge branch 'wip-MDL-38387-m25' of https://github.com/samhemelryk/moodle
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

8 years agoMDL-38373 Auth - Additional strict warning fix for radius authentication
Damyon Wiese [Wed, 20 Mar 2013 04:32:29 +0000 (12:32 +0800)]
MDL-38373 Auth - Additional strict warning fix for radius authentication

8 years agoMDL-38387 cache: removed call to plugins API from cache API
Sam Hemelryk [Wed, 20 Mar 2013 03:06:07 +0000 (16:06 +1300)]
MDL-38387 cache: removed call to plugins API from cache API

8 years agoMDL-38350 cache: fixed issue with siteidentifier === false
Sam Hemelryk [Wed, 20 Mar 2013 01:02:20 +0000 (14:02 +1300)]
MDL-38350 cache: fixed issue with siteidentifier === false

8 years agoMDL-38387 cache: fixed inifinite initialisation loop with site id
Sam Hemelryk [Fri, 8 Mar 2013 01:07:13 +0000 (14:07 +1300)]
MDL-38387 cache: fixed inifinite initialisation loop with site id

8 years agoMerge branch 'MDL-38373' of git://github.com/stronk7/moodle
Damyon Wiese [Wed, 20 Mar 2013 03:05:38 +0000 (11:05 +0800)]
Merge branch 'MDL-38373' of git://github.com/stronk7/moodle

8 years agoMerge branch 'MDL-38470-m' of https://github.com/andrewnicols/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

8 years agoMDL-38470 JavaScript: Rebuild moodle-core-tooltip with Shifter
Andrew Robert Nicols [Thu, 14 Mar 2013 00:18:37 +0000 (00:18 +0000)]
MDL-38470 JavaScript: Rebuild moodle-core-tooltip with Shifter

8 years agoMerge branch 'MDL-38414-master' of git://github.com/FMCorz/moodle
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

8 years agoMerge branch 'MDL-38330-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

8 years agoMDL-38515 JavaScript: Partially revert 4f65d03b08
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.

8 years agoRevert "MDL-38515 JavaScript: Correct module dependencies for core_filepicker"
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.

8 years agoMerge branch 'MDL-38490' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:43:09 +0000 (00:43 +0100)]
Merge branch 'MDL-38490' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-38416-master' of git://github.com/FMCorz/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

8 years agoMerge branch 'MDL-38370-master' of git://github.com/ankitagarwal/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

8 years agoMerge branch 'w12_MDL-38364_m25_phpunitloading' of git://github.com/skodak/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