moodle.git
7 years agoMerge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Mar 2014 20:30:39 +0000 (09:30 +1300)]
Merge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle

7 years agoMerge branch 'w12_MDL-44609_m27_taskcomponent' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Mar 2014 20:16:09 +0000 (09:16 +1300)]
Merge branch 'w12_MDL-44609_m27_taskcomponent' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-44585-master' of https://github.com/StudiUM/moodle
Sam Hemelryk [Mon, 17 Mar 2014 20:03:21 +0000 (09:03 +1300)]
Merge branch 'MDL-44585-master' of https://github.com/StudiUM/moodle

7 years agoMerge branch 'MDL-44588' of git://github.com/timhunt/moodle
Marina Glancy [Mon, 17 Mar 2014 10:18:36 +0000 (18:18 +0800)]
Merge branch 'MDL-44588' of git://github.com/timhunt/moodle

7 years agoMerge branch 'w12_MDL-44624_m27_dmltest' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 10:12:16 +0000 (18:12 +0800)]
Merge branch 'w12_MDL-44624_m27_dmltest' of git://github.com/skodak/moodle

7 years agoMerge branch 'MDL-44610-m' of git://github.com/micaherne/moodle
Marina Glancy [Mon, 17 Mar 2014 10:08:57 +0000 (18:08 +0800)]
Merge branch 'MDL-44610-m' of git://github.com/micaherne/moodle

7 years agoMerge branch 'MDL-44650' of git://github.com/danielneis/moodle
Marina Glancy [Mon, 17 Mar 2014 09:53:00 +0000 (17:53 +0800)]
Merge branch 'MDL-44650' of git://github.com/danielneis/moodle

7 years agoMerge branch 'w12_MDL-41115_m27_emaillogin' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 09:44:45 +0000 (17:44 +0800)]
Merge branch 'w12_MDL-41115_m27_emaillogin' of git://github.com/skodak/moodle

7 years agoMDL-41115 fix username field label when allowing login via email
Petr Škoda [Mon, 17 Mar 2014 09:34:45 +0000 (17:34 +0800)]
MDL-41115 fix username field label when allowing login via email

Thanks Marina for spotting this!

7 years agoMerge branch 'MDL-44356-M27' of git://github.com/lazydaisy/moodle
Marina Glancy [Mon, 17 Mar 2014 09:08:30 +0000 (17:08 +0800)]
Merge branch 'MDL-44356-M27' of git://github.com/lazydaisy/moodle

7 years agoMerge branch 'master_MDL-39568' of git://github.com/danmarsden/moodle
Marina Glancy [Mon, 17 Mar 2014 08:20:58 +0000 (16:20 +0800)]
Merge branch 'master_MDL-39568' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'w12_MDL-43604_m27_mariadb10' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 08:03:08 +0000 (16:03 +0800)]
Merge branch 'w12_MDL-43604_m27_mariadb10' of git://github.com/skodak/moodle

7 years agoMerge branch 'w12_MDL-44603_m27_extgrade2' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 06:38:01 +0000 (14:38 +0800)]
Merge branch 'w12_MDL-44603_m27_extgrade2' of git://github.com/skodak/moodle

7 years agoMerge branch 'w12_MDL-44500_m27_eventcourse' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 06:32:28 +0000 (14:32 +0800)]
Merge branch 'w12_MDL-44500_m27_eventcourse' of git://github.com/skodak/moodle

7 years agoMerge branch 'w12_MDL-44635_m27_ajaxlogs' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 06:30:03 +0000 (14:30 +0800)]
Merge branch 'w12_MDL-44635_m27_ajaxlogs' of git://github.com/skodak/moodle

7 years agoMerge branch 'w12_MDL-44339_m27_testdebug' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 05:48:27 +0000 (13:48 +0800)]
Merge branch 'w12_MDL-44339_m27_testdebug' of git://github.com/skodak/moodle

7 years agoMerge branch 'w12_MDL-44432_m27_logcron' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 05:03:18 +0000 (13:03 +0800)]
Merge branch 'w12_MDL-44432_m27_logcron' of git://github.com/skodak/moodle

7 years agoMDL-44603 fix incorrect hint for grades related class location
Petr Škoda [Mon, 17 Mar 2014 04:57:21 +0000 (12:57 +0800)]
MDL-44603 fix incorrect hint for grades related class location

Thanks Marina!

7 years agoMDL-44635 discard error logging during ajax tests
Petr Škoda [Sat, 15 Mar 2014 05:48:41 +0000 (13:48 +0800)]
MDL-44635 discard error logging during ajax tests

7 years agoMerge branch 'MDL-44608-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 16 Mar 2014 23:37:02 +0000 (12:37 +1300)]
Merge branch 'MDL-44608-master' of git://github.com/damyon/moodle

7 years agoMDL-44300 force PHP 5.6.x to return raw file names for our own guessing
Petr Škoda [Wed, 12 Mar 2014 08:04:36 +0000 (16:04 +0800)]
MDL-44300 force PHP 5.6.x to return raw file names for our own guessing

7 years agoMerge branch 'w11_MDL-44299_m27_sessiongc' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 16 Mar 2014 23:10:48 +0000 (12:10 +1300)]
Merge branch 'w11_MDL-44299_m27_sessiongc' of https://github.com/skodak/moodle

7 years agoMDL-39568 gradinform_guide: show maxgrade to students when viewing marking guide
Trevor Cunningham [Sun, 16 Mar 2014 19:59:08 +0000 (08:59 +1300)]
MDL-39568 gradinform_guide: show maxgrade to students when viewing marking guide

7 years agoMDL-44356 theme_bootstrapbase: Centralize the drag and drop arrow in filemanager.
Mary Evans [Sat, 15 Mar 2014 21:22:11 +0000 (21:22 +0000)]
MDL-44356 theme_bootstrapbase: Centralize the drag and drop arrow in filemanager.

7 years agoMDL-44603 bump version to update web services
Petr Škoda [Sat, 15 Mar 2014 03:10:10 +0000 (11:10 +0800)]
MDL-44603 bump version to update web services

7 years agoMDL-44603 fix core_grading_external class and test location
Petr Škoda [Sat, 15 Mar 2014 03:08:21 +0000 (11:08 +0800)]
MDL-44603 fix core_grading_external class and test location

7 years agoMDL-44603 add support for external service autoloading
Petr Škoda [Sat, 15 Mar 2014 02:53:39 +0000 (10:53 +0800)]
MDL-44603 add support for external service autoloading

7 years agoMDL-44650 Remove invalid meta tags "pragma" and "expires"
Daniel Neis Araujo [Fri, 14 Mar 2014 21:31:29 +0000 (18:31 -0300)]
MDL-44650 Remove invalid meta tags "pragma" and "expires"

7 years agoMDL-44585 grade_import: Restrict the accepted types in the gradebook import
Gilles-Philippe Leblanc [Thu, 13 Mar 2014 13:35:43 +0000 (09:35 -0400)]
MDL-44585 grade_import: Restrict the accepted types in the gradebook import

7 years agoMDL-44609 add component column to the scheduled task table
Petr Škoda [Fri, 14 Mar 2014 07:00:26 +0000 (15:00 +0800)]
MDL-44609 add component column to the scheduled task table

7 years agoMDL-44624 fix false failures in DML tests
Petr Škoda [Fri, 14 Mar 2014 06:14:10 +0000 (14:14 +0800)]
MDL-44624 fix false failures in DML tests

7 years agoMDL-44599 undeprecate SITEID
Petr Škoda [Thu, 13 Mar 2014 04:06:13 +0000 (12:06 +0800)]
MDL-44599 undeprecate SITEID

There is no way we could implement multitenant now,
it means there is no reason to deprecate SITEID.

7 years agoMDL-44500 detect context-courseid inconsistencies in new events
Petr Škoda [Fri, 7 Mar 2014 07:07:33 +0000 (15:07 +0800)]
MDL-44500 detect context-courseid inconsistencies in new events

7 years agoMDL-44432 use new task scheduler in new logging plugins
Petr Škoda [Thu, 13 Mar 2014 08:01:53 +0000 (16:01 +0800)]
MDL-44432 use new task scheduler in new logging plugins

7 years agoMDL-44604 fix task cleanup in plugin uninstallation
Petr Škoda [Thu, 13 Mar 2014 07:31:39 +0000 (15:31 +0800)]
MDL-44604 fix task cleanup in plugin uninstallation

7 years agoMDL-44608 Scheduled Tasks: Use $CFG->timezone if it is set to schedule tasks
Damyon Wiese [Fri, 14 Mar 2014 03:43:13 +0000 (11:43 +0800)]
MDL-44608 Scheduled Tasks: Use $CFG->timezone if it is set to schedule tasks

7 years agoMDL-44339 treat unexpected debugging() calls in phpunit tests as errors
Petr Škoda [Thu, 13 Mar 2014 05:52:31 +0000 (13:52 +0800)]
MDL-44339 treat unexpected debugging() calls in phpunit tests as errors

7 years agoMDL-43604 add support for future hacky MariaDB versions
Petr Škoda [Tue, 11 Mar 2014 01:07:21 +0000 (09:07 +0800)]
MDL-43604 add support for future hacky MariaDB versions

This patch also shows the real server version without
normalisation on the environment page, this should
hopefully help people to identify MariaDB...

7 years agoMDL-41115 add option to allow login via email
Petr Škoda [Thu, 13 Mar 2014 03:23:26 +0000 (11:23 +0800)]
MDL-41115 add option to allow login via email

7 years agoweekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 13 Mar 2014 22:55:50 +0000 (23:55 +0100)]
weekly release 2.7dev

7 years agoMDL-43266 testing: avoid assoc arrays for json
Eloy Lafuente (stronk7) [Wed, 12 Mar 2014 22:32:27 +0000 (23:32 +0100)]
MDL-43266 testing: avoid assoc arrays for json

Last commit switched from raw arrays to associative
arrays. That leads to json_encode() to generate an
object instead of an array, ultimately leading to
problems with the rest of code expecting an array.

By using array_values() we are moving back to the
non-associative array.

Also, fix some file permissions.

7 years agoMerge branch 'MDL-43266_master-last-fixes' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 13 Mar 2014 18:12:25 +0000 (19:12 +0100)]
Merge branch 'MDL-43266_master-last-fixes' of git://github.com/dmonllao/moodle

Conflicts:
lib/phpunit/classes/util.php

7 years agoNOBUG: Bump version
Eloy Lafuente (stronk7) [Thu, 13 Mar 2014 17:34:56 +0000 (18:34 +0100)]
NOBUG: Bump version

7 years agoMDL-33653 quiz: remove unused string
Dan Poltawski [Thu, 13 Mar 2014 07:27:07 +0000 (15:27 +0800)]
MDL-33653 quiz: remove unused string

7 years agoRevert "MDL-40699 Language - Add option to Override Moodle's default behaviour to...
Sam Hemelryk [Thu, 13 Mar 2014 03:34:35 +0000 (16:34 +1300)]
Revert "MDL-40699 Language - Add option to Override Moodle's default behaviour to reset the UI language on logout"

This reverts commit 08174740fbdc5d0a86d67c3736d4c78dced11331.

7 years agoMDL-43497 role: added missing string
Sam Hemelryk [Wed, 12 Mar 2014 21:15:32 +0000 (10:15 +1300)]
MDL-43497 role: added missing string

7 years agoMDL-44534 also fix the mod_quiz behat tests.
Tim Hunt [Wed, 12 Mar 2014 16:42:01 +0000 (16:42 +0000)]
MDL-44534 also fix the mod_quiz behat tests.

They had duplicated code. I refactored.

7 years agoMDL-44236 behat: Fixing wrong old step call
David Monllao [Wed, 12 Mar 2014 09:00:20 +0000 (17:00 +0800)]
MDL-44236 behat: Fixing wrong old step call

7 years agoMDL-44334 lockscroll: Fix wrong warning message
Frederic Massart [Wed, 12 Mar 2014 07:32:24 +0000 (15:32 +0800)]
MDL-44334 lockscroll: Fix wrong warning message

7 years agoMerge branch 'MDL-40913_master-fix' of https://github.com/markn86/moodle
Dan Poltawski [Wed, 12 Mar 2014 05:56:46 +0000 (13:56 +0800)]
Merge branch 'MDL-40913_master-fix' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-43236_master-fix-tablenode' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 12 Mar 2014 05:47:11 +0000 (13:47 +0800)]
Merge branch 'MDL-43236_master-fix-tablenode' of git://github.com/dmonllao/moodle

7 years agoMDL-40913 core_message: fixed triggering the 'message_sent' event when the 'noreply...
Mark Nelson [Wed, 12 Mar 2014 03:28:46 +0000 (20:28 -0700)]
MDL-40913 core_message: fixed triggering the 'message_sent' event when the 'noreply' address is used

7 years agoMDL-44337 behat grammer improvements, see MDL-43236
Marina Glancy [Wed, 12 Mar 2014 04:01:55 +0000 (12:01 +0800)]
MDL-44337 behat grammer improvements, see MDL-43236

7 years agoMDL-43236 behat: Include missing used namespace
David Monllao [Wed, 12 Mar 2014 05:32:47 +0000 (13:32 +0800)]
MDL-43236 behat: Include missing used namespace

7 years agoMerge branch 'master_MDL-37733' of git://github.com/danmarsden/moodle
Sam Hemelryk [Wed, 12 Mar 2014 01:13:10 +0000 (14:13 +1300)]
Merge branch 'master_MDL-37733' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'MDL-44061-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 12 Mar 2014 01:08:50 +0000 (09:08 +0800)]
Merge branch 'MDL-44061-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-40699-UI-language-changes-when-logging-out-of-Moodle' of git:/...
Sam Hemelryk [Tue, 11 Mar 2014 23:31:18 +0000 (12:31 +1300)]
Merge branch 'MDL-40699-UI-language-changes-when-logging-out-of-Moodle' of git://github.com/michael-milette/moodle

7 years agoMerge branch 'wip-MDL-32699-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 11 Mar 2014 23:17:52 +0000 (00:17 +0100)]
Merge branch 'wip-MDL-32699-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-42368-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 11 Mar 2014 22:56:51 +0000 (11:56 +1300)]
Merge branch 'MDL-42368-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'mdl27_mdl-43497_allow_force_language_02' of https://github.com/brki...
Eloy Lafuente (stronk7) [Thu, 13 Mar 2014 17:33:15 +0000 (18:33 +0100)]
Merge branch 'mdl27_mdl-43497_allow_force_language_02' of https://github.com/brki/moodle

7 years agoMerge branch 'MDL-44345-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 11 Mar 2014 22:21:48 +0000 (11:21 +1300)]
Merge branch 'MDL-44345-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-41173' of https://github.com/danielneis/moodle
Sam Hemelryk [Tue, 11 Mar 2014 22:19:02 +0000 (11:19 +1300)]
Merge branch 'MDL-41173' of https://github.com/danielneis/moodle

7 years agoMerge branch 'MDL-44478-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 11 Mar 2014 09:53:49 +0000 (17:53 +0800)]
Merge branch 'MDL-44478-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-44534' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 13 Mar 2014 17:32:41 +0000 (18:32 +0100)]
Merge branch 'MDL-44534' of git://github.com/timhunt/moodle

Conflicts:
question/tests/behat/copy_questions.feature

7 years agoMerge branch 'MDL-33653' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 11 Mar 2014 09:06:14 +0000 (17:06 +0800)]
Merge branch 'MDL-33653' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-40913_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 11 Mar 2014 08:59:16 +0000 (16:59 +0800)]
Merge branch 'MDL-40913_master' of https://github.com/markn86/moodle

7 years agoMDL-43967 logging: references to the migrating dev docs
Marina Glancy [Thu, 6 Mar 2014 08:12:13 +0000 (16:12 +0800)]
MDL-43967 logging: references to the migrating dev docs

7 years agoMerge branch 'MDL-44095' of https://github.com/shashirepo/moodle
Dan Poltawski [Tue, 11 Mar 2014 07:50:41 +0000 (15:50 +0800)]
Merge branch 'MDL-44095' of https://github.com/shashirepo/moodle

7 years agoMerge branch 'wip-MDL-44337-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 11 Mar 2014 07:41:57 +0000 (15:41 +0800)]
Merge branch 'wip-MDL-44337-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'wip-mdl-44458' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 11 Mar 2014 07:30:02 +0000 (15:30 +0800)]
Merge branch 'wip-mdl-44458' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-30085 bump version
Dan Poltawski [Tue, 11 Mar 2014 06:54:26 +0000 (14:54 +0800)]
MDL-30085 bump version

7 years agoMDL-44610 enrol Enable autoloading of enrolment plugins
Michael Aherne [Thu, 13 Mar 2014 09:16:01 +0000 (09:16 +0000)]
MDL-44610 enrol Enable autoloading of enrolment plugins

7 years agoMDL-44588 quiz: fix crazy variable called $this.
Tim Hunt [Wed, 12 Mar 2014 18:13:43 +0000 (18:13 +0000)]
MDL-44588 quiz: fix crazy variable called $this.

7 years agoMDL-43266 testing: Removing duplicated keys
David Monllao [Wed, 12 Mar 2014 09:49:55 +0000 (17:49 +0800)]
MDL-43266 testing: Removing duplicated keys

7 years agoMDL-44299 resolve collision with session_gc() in PHP 5.6
Petr Škoda [Wed, 12 Mar 2014 02:43:30 +0000 (10:43 +0800)]
MDL-44299 resolve collision with session_gc() in PHP 5.6

7 years agoMDL-44458 notes: Fixed url in events
Rajesh Taneja [Wed, 5 Mar 2014 08:03:56 +0000 (16:03 +0800)]
MDL-44458 notes: Fixed url in events

7 years agoMDL-44462 mobile: Add mod_assign functions to service definition
Juan Leyva [Wed, 5 Mar 2014 10:59:26 +0000 (11:59 +0100)]
MDL-44462 mobile: Add mod_assign functions to service definition

To support new functionality in the Moodle Mobile app.

7 years agoMerge branch 'MDL-44480-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 11 Mar 2014 06:35:51 +0000 (14:35 +0800)]
Merge branch 'MDL-44480-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js

7 years agoMerge branch 'MDL-41855' of git://github.com/nobelium/moodle
Dan Poltawski [Tue, 11 Mar 2014 04:59:23 +0000 (12:59 +0800)]
Merge branch 'MDL-41855' of git://github.com/nobelium/moodle

7 years agoMerge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 11 Mar 2014 04:42:27 +0000 (12:42 +0800)]
Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'MDL-44497-master' of https://github.com/jamiepratt/moodle
Dan Poltawski [Tue, 11 Mar 2014 04:35:57 +0000 (12:35 +0800)]
Merge branch 'MDL-44497-master' of https://github.com/jamiepratt/moodle

7 years agoMDL-40699 Language - Add option to Override Moodle's default behaviour to reset the...
Michael Milette [Thu, 6 Mar 2014 13:53:54 +0000 (08:53 -0500)]
MDL-40699 Language - Add option to Override Moodle's default behaviour to reset the UI language on logout

This change adds an option to the Site Admin > Langauge > Language Settings page which can prevent Moodle from changing language when users log out.

Affected files:
lang/en/admin.php
admin/settings/language.php
login/logout.php

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
7 years agoMerge branch 'wip-MDL-42870-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 11 Mar 2014 03:37:44 +0000 (11:37 +0800)]
Merge branch 'wip-MDL-42870-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'master_MDL-44066' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 11 Mar 2014 03:28:56 +0000 (11:28 +0800)]
Merge branch 'master_MDL-44066' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'wip-MDL-43966-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 11 Mar 2014 02:50:55 +0000 (10:50 +0800)]
Merge branch 'wip-MDL-43966-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-43236 behat: Fixing missing changes
David Monllao [Tue, 11 Mar 2014 02:04:22 +0000 (10:04 +0800)]
MDL-43236 behat: Fixing missing changes

All "" "" should exists and "" "" should not exists
must be converted to the ones using exist rather than exists.

7 years agoMerge branch 'wip-MDL-40721-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 11 Mar 2014 01:22:33 +0000 (14:22 +1300)]
Merge branch 'wip-MDL-40721-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'w11_MDL-44451_m27_addonloc' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 11 Mar 2014 01:18:08 +0000 (14:18 +1300)]
Merge branch 'w11_MDL-44451_m27_addonloc' of https://github.com/skodak/moodle

7 years agoMerge branch '44547-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 10 Mar 2014 23:28:34 +0000 (00:28 +0100)]
Merge branch '44547-27' of git://github.com/samhemelryk/moodle

7 years agoMDL-44547 repository_alfresco: version bump
Sam Hemelryk [Mon, 10 Mar 2014 23:05:22 +0000 (12:05 +1300)]
MDL-44547 repository_alfresco: version bump

7 years agoMDL-44496 fixed renamed method ref in comment
Sam Hemelryk [Mon, 10 Mar 2014 22:54:52 +0000 (11:54 +1300)]
MDL-44496 fixed renamed method ref in comment

7 years agoMerge branch 'w11_MDL-44496_m27_eventbuffer' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 10 Mar 2014 22:54:05 +0000 (11:54 +1300)]
Merge branch 'w11_MDL-44496_m27_eventbuffer' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-44334-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 10 Mar 2014 21:10:08 +0000 (10:10 +1300)]
Merge branch 'MDL-44334-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-43721-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 10 Mar 2014 20:19:44 +0000 (09:19 +1300)]
Merge branch 'MDL-43721-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'wip-MDL-44471-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 10 Mar 2014 19:51:36 +0000 (08:51 +1300)]
Merge branch 'wip-MDL-44471-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-41855 SCORM form : Auto update frequency option under File manager
Nobelium [Mon, 10 Mar 2014 14:03:33 +0000 (14:03 +0000)]
MDL-41855 SCORM form : Auto update frequency option under File manager

Placing the Auto update frequency option underneath the File manager in /mod/scorm/mod_form.php
This changes the postion of the auto update freq option both while creating a new scorm object and while editing the scorm object.

7 years agoMDL-44534 increase core_question Behat test robustness.
Tim Hunt [Mon, 10 Mar 2014 12:32:39 +0000 (12:32 +0000)]
MDL-44534 increase core_question Behat test robustness.

7 years agoMerge branch 'wip-mdl-44017' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 10 Mar 2014 07:13:43 +0000 (15:13 +0800)]
Merge branch 'wip-mdl-44017' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-44440_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 10 Mar 2014 05:45:26 +0000 (13:45 +0800)]
Merge branch 'MDL-44440_master' of git://github.com/dmonllao/moodle

7 years agoMDL-44440 behat: Changing , for > as a navigation tree nodes separator
David Monllao [Mon, 10 Mar 2014 05:31:01 +0000 (13:31 +0800)]
MDL-44440 behat: Changing , for > as a navigation tree nodes separator

Using greater than as seems a more natural separator
than the comma when separating nodes which have a
hierarchy relation.