moodle.git
8 years agoMerge branch 'MDL-43232-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 20:06:54 +0000 (09:06 +1300)]
Merge branch 'MDL-43232-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-43194-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 19:48:33 +0000 (08:48 +1300)]
Merge branch 'MDL-43194-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-43152-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 19:43:50 +0000 (08:43 +1300)]
Merge branch 'MDL-43152-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle
Sam Hemelryk [Mon, 9 Dec 2013 19:36:39 +0000 (08:36 +1300)]
Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle

Conflicts:
config-dist.php

8 years agoMerge branch 'MDL-40003-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 9 Dec 2013 15:24:26 +0000 (16:24 +0100)]
Merge branch 'MDL-40003-master' of git://github.com/FMCorz/moodle

8 years agoMDL-40003 mod_assign: Fixed submission comments not being restored
Sam Chaffee [Mon, 3 Jun 2013 21:49:01 +0000 (17:49 -0400)]
MDL-40003 mod_assign: Fixed submission comments not being restored

8 years agoMerge branch 'wip-MDL-43175-master' of git://github.com/abgreeve/moodle
Marina Glancy [Mon, 9 Dec 2013 07:54:53 +0000 (18:54 +1100)]
Merge branch 'wip-MDL-43175-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'wip-mdl-43224' of https://github.com/rajeshtaneja/moodle
Marina Glancy [Mon, 9 Dec 2013 07:45:27 +0000 (18:45 +1100)]
Merge branch 'wip-mdl-43224' of https://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'w50_MDL-42973_m27_addonupd' of https://github.com/skodak/moodle
Marina Glancy [Mon, 9 Dec 2013 07:26:39 +0000 (18:26 +1100)]
Merge branch 'w50_MDL-42973_m27_addonupd' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-43092_master' of git://github.com/lazydaisy/moodle
Marina Glancy [Mon, 9 Dec 2013 06:50:27 +0000 (17:50 +1100)]
Merge branch 'MDL-43092_master' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'w50_MDL-43137_m27_openbasedir' of https://github.com/skodak/moodle
Marina Glancy [Mon, 9 Dec 2013 05:15:21 +0000 (16:15 +1100)]
Merge branch 'w50_MDL-43137_m27_openbasedir' of https://github.com/skodak/moodle

8 years agoMDL-43175 events: Base event unit tests for JSON encoding / decoding comparison.
Adrian Greeve [Wed, 4 Dec 2013 07:39:14 +0000 (15:39 +0800)]
MDL-43175 events: Base event unit tests for JSON encoding / decoding comparison.

8 years agoMDL-43175 events: Changed JSON encoding decoding comparison to be less strict.
Adrian Greeve [Wed, 4 Dec 2013 07:27:35 +0000 (15:27 +0800)]
MDL-43175 events: Changed JSON encoding decoding comparison to be less strict.

Debugging messages would be sent when other contained a float that is a whole number.
When encoding and decoding using JSON the number is changed to an integer and the
comparison fails.

8 years agoMerge branch 'master_MDL-43192' of https://github.com/danmarsden/moodle
Marina Glancy [Mon, 9 Dec 2013 00:28:03 +0000 (11:28 +1100)]
Merge branch 'master_MDL-43192' of https://github.com/danmarsden/moodle

8 years agoMerge branch 'wip-MDL-40213_master' of git://github.com/gjb2048/moodle
Marina Glancy [Mon, 9 Dec 2013 00:13:16 +0000 (11:13 +1100)]
Merge branch 'wip-MDL-40213_master' of git://github.com/gjb2048/moodle

8 years agoMDL-43224 navigation: Load local plugin navigation in site admin via ajax
Rajesh Taneja [Fri, 6 Dec 2013 02:17:08 +0000 (10:17 +0800)]
MDL-43224 navigation: Load local plugin navigation in site admin via ajax

Local plugin can add navigation nodes to site admin and while loading
site admin via ajax this should be considered.

8 years agoMDL-42973 fix multiple addon update issues
Petr Škoda [Sun, 24 Nov 2013 07:08:27 +0000 (15:08 +0800)]
MDL-42973 fix multiple addon update issues

8 years agoMDL-43137 fix open_basedir regression in classloader
Petr Škoda [Tue, 3 Dec 2013 01:34:42 +0000 (09:34 +0800)]
MDL-43137 fix open_basedir regression in classloader

8 years agoMDL-43152 JavaScript: Add update instructions for gallery-bootstrap
Andrew Nicols [Wed, 4 Dec 2013 08:55:26 +0000 (16:55 +0800)]
MDL-43152 JavaScript: Add update instructions for gallery-bootstrap

8 years agoMDL-43152 JavaScript: Fix linting issues with moodle-theme_bootstrapbase
Andrew Nicols [Wed, 4 Dec 2013 08:16:38 +0000 (16:16 +0800)]
MDL-43152 JavaScript: Fix linting issues with moodle-theme_bootstrapbase

8 years agoMDL-43152 JavaScript: Fix linting issues with moodle-core-blocks
Andrew Nicols [Wed, 4 Dec 2013 08:16:11 +0000 (16:16 +0800)]
MDL-43152 JavaScript: Fix linting issues with moodle-core-blocks

8 years agoMDL-43152 JavaScript: Fix linting issue with navigation JS
Andrew Nicols [Mon, 2 Dec 2013 06:20:09 +0000 (14:20 +0800)]
MDL-43152 JavaScript: Fix linting issue with navigation JS

8 years agoMDL-43232 JavaSript: Migrate moodle-backup-confirmcancel to use Shifter
Andrew Nicols [Fri, 6 Dec 2013 00:16:33 +0000 (08:16 +0800)]
MDL-43232 JavaSript: Migrate moodle-backup-confirmcancel to use Shifter

8 years agoweekly release 2.7dev
Dan Poltawski [Thu, 5 Dec 2013 07:09:50 +0000 (15:09 +0800)]
weekly release 2.7dev

8 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Dan Poltawski [Thu, 5 Dec 2013 07:09:47 +0000 (15:09 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

8 years agoMDL-41592 behat: Setting a default value for CFG->behat_wwwroot in case it is empty
David Monllao [Wed, 4 Dec 2013 03:58:32 +0000 (11:58 +0800)]
MDL-41592 behat: Setting a default value for CFG->behat_wwwroot in case it is empty

8 years agoMDL-42097 auth: Webservice auth uses tokens only not passwords
Ankit Agarwal [Thu, 5 Dec 2013 02:47:43 +0000 (10:47 +0800)]
MDL-42097 auth: Webservice auth uses tokens only not passwords

8 years agoMDL-42097 fix handling of passwords when creating new users
Petr Škoda [Wed, 4 Dec 2013 10:00:23 +0000 (18:00 +0800)]
MDL-42097 fix handling of passwords when creating new users

8 years agoMerge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Wed, 4 Dec 2013 19:25:35 +0000 (08:25 +1300)]
Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-43185-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Wed, 4 Dec 2013 19:07:59 +0000 (08:07 +1300)]
Merge branch 'MDL-43185-master' of git://github.com/FMCorz/moodle

8 years agoMDL-42084 Fix breakage in grader preferences page
sam marshall [Wed, 4 Dec 2013 16:59:03 +0000 (16:59 +0000)]
MDL-42084 Fix breakage in grader preferences page

8 years agoMDL-40213 theme_clean: Layout "secure.php" missing settings.
Gareth J Barnard [Wed, 4 Dec 2013 11:23:32 +0000 (11:23 +0000)]
MDL-40213 theme_clean: Layout "secure.php" missing settings.

8 years agoMDL-43194 JavaScript: Correct maxlen jshint configuration
Andrew Nicols [Wed, 4 Dec 2013 08:39:48 +0000 (16:39 +0800)]
MDL-43194 JavaScript: Correct maxlen jshint configuration

8 years agoMDL-43192 Repository: param doesn't exist - should use function
Dan Marsden [Wed, 4 Dec 2013 07:54:57 +0000 (20:54 +1300)]
MDL-43192 Repository: param doesn't exist - should use function

8 years agoMerge branch 'wip-MDL-40191-2-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 4 Dec 2013 07:44:03 +0000 (15:44 +0800)]
Merge branch 'wip-MDL-40191-2-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-40191 folder: Do not check capability in renderer
Marina Glancy [Wed, 4 Dec 2013 07:27:55 +0000 (18:27 +1100)]
MDL-40191 folder: Do not check capability in renderer

Capability to access the module is already checked before calling the renderer. Extra check works bad together with switching roles

8 years agoMerge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 4 Dec 2013 06:57:24 +0000 (14:57 +0800)]
Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle

8 years agoMDL-43028 navigation: fixed section for profilepage
Rajesh Taneja [Wed, 4 Dec 2013 06:48:30 +0000 (14:48 +0800)]
MDL-43028 navigation: fixed section for profilepage

section for profile page is profilepage and not mypage

8 years agoMerge branch 'MDL-42563_filter_algebra_thirdpartylibs.xml' of https://github.com...
Dan Poltawski [Wed, 4 Dec 2013 03:30:09 +0000 (11:30 +0800)]
Merge branch 'MDL-42563_filter_algebra_thirdpartylibs.xml' of https://github.com/tmuras/moodle

8 years agoMDL-43185 behat: Use realpath on existing paths
Frederic Massart [Wed, 4 Dec 2013 02:59:49 +0000 (10:59 +0800)]
MDL-43185 behat: Use realpath on existing paths

8 years agoMerge branch 'MDL-43084-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Wed, 4 Dec 2013 02:29:00 +0000 (15:29 +1300)]
Merge branch 'MDL-43084-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'MDL-43083-master' of git://github.com/phalacee/moodle
Damyon Wiese [Wed, 4 Dec 2013 01:52:51 +0000 (09:52 +0800)]
Merge branch 'MDL-43083-master' of git://github.com/phalacee/moodle

8 years agoMDL-42597 yui: remove stale built files
Dan Poltawski [Wed, 4 Dec 2013 01:08:54 +0000 (09:08 +0800)]
MDL-42597 yui: remove stale built files

8 years agoMerge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 4 Dec 2013 00:53:25 +0000 (08:53 +0800)]
Merge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMDL-43084 Themes: fixing dialog header in standard theme
Jason Fowler [Thu, 28 Nov 2013 01:20:23 +0000 (09:20 +0800)]
MDL-43084 Themes: fixing dialog header in standard theme

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 4 Dec 2013 00:43:12 +0000 (00:43 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'master_MDL-43049' of git://github.com/totara/moodle
Dan Poltawski [Wed, 4 Dec 2013 00:36:05 +0000 (08:36 +0800)]
Merge branch 'master_MDL-43049' of git://github.com/totara/moodle

8 years agoMDL-42597 Administration: Modified maintenance mode countdown to display nicely
Rajesh Taneja [Wed, 20 Nov 2013 01:05:01 +0000 (09:05 +0800)]
MDL-42597 Administration: Modified maintenance mode countdown to display nicely

Added Style and JS to display maintenance mode timer similar
to what is done on moodle demo site for rest.

8 years agoMerge branch 'MDL-41446-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:55:42 +0000 (23:55 +0100)]
Merge branch 'MDL-41446-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 3 Dec 2013 22:52:12 +0000 (11:52 +1300)]
Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle

8 years agoMerge branch 'w49_MDL-43117_m27_releaseinfo' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:45:54 +0000 (23:45 +0100)]
Merge branch 'w49_MDL-43117_m27_releaseinfo' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-43142_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:40:19 +0000 (23:40 +0100)]
Merge branch 'MDL-43142_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-43140_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:24:22 +0000 (23:24 +0100)]
Merge branch 'MDL-43140_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-43093' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 3 Dec 2013 21:12:12 +0000 (10:12 +1300)]
Merge branch 'MDL-43093' of git://github.com/timhunt/moodle

8 years agoMerge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 3 Dec 2013 20:49:29 +0000 (09:49 +1300)]
Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-43065-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 3 Dec 2013 20:44:25 +0000 (09:44 +1300)]
Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle

Conflicts:
backup/util/ui/base_moodleform.class.php

8 years agoMerge branch 'MDL-42919-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 3 Dec 2013 20:43:43 +0000 (09:43 +1300)]
Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'wip-MDL-43058-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 18:33:15 +0000 (19:33 +0100)]
Merge branch 'wip-MDL-43058-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'MDL-43105-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 18:15:05 +0000 (19:15 +0100)]
Merge branch 'MDL-43105-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'master-mdl33971' of https://github.com/tlock/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 16:17:06 +0000 (17:17 +0100)]
Merge branch 'master-mdl33971' of https://github.com/tlock/moodle

8 years agoMDL-43092 theme_afterburner: Activity or Resource dialog greyed-out for non-empty...
Mary Evans [Tue, 3 Dec 2013 14:52:27 +0000 (14:52 +0000)]
MDL-43092 theme_afterburner: Activity or Resource dialog greyed-out for non-empty courses

8 years agoMerge branch 'MDL-43079-master-v2' of https://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 14:36:25 +0000 (15:36 +0100)]
Merge branch 'MDL-43079-master-v2' of https://github.com/jamiepratt/moodle

8 years agoMerge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 3 Dec 2013 09:29:39 +0000 (17:29 +0800)]
Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-43087 testing: ability to load features from additional paths
Aaron Barnes [Wed, 27 Nov 2013 08:22:12 +0000 (21:22 +1300)]
MDL-43087 testing: ability to load features from additional paths

8 years agoMerge branch 'MDL-42885_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 09:01:19 +0000 (10:01 +0100)]
Merge branch 'MDL-42885_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 3 Dec 2013 08:15:53 +0000 (16:15 +0800)]
Merge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'wip-MDL-43026-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 3 Dec 2013 08:11:48 +0000 (16:11 +0800)]
Merge branch 'wip-MDL-43026-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'master-mdl43020' of https://github.com/tlock/moodle
Dan Poltawski [Tue, 3 Dec 2013 08:08:15 +0000 (16:08 +0800)]
Merge branch 'master-mdl43020' of https://github.com/tlock/moodle

8 years agoMerge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 3 Dec 2013 08:01:22 +0000 (16:01 +0800)]
Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-42097-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 3 Dec 2013 07:21:09 +0000 (15:21 +0800)]
Merge branch 'MDL-42097-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-42962-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 3 Dec 2013 07:15:25 +0000 (15:15 +0800)]
Merge branch 'MDL-42962-master' of git://github.com/ankitagarwal/moodle

8 years agoRevert "MDL-39286 Remove link on My Courses settings heading"
Damyon Wiese [Tue, 3 Dec 2013 06:59:16 +0000 (14:59 +0800)]
Revert "MDL-39286 Remove link on My Courses settings heading"

This reverts commit 8b79059480935160a7ef0b9d767a4fc2a5532b39.

Behat is failing with this change.

8 years agoRevert "MDL-42932 core_calendar: introduced calendar type system setting"
Dan Poltawski [Tue, 3 Dec 2013 06:57:10 +0000 (14:57 +0800)]
Revert "MDL-42932 core_calendar: introduced calendar type system setting"

This reverts commit bb32a499e10abc3bb88e715fb0575e5b7fb66e8e.

8 years agoRevert "MDL-42932 core_lib: added missing $CFG declaration"
Dan Poltawski [Tue, 3 Dec 2013 06:57:08 +0000 (14:57 +0800)]
Revert "MDL-42932 core_lib: added missing $CFG declaration"

This reverts commit 4c61097cc7138dd18173775ec55fe2c5aed48857.

8 years agoMDL-42989 JavaScript: Check result of navigation IO requests before reporting errors
Andrew Nicols [Tue, 3 Dec 2013 06:36:40 +0000 (14:36 +0800)]
MDL-42989 JavaScript: Check result of navigation IO requests before reporting errors

When making a request which fails, we need to ensure that the AJAX query
was not aborted before displaying the error.

This ensures that if the navigation tree is being requested at the same
time as a page load is being processed, the abortion of the AJAX request is
not displayed before the page reloads.

8 years agoMDL-42962 events: Remove duplicate code from all course_module_viewed events
Ankit Agarwal [Tue, 19 Nov 2013 06:03:08 +0000 (14:03 +0800)]
MDL-42962 events: Remove duplicate code from all course_module_viewed events

8 years agoMDL-42962 events: Add unit tests for the abstract class course_module_viewed
Ankit Agarwal [Tue, 19 Nov 2013 06:51:36 +0000 (14:51 +0800)]
MDL-42962 events: Add unit tests for the abstract class course_module_viewed

8 years agoMDL-42962 events: Add a abstract class course_module_viewed
Ankit Agarwal [Tue, 19 Nov 2013 05:50:13 +0000 (13:50 +0800)]
MDL-42962 events: Add a abstract class course_module_viewed

AMOS BEGIN
 CPY [eventcoursemoduleviewed,core],[eventcoursemoduleviewed,mod_feedback]
AMOS END

8 years agoMDL-42989 JavaScript: Do not attempt to expand navigation when opening link
Andrew Nicols [Tue, 3 Dec 2013 06:20:49 +0000 (14:20 +0800)]
MDL-42989 JavaScript: Do not attempt to expand navigation when opening link

When clicking on a link which is also expandable, we should not attempt to
expand it.

8 years agoMDL-42097 auth: Auth plugins must check passwordurl before returning it
Ankit Agarwal [Thu, 21 Nov 2013 08:15:04 +0000 (16:15 +0800)]
MDL-42097 auth: Auth plugins must check passwordurl before returning it

8 years agoMerge branch 'time-limit-fix' of https://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 3 Dec 2013 06:17:34 +0000 (14:17 +0800)]
Merge branch 'time-limit-fix' of https://github.com/danpoltawski/moodle

8 years agoMDL-42097 formslib: updates to edit profile form
Ankit Agarwal [Mon, 18 Nov 2013 10:04:01 +0000 (18:04 +0800)]
MDL-42097 formslib: updates to edit profile form

Add a new dependency 'in' in forms library
Use the 'in' dependency to disable the 'changepassword' field when a auth plugin doesn't support it

8 years agoMDL-42084 lib: fix undefined variable warnings
Dan Poltawski [Tue, 3 Dec 2013 05:23:31 +0000 (13:23 +0800)]
MDL-42084 lib: fix undefined variable warnings

8 years agoMerge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Dec 2013 05:45:59 +0000 (13:45 +0800)]
Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle

8 years agoMDL-40079 repositories: Added deprecated tags
Rajesh Taneja [Tue, 3 Dec 2013 05:28:10 +0000 (13:28 +0800)]
MDL-40079 repositories: Added deprecated tags

8 years agoMDL-40079 repositories: Replaced const with configs for boxnet
Rajesh Taneja [Tue, 3 Dec 2013 05:24:10 +0000 (13:24 +0800)]
MDL-40079 repositories: Replaced const with configs for boxnet

8 years agoMerge branch 'MDL-43076-master' of git://github.com/phalacee/moodle
Damyon Wiese [Tue, 3 Dec 2013 05:18:47 +0000 (13:18 +0800)]
Merge branch 'MDL-43076-master' of git://github.com/phalacee/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'MDL-43081-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 3 Dec 2013 05:03:32 +0000 (13:03 +0800)]
Merge branch 'MDL-43081-master' of git://github.com/danpoltawski/moodle

Conflicts:
lib/upgrade.txt

8 years agoMerge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Dec 2013 04:52:10 +0000 (12:52 +0800)]
Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-42738_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 3 Dec 2013 04:41:03 +0000 (12:41 +0800)]
Merge branch 'MDL-42738_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-43066_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 3 Dec 2013 04:36:50 +0000 (12:36 +0800)]
Merge branch 'MDL-43066_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'wip-mdl-43048' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 3 Dec 2013 03:43:32 +0000 (11:43 +0800)]
Merge branch 'wip-mdl-43048' of https://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-42932_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 3 Dec 2013 03:41:06 +0000 (11:41 +0800)]
Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle

8 years agoMDL-42932 core_lib: added missing $CFG declaration
Mark Nelson [Tue, 3 Dec 2013 03:11:36 +0000 (19:11 -0800)]
MDL-42932 core_lib: added missing $CFG declaration

8 years agoMerge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 3 Dec 2013 03:10:18 +0000 (11:10 +0800)]
Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle

Conflicts:
enrol/self/db/upgrade.php

8 years agoMerge branch 'MDL-42932_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 3 Dec 2013 02:07:10 +0000 (10:07 +0800)]
Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-40939-master' of https://github.com/timgus/moodle
Damyon Wiese [Tue, 3 Dec 2013 01:26:58 +0000 (09:26 +0800)]
Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle

Conflicts:
filter/tex/version.php
lang/en/admin.php

8 years agoMerge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 2 Dec 2013 22:12:34 +0000 (11:12 +1300)]
Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 2 Dec 2013 21:25:26 +0000 (10:25 +1300)]
Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle

8 years agoMDL-43093 update repeat_elements PHPdoc.
Tim Hunt [Wed, 27 Nov 2013 13:35:11 +0000 (13:35 +0000)]
MDL-43093 update repeat_elements PHPdoc.