moodle.git
8 years agoMerge branch 'MDL-43687' of https://github.com/mkassaei/moodle
Eloy Lafuente (stronk7) [Mon, 3 Feb 2014 23:16:48 +0000 (00:16 +0100)]
Merge branch 'MDL-43687' of https://github.com/mkassaei/moodle

8 years agoMerge branch 'wip-MDL-43821-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 3 Feb 2014 23:11:20 +0000 (00:11 +0100)]
Merge branch 'wip-MDL-43821-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'wip-MDL-43828-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 3 Feb 2014 22:58:07 +0000 (23:58 +0100)]
Merge branch 'wip-MDL-43828-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-43886-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 3 Feb 2014 22:14:11 +0000 (11:14 +1300)]
Merge branch 'MDL-43886-master' of git://github.com/andrewnicols/moodle

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

8 years agoMerge branch 'MDL-43892' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 3 Feb 2014 21:57:26 +0000 (10:57 +1300)]
Merge branch 'MDL-43892' of git://github.com/timhunt/moodle

8 years agoMerge branch 'wip-MDL-33920-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 3 Feb 2014 21:47:00 +0000 (10:47 +1300)]
Merge branch 'wip-MDL-33920-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-43893-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 3 Feb 2014 21:23:24 +0000 (10:23 +1300)]
Merge branch 'MDL-43893-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'w04_MDL-43903_m27_mssqltests' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 3 Feb 2014 21:22:42 +0000 (10:22 +1300)]
Merge branch 'w04_MDL-43903_m27_mssqltests' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-43936' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 3 Feb 2014 21:11:44 +0000 (10:11 +1300)]
Merge branch 'MDL-43936' of git://github.com/timhunt/moodle

8 years agoMDL-40410 remove ampersands required for PHP strict standards lib/tablelib.php
Gordon Bateson [Tue, 28 Jan 2014 07:43:47 +0000 (16:43 +0900)]
MDL-40410 remove ampersands required for PHP strict standards lib/tablelib.php

8 years agoMerge branch 'wip-mdl-40911' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 3 Feb 2014 20:53:16 +0000 (09:53 +1300)]
Merge branch 'wip-mdl-40911' of https://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-43884-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 3 Feb 2014 20:11:27 +0000 (09:11 +1300)]
Merge branch 'MDL-43884-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-39617 backup: language improvements to cli/backup.php
Sam Hemelryk [Mon, 3 Feb 2014 20:04:01 +0000 (09:04 +1300)]
MDL-39617 backup: language improvements to cli/backup.php

8 years agoMerge branch 'MDL-39617-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Mon, 3 Feb 2014 19:41:37 +0000 (08:41 +1300)]
Merge branch 'MDL-39617-master' of https://github.com/lucisgit/moodle

8 years agoMerge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle
Sam Hemelryk [Mon, 3 Feb 2014 19:28:56 +0000 (08:28 +1300)]
Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle

8 years agoMerge branch 'master_MDL-37714' of git://github.com/greg-or/moodle
Eloy Lafuente (stronk7) [Mon, 3 Feb 2014 16:58:30 +0000 (17:58 +0100)]
Merge branch 'master_MDL-37714' of git://github.com/greg-or/moodle

8 years agoMerge branch 'MDL-41647' of git://github.com/apsdehal/moodle
Marina Glancy [Mon, 3 Feb 2014 09:34:20 +0000 (17:34 +0800)]
Merge branch 'MDL-41647' of git://github.com/apsdehal/moodle

8 years agoMerge branch 'MDL-43805-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 3 Feb 2014 08:09:09 +0000 (16:09 +0800)]
Merge branch 'MDL-43805-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'w05_MDL-43905_m27_loginevents' of git://github.com/skodak/moodle
Marina Glancy [Mon, 3 Feb 2014 07:17:18 +0000 (15:17 +0800)]
Merge branch 'w05_MDL-43905_m27_loginevents' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-43593-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 3 Feb 2014 07:06:11 +0000 (15:06 +0800)]
Merge branch 'MDL-43593-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-43951_master' of git://github.com/dmonllao/moodle
Marina Glancy [Mon, 3 Feb 2014 06:53:45 +0000 (14:53 +0800)]
Merge branch 'MDL-43951_master' of git://github.com/dmonllao/moodle

8 years agoMDL-43951 behat: Fixing random failure
David Monllao [Mon, 3 Feb 2014 04:15:24 +0000 (12:15 +0800)]
MDL-43951 behat: Fixing random failure

NodeElement->hasAttribute() (JS enabled) queries selenium
about whether it has any attribute or not, if due to an
AJAX request the field node changed selenium can not access
that node and throws an exception.

8 years agoMerge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle
Marina Glancy [Mon, 3 Feb 2014 05:42:23 +0000 (13:42 +0800)]
Merge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle

8 years agoMDL-41647 WebServices: Changed notification CSS class
apsdehal [Tue, 28 Jan 2014 16:00:59 +0000 (21:30 +0530)]
MDL-41647 WebServices: Changed notification CSS class

8 years agoMDL-43936 questions: document renderer API change.
Tim Hunt [Fri, 31 Jan 2014 14:12:19 +0000 (14:12 +0000)]
MDL-43936 questions: document renderer API change.

8 years agoMDL-43926 Unit tests shouldn't assume only one category on install
Tim Hunt [Thu, 30 Jan 2014 18:03:00 +0000 (18:03 +0000)]
MDL-43926 Unit tests shouldn't assume only one category on install

8 years agoMDL-43828 forum: allow to select single available group when posting
Marina Glancy [Thu, 23 Jan 2014 07:41:15 +0000 (15:41 +0800)]
MDL-43828 forum: allow to select single available group when posting

8 years agoMDL-43821 completion: fix bug in section completion progress
Marina Glancy [Thu, 30 Jan 2014 03:10:12 +0000 (11:10 +0800)]
MDL-43821 completion: fix bug in section completion progress

Thanks to Shane Dye for the provided patch

8 years agoMDL-33920 filepicker: hide 'save as' field when not applicable
Marina Glancy [Tue, 28 Jan 2014 06:29:57 +0000 (14:29 +0800)]
MDL-33920 filepicker: hide 'save as' field when not applicable

8 years agoweekly release 2.7dev
Marina Glancy [Fri, 31 Jan 2014 06:11:12 +0000 (14:11 +0800)]
weekly release 2.7dev

8 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Marina Glancy [Fri, 31 Jan 2014 06:11:11 +0000 (14:11 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

8 years agoMDL-43905 fix update of user login times
Petr Škoda [Fri, 24 Jan 2014 01:59:40 +0000 (09:59 +0800)]
MDL-43905 fix update of user login times

There needs to be only one event during user login.
The timemodified field is not supposed to be updated during login.

8 years agoMDL-37714: Correctly identify frequently used comments during restore
Gregory Faller [Thu, 30 Jan 2014 23:56:11 +0000 (10:26 +1030)]
MDL-37714: Correctly identify frequently used comments during restore

8 years agoMDL-42928 Filepicker: Disable behat tests run by phantom
Andrew Nicols [Thu, 30 Jan 2014 08:53:54 +0000 (16:53 +0800)]
MDL-42928 Filepicker: Disable behat tests run by phantom

There seems to be a bug relating to overflow: hidden on the body tag in
some cases which is only showing for dialogues which belong to the
filepicker.

Disabling these for the moment as this issue may be related to MDL-43712
which is a work in progress.

8 years agoMDL-40911 events: replaced add_to_log with events for login failed
Rajesh Taneja [Wed, 29 Jan 2014 05:27:50 +0000 (13:27 +0800)]
MDL-40911 events: replaced add_to_log with events for login failed

8 years agoMDL-43903 prevent adodb error logging output in phpunit execution with
Petr Škoda [Wed, 29 Jan 2014 09:09:48 +0000 (17:09 +0800)]
MDL-43903 prevent adodb error logging output in phpunit execution with
native ms sql driver

8 years agoMDL-43805 assign: Behat test for quickgrading bug
Damyon Wiese [Thu, 23 Jan 2014 08:41:34 +0000 (16:41 +0800)]
MDL-43805 assign: Behat test for quickgrading bug

8 years agoMDL-43805 Assign: Quickgrading wipes out grades for hidden columns.
Damyon Wiese [Thu, 23 Jan 2014 05:23:15 +0000 (13:23 +0800)]
MDL-43805 Assign: Quickgrading wipes out grades for hidden columns.

Grr.. quickgrading will always be a hack.

8 years agoMDL-43687, convert question/preview.js to the new yui format
M Kassaei [Tue, 14 Jan 2014 11:40:57 +0000 (11:40 +0000)]
MDL-43687, convert question/preview.js to the new yui format

8 years agoMDL-43450 behat: Checking the ->behat_* vars contents before showing the steps list
David Monllao [Wed, 29 Jan 2014 06:28:37 +0000 (14:28 +0800)]
MDL-43450 behat: Checking the ->behat_* vars contents before showing the steps list

8 years agoMerge branch 'MDL-25500-master-fix1' of git://github.com/damyon/moodle
Marina Glancy [Wed, 29 Jan 2014 04:01:33 +0000 (12:01 +0800)]
Merge branch 'MDL-25500-master-fix1' of git://github.com/damyon/moodle

8 years agoMDL-25500 Lock: Unit tests have found that MySQL locks are broken
Damyon Wiese [Wed, 29 Jan 2014 03:52:51 +0000 (11:52 +0800)]
MDL-25500 Lock: Unit tests have found that MySQL locks are broken

Removing the MySQL lock factory, the only safe way to use this MySQL API
would be to open a new DB connection for every lock. Record locking is a decent
fallback.

8 years agoMDL-43736 Events: Updated unit test to test context not used in event
Rajesh Taneja [Tue, 21 Jan 2014 09:04:37 +0000 (17:04 +0800)]
MDL-43736 Events: Updated unit test to test context not used in event

8 years agoMDL-43736 Events: event->contextinstanceid should be used where possible
Rajesh Taneja [Fri, 17 Jan 2014 04:52:34 +0000 (12:52 +0800)]
MDL-43736 Events: event->contextinstanceid should be used where possible

While restoring event context might not be present (deleted)
So before using context api's check context or use event properties

8 years agoMerge branch 'MDL-43040'
Eloy Lafuente (stronk7) [Wed, 29 Jan 2014 00:52:49 +0000 (01:52 +0100)]
Merge branch 'MDL-43040'

8 years agoMDL-43040 Note the deprecation and add some TODOs
Eloy Lafuente (stronk7) [Wed, 29 Jan 2014 00:40:30 +0000 (01:40 +0100)]
MDL-43040 Note the deprecation and add some TODOs

8 years agoMDL-25500 lock: post integration trivial cleanup
Sam Hemelryk [Wed, 29 Jan 2014 00:21:52 +0000 (13:21 +1300)]
MDL-25500 lock: post integration trivial cleanup

* A couple of misc comment typo's
* Added missing $CFG required global in file_lock_factory::is_available
* Removed unused $CFG global from file_lock_factory::get_lock
* A couple of trivial phpdoc tweaks
* Removed unused $DB global from postgres_lock_factory::get_index_from_key
* Added global namespace \ to exceptions in get_index_from_key (tested and found they didn't resolve)

8 years agoMerge branch 'MDL-25500-master-squashed' of git://github.com/damyon/moodle
Sam Hemelryk [Wed, 29 Jan 2014 00:21:00 +0000 (13:21 +1300)]
Merge branch 'MDL-25500-master-squashed' of git://github.com/damyon/moodle

8 years agoMDL-43040 Replace $module with $plugin in all mod/*/version.php
Tomasz Muras [Sun, 24 Nov 2013 13:24:51 +0000 (14:24 +0100)]
MDL-43040 Replace $module with $plugin in all mod/*/version.php

Conflicts:
mod/quiz/version.php

8 years agoMerge branch 'MDL-40909_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 28 Jan 2014 19:23:51 +0000 (08:23 +1300)]
Merge branch 'MDL-40909_master' of https://github.com/markn86/moodle

8 years agoMDL-43893 Javascript: Remove YUI2 uses in group members management JS
Andrew Nicols [Tue, 28 Jan 2014 16:12:55 +0000 (00:12 +0800)]
MDL-43893 Javascript: Remove YUI2 uses in group members management JS

8 years agoMDL-43886 Javascript: Remove dialouges from the DOM upon destroy
Andrew Nicols [Tue, 28 Jan 2014 15:54:32 +0000 (23:54 +0800)]
MDL-43886 Javascript: Remove dialouges from the DOM upon destroy

8 years agoMDL-43892 dbtransfer: Fix missing string.
Tim Hunt [Tue, 28 Jan 2014 15:55:41 +0000 (15:55 +0000)]
MDL-43892 dbtransfer: Fix missing string.

8 years agoMDL-39617 Add cli backup script for a single course backing up.
Ruslan Kabalin [Fri, 10 May 2013 10:22:56 +0000 (11:22 +0100)]
MDL-39617 Add cli backup script for a single course backing up.

Useful for backing up a single course. Accepts parameters:

--courseid=INTEGER        Course ID for backup
--courseshortname=STRING  Course shortname for backup.
--destination=STRING      Path where to store backup file. If not set, the backup
                          will stored within the same course backup area.

8 years agoMDL-25500 Lock: Do not use file locking if $CFG->preventfilelocking is set
Damyon Wiese [Tue, 28 Jan 2014 12:14:05 +0000 (20:14 +0800)]
MDL-25500 Lock: Do not use file locking if $CFG->preventfilelocking is set

(And file_lock_dir is not prefixed with the dataroot).

8 years agoMerge branch 'MDL-42928-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jan 2014 11:22:23 +0000 (12:22 +0100)]
Merge branch 'MDL-42928-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'w04_MDL-34055_m27_insertrecords' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jan 2014 09:43:51 +0000 (10:43 +0100)]
Merge branch 'w04_MDL-34055_m27_insertrecords' of https://github.com/skodak/moodle

8 years agoMDL-43884 database: Fix get_tables() api for external stores
Ankit Agarwal [Tue, 28 Jan 2014 07:59:49 +0000 (15:59 +0800)]
MDL-43884 database: Fix get_tables() api for external stores

8 years agoMDL-40909 enrol_imsenterprise: removed 'new' add_to_log call
Mark Nelson [Tue, 14 Jan 2014 01:00:56 +0000 (17:00 -0800)]
MDL-40909 enrol_imsenterprise: removed 'new' add_to_log call

Here we are replacing the unnecessary code used to create a course with
a call to create_course(), which triggers the event 'course_created'.
Nothing more is needed.

8 years agoMDL-40909 core_enrol: removed 'enrol' add_to_log calls
Mark Nelson [Tue, 14 Jan 2014 00:31:55 +0000 (16:31 -0800)]
MDL-40909 core_enrol: removed 'enrol' add_to_log calls

Before each of these calls a call to enrol_user() is made, which
triggers the event 'user_enrolment_created'. Nothing more is needed.

8 years agoMDL-40909 core_enrol: removed 'unenrol' add_to_log calls
Mark Nelson [Mon, 13 Jan 2014 23:46:34 +0000 (15:46 -0800)]
MDL-40909 core_enrol: removed 'unenrol' add_to_log calls

Before each of these calls a call to unenrol_user() is made, which
triggers the event 'user_enrolment_deleted'. Nothing more is needed.

8 years agoMDL-39942: invite only users who can post to discuss
Kevin Wiliarty [Tue, 20 Aug 2013 21:48:10 +0000 (17:48 -0400)]
MDL-39942: invite only users who can post to discuss

8 years agoMDL-40909 mod_forum: removed duplicated test (duplicated in enrol/meta/tests/plugin_t...
Mark Nelson [Tue, 14 Jan 2014 00:16:22 +0000 (16:16 -0800)]
MDL-40909 mod_forum: removed duplicated test (duplicated in enrol/meta/tests/plugin_test.php)

8 years agoMDL-34055 add bulk DB->insert_records() method
Petr Škoda [Sat, 18 Jan 2014 08:03:31 +0000 (16:03 +0800)]
MDL-34055 add bulk DB->insert_records() method

This patch was inspired by patch by Simon Coggins from Totara.

8 years agoMDL-42928 JavaScript: Disable lockScroll for small chooserdialogues
Andrew Nicols [Sat, 16 Nov 2013 01:01:16 +0000 (09:01 +0800)]
MDL-42928 JavaScript: Disable lockScroll for small chooserdialogues

8 years agoMDL-42928 JavaScript: Add LockScroll to all modal dialogues
Andrew Nicols [Sat, 16 Nov 2013 00:59:37 +0000 (08:59 +0800)]
MDL-42928 JavaScript: Add LockScroll to all modal dialogues

8 years agoMDL-42928 JavaScript: Create a module to handle page scroll locking
Andrew Nicols [Sat, 16 Nov 2013 00:54:22 +0000 (08:54 +0800)]
MDL-42928 JavaScript: Create a module to handle page scroll locking

8 years agoMerge branch 'master_MDL-43797' of https://github.com/totara/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 23:43:16 +0000 (00:43 +0100)]
Merge branch 'master_MDL-43797' of https://github.com/totara/moodle

8 years agoMDL-43797 lib/db/upgrade.php: Optimise sql for my_pages deletion
David Curry [Mon, 27 Jan 2014 22:56:37 +0000 (11:56 +1300)]
MDL-43797 lib/db/upgrade.php: Optimise sql for my_pages deletion

Change-Id: Idf300ab07afda3bcefea80e617549f40c710e529

8 years agoMerge branch 'MDL-43246' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 27 Jan 2014 23:16:20 +0000 (12:16 +1300)]
Merge branch 'MDL-43246' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-43450_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 23:07:57 +0000 (00:07 +0100)]
Merge branch 'MDL-43450_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch '43688-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 22:58:18 +0000 (23:58 +0100)]
Merge branch '43688-27' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMDL-43797 lib/db/upgrade.php: Remove custom pages for deleted users
David Curry [Wed, 22 Jan 2014 21:56:47 +0000 (10:56 +1300)]
MDL-43797 lib/db/upgrade.php: Remove custom pages for deleted users

Change-Id: Ifef563431682a2a5524927f85ca9eba9cbe520ff

8 years agoMerge branch 'MDL-43874' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 22:52:07 +0000 (23:52 +0100)]
Merge branch 'MDL-43874' of git://github.com/timhunt/moodle

8 years agoMDL-43797 lib/moodlelib.php: Remove custom homepages on user deletion
David Curry [Wed, 22 Jan 2014 02:37:23 +0000 (15:37 +1300)]
MDL-43797 lib/moodlelib.php: Remove custom homepages on user deletion

Change-Id: Ibaf6f0a9dc29d00b97a32111d1cf5063ebed1888

8 years agoMerge branch 'MDL-43757_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 20:11:03 +0000 (21:11 +0100)]
Merge branch 'MDL-43757_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'wip-MDL-43643-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 27 Jan 2014 19:40:45 +0000 (08:40 +1300)]
Merge branch 'wip-MDL-43643-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'wip-mdl-43765' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 18:23:09 +0000 (19:23 +0100)]
Merge branch 'wip-mdl-43765' of https://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'wip-mdl-43766' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 18:19:31 +0000 (19:19 +0100)]
Merge branch 'wip-mdl-43766' of https://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-43773-master' of https://github.com/lucisgit/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 16:18:56 +0000 (17:18 +0100)]
Merge branch 'MDL-43773-master' of https://github.com/lucisgit/moodle

8 years agoMerge branch 'MDL-43581' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 16:03:25 +0000 (17:03 +0100)]
Merge branch 'MDL-43581' of git://github.com/timhunt/moodle

8 years agoMDL-43874 quiz, teacher comments should respect display options.
Tim Hunt [Mon, 27 Jan 2014 11:57:55 +0000 (11:57 +0000)]
MDL-43874 quiz, teacher comments should respect display options.

Whether the comments on manually graded questions were visible to
students should have been controlled by the 'Specific feedback' Review
option in the quiz settings. However, the quiz was not setting
$displayoptions->manualcomment, so it did not work.

8 years agoMerge branch 'wip-MDL-43800-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 11:02:28 +0000 (12:02 +0100)]
Merge branch 'wip-MDL-43800-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-43581 additionalhtmlfooter should be added to every page
Tim Hunt [Thu, 23 Jan 2014 15:35:53 +0000 (15:35 +0000)]
MDL-43581 additionalhtmlfooter should be added to every page

Not just pages with a visible footer.

8 years agoMerge branch 'MDL-43809' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 09:59:37 +0000 (10:59 +0100)]
Merge branch 'MDL-43809' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-33839c' of git://github.com/mkassaei/moodle
Sam Hemelryk [Mon, 27 Jan 2014 02:28:47 +0000 (15:28 +1300)]
Merge branch 'MDL-33839c' of git://github.com/mkassaei/moodle

8 years agoMDL-25500 lock: New locking framework.
Damyon Wiese [Tue, 17 Dec 2013 08:00:29 +0000 (16:00 +0800)]
MDL-25500 lock: New locking framework.

This locking system is designed to be used everywhere requiring
locking in Moodle. Each use of the locking system can be configured
to use a different type of locking (or the same type with a different
configuration).

The first supported lock types are memcache, memcached, file (flock),
db (specific handlers for pg, mysql and mariadb).

8 years agoMerge branch 'w04_MDL-43761_m27_sqlinstall' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 27 Jan 2014 01:30:57 +0000 (14:30 +1300)]
Merge branch 'w04_MDL-43761_m27_sqlinstall' of https://github.com/skodak/moodle

8 years agoAutomatically generated installer lang files
AMOS bot [Mon, 27 Jan 2014 00:42:35 +0000 (00:42 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-43758_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 00:18:05 +0000 (01:18 +0100)]
Merge branch 'MDL-43758_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-43734_purgeUserSession' of https://github.com/moodlerooms/moodle
Eloy Lafuente (stronk7) [Sun, 26 Jan 2014 23:26:44 +0000 (00:26 +0100)]
Merge branch 'MDL-43734_purgeUserSession' of https://github.com/moodlerooms/moodle

8 years agoMerge branch 'w04_MDL-43746_m27_courselogin' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 26 Jan 2014 22:32:08 +0000 (11:32 +1300)]
Merge branch 'w04_MDL-43746_m27_courselogin' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-43794' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Sun, 26 Jan 2014 22:16:11 +0000 (11:16 +1300)]
Merge branch 'MDL-43794' of https://github.com/merrill-oakland/moodle

8 years agoMDL-43440 unit testing: Use cmid in unit tests when it should be used.
Russell Smith [Thu, 23 Jan 2014 23:32:21 +0000 (10:32 +1100)]
MDL-43440 unit testing: Use cmid in unit tests when it should be used.

instance is has been used instead of cmid.  This works as all id's are 1
in most cases, but not always.

accesslib_clear_all_caches_for_unit_testing was updated to clear the
$USER->access cache which would fail test when the wrong user's data was used.

8 years agoMDL-43440 unit tests Use correct cm identifier in unit tests
Michael Aherne [Wed, 18 Dec 2013 10:22:07 +0000 (10:22 +0000)]
MDL-43440 unit tests Use correct cm identifier in unit tests

8 years agoMDL-33839d, Remove the move icon from the question bank
M Kassaei [Fri, 24 Jan 2014 14:08:19 +0000 (14:08 +0000)]
MDL-33839d, Remove the move icon from the question bank

8 years agoMDL-43773 mod_choice: Swap order of name column headings in text export
Tony Butler [Mon, 20 Jan 2014 15:42:00 +0000 (15:42 +0000)]
MDL-43773 mod_choice: Swap order of name column headings in text export

8 years agoMDL-43450 behat: Improving error messages
David Monllao [Fri, 10 Jan 2014 08:44:23 +0000 (16:44 +0800)]
MDL-43450 behat: Improving error messages

8 years agoMDL-43593 Assign editpdf: More robust handling of errors from TCPDF.
Damyon Wiese [Fri, 24 Jan 2014 05:52:53 +0000 (13:52 +0800)]
MDL-43593 Assign editpdf: More robust handling of errors from TCPDF.

This includes a check to see if there are 0 pages in the combined pdf,
catching exceptions and suppressing php warnings and errors from bad pdf files.

Also - Use TCPDF directly to check if pdfs are compatible. The previous check was
letting dodgy PDFs through which then failed at generation time. This way dodgy
pdfs will get run through ghostscript early and cleaned up.

8 years agoMDL-43758 performance: New metric, time spent by the database
David Monllao [Mon, 20 Jan 2014 05:34:26 +0000 (13:34 +0800)]
MDL-43758 performance: New metric, time spent by the database

This patch adds a new performance metric to the performance
info shown by MDL_PERF* vars, the time spent by the database,
it was one of the wonderful @poltawski ideas. To be more specific
the value displayed is the sum of the time elapsed between query_start()
and query_end().