Sam Hemelryk [Tue, 4 Feb 2014 23:35:11 +0000 (12:35 +1300)]
Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle
Conflicts:
lib/db/upgrade.php
version.php
Eloy Lafuente (stronk7) [Tue, 4 Feb 2014 22:56:27 +0000 (23:56 +0100)]
Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle
Sam Hemelryk [Tue, 4 Feb 2014 22:44:49 +0000 (11:44 +1300)]
Merge branch 'MDL-43027-master' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Tue, 4 Feb 2014 22:29:32 +0000 (11:29 +1300)]
Merge branch 'MDL-43952-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 4 Feb 2014 09:53:17 +0000 (10:53 +0100)]
Merge branch 'MDL-43911-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 4 Feb 2014 09:11:42 +0000 (10:11 +0100)]
Merge branch 'wip-MDL-41384-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 4 Feb 2014 07:44:51 +0000 (15:44 +0800)]
Merge branch 'MDL-41754-master' of git://github.com/jamiepratt/moodle
Damyon Wiese [Tue, 4 Feb 2014 05:37:06 +0000 (13:37 +0800)]
MDL-43805 assign: Prevent behat fail on ci - editpdf is not available there
Ghostscript is not setup on the ci servers, so the editpdf feature will be automatically
disabled. This means that I cannot click on "Hide Annotate PDF".
Sam Hemelryk [Tue, 4 Feb 2014 02:50:48 +0000 (15:50 +1300)]
Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle
Andrew Nicols [Tue, 28 Jan 2014 06:59:21 +0000 (14:59 +0800)]
MDL-42428 Javascript: Switch M.util.show_confirm_dialog to use moodle-core-notification
Sam Hemelryk [Tue, 4 Feb 2014 01:17:39 +0000 (14:17 +1300)]
Merge branch 'MDL-43538-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 3 Feb 2014 03:59:26 +0000 (11:59 +0800)]
MDL-43952 Javascript: Support invalidation of browser caches for YUI patching
This will also force files loaded from the CDN to instead come from the
local distribution since those patches will not be included in the CDN
release.
Please see the documentation at http://docs.moodle.org/dev/YUI/Patching for
important on using these changes.
Oleg Sychev [Fri, 24 Jan 2014 23:41:01 +0000 (02:41 +0300)]
MDL-42456: add Mercurial vcs support to plugin_external_source
Eloy Lafuente (stronk7) [Mon, 3 Feb 2014 23:59:58 +0000 (00:59 +0100)]
Merge branch 'MDL-33064-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 3 Feb 2014 23:41:00 +0000 (12:41 +1300)]
Merge branch 'MDL-43885-master' of git://github.com/andrewnicols/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
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
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
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
Sam Hemelryk [Mon, 3 Feb 2014 21:57:26 +0000 (10:57 +1300)]
Merge branch 'MDL-43892' of git://github.com/timhunt/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
Sam Hemelryk [Mon, 3 Feb 2014 21:23:24 +0000 (10:23 +1300)]
Merge branch 'MDL-43893-master' of git://github.com/andrewnicols/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
Sam Hemelryk [Mon, 3 Feb 2014 21:11:44 +0000 (10:11 +1300)]
Merge branch 'MDL-43936' of git://github.com/timhunt/moodle
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
Sam Hemelryk [Mon, 3 Feb 2014 20:53:16 +0000 (09:53 +1300)]
Merge branch 'wip-mdl-40911' of https://github.com/rajeshtaneja/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
Sam Hemelryk [Mon, 3 Feb 2014 20:04:01 +0000 (09:04 +1300)]
MDL-39617 backup: language improvements to cli/backup.php
Sam Hemelryk [Mon, 3 Feb 2014 19:41:37 +0000 (08:41 +1300)]
Merge branch 'MDL-39617-master' of https://github.com/lucisgit/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
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
Marina Glancy [Mon, 3 Feb 2014 09:34:20 +0000 (17:34 +0800)]
Merge branch 'MDL-41647' of git://github.com/apsdehal/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
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
Marina Glancy [Mon, 3 Feb 2014 07:06:11 +0000 (15:06 +0800)]
Merge branch 'MDL-43593-master' of git://github.com/damyon/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
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.
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
Paul Charsley [Wed, 15 Jan 2014 22:03:48 +0000 (11:03 +1300)]
MDL-42425 modify mod_assign_save_grade to process advanced grading data
Andrew Nicols [Wed, 29 Jan 2014 15:18:15 +0000 (23:18 +0800)]
MDL-43911 Behat: Save dumps of the page content to disk on scenario failure
apsdehal [Tue, 28 Jan 2014 16:00:59 +0000 (21:30 +0530)]
MDL-41647 WebServices: Changed notification CSS class
Tim Hunt [Fri, 31 Jan 2014 14:12:19 +0000 (14:12 +0000)]
MDL-43936 questions: document renderer API change.
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
Marina Glancy [Thu, 23 Jan 2014 07:41:15 +0000 (15:41 +0800)]
MDL-43828 forum: allow to select single available group when posting
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
Marina Glancy [Fri, 10 Jan 2014 07:37:46 +0000 (15:37 +0800)]
MDL-41384 course: do not show debugging message if $COURSE contains format options
before showing debugging message make sure that field exists in database and not only in the object
Marina Glancy [Fri, 10 Jan 2014 07:16:35 +0000 (15:16 +0800)]
MDL-41384 upgrade: make sure to re-read $SITE from DB when course table is altered
Marina Glancy [Tue, 28 Jan 2014 06:29:57 +0000 (14:29 +0800)]
MDL-33920 filepicker: hide 'save as' field when not applicable
Marina Glancy [Fri, 31 Jan 2014 06:11:12 +0000 (14:11 +0800)]
weekly release 2.7dev
Marina Glancy [Fri, 31 Jan 2014 06:11:11 +0000 (14:11 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
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.
Gregory Faller [Thu, 30 Jan 2014 23:56:11 +0000 (10:26 +1030)]
MDL-37714: Correctly identify frequently used comments during restore
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.
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
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
Damyon Wiese [Thu, 23 Jan 2014 08:41:34 +0000 (16:41 +0800)]
MDL-43805 assign: Behat test for quickgrading bug
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.
M Kassaei [Tue, 14 Jan 2014 11:40:57 +0000 (11:40 +0000)]
MDL-43687, convert question/preview.js to the new yui format
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
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
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.
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
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
Andrew Nicols [Tue, 28 Jan 2014 08:01:59 +0000 (16:01 +0800)]
MDL-43885 Javascript: Make the [X] button work like 'No' in relevant dialogues
The [X] button on the dialogue is another form of the 'No' button and
should behave as such. In some dialogues this matters more than others
because the dialogue is destroyed.
Eloy Lafuente (stronk7) [Wed, 29 Jan 2014 00:52:49 +0000 (01:52 +0100)]
Merge branch 'MDL-43040'
Eloy Lafuente (stronk7) [Wed, 29 Jan 2014 00:40:30 +0000 (01:40 +0100)]
MDL-43040 Note the deprecation and add some TODOs
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)
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
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
Sam Hemelryk [Tue, 28 Jan 2014 19:23:51 +0000 (08:23 +1300)]
Merge branch 'MDL-40909_master' of https://github.com/markn86/moodle
Andrew Nicols [Tue, 28 Jan 2014 16:12:55 +0000 (00:12 +0800)]
MDL-43893 Javascript: Remove YUI2 uses in group members management JS
Andrew Nicols [Tue, 28 Jan 2014 15:54:32 +0000 (23:54 +0800)]
MDL-43886 Javascript: Remove dialouges from the DOM upon destroy
Tim Hunt [Tue, 28 Jan 2014 15:55:41 +0000 (15:55 +0000)]
MDL-43892 dbtransfer: Fix missing string.
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.
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).
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
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
Ankit Agarwal [Tue, 28 Jan 2014 07:59:49 +0000 (15:59 +0800)]
MDL-43884 database: Fix get_tables() api for external stores
Andrew Nicols [Thu, 2 Jan 2014 06:58:31 +0000 (14:58 +0800)]
MDL-43538 Javascript: Deprecate callback argument to confirm_action
As a precursor to deprecating M.util.show_confirm, this deprecates the
callback argment to the confirm_action class.
This is not currently used anywhere in core, and it's use leads to use of
eval in Javascript.
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.
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.
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.
Kevin Wiliarty [Tue, 20 Aug 2013 21:48:10 +0000 (17:48 -0400)]
MDL-39942: invite only users who can post to discuss
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)
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.
Andrew Nicols [Sat, 16 Nov 2013 01:01:16 +0000 (09:01 +0800)]
MDL-42928 JavaScript: Disable lockScroll for small chooserdialogues
Andrew Nicols [Sat, 16 Nov 2013 00:59:37 +0000 (08:59 +0800)]
MDL-42928 JavaScript: Add LockScroll to all modal dialogues
Andrew Nicols [Sat, 16 Nov 2013 00:54:22 +0000 (08:54 +0800)]
MDL-42928 JavaScript: Create a module to handle page scroll locking
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
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
Sam Hemelryk [Mon, 27 Jan 2014 23:16:20 +0000 (12:16 +1300)]
Merge branch 'MDL-43246' of git://github.com/timhunt/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
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
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
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 22:52:07 +0000 (23:52 +0100)]
Merge branch 'MDL-43874' of git://github.com/timhunt/moodle
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
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
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
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
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