Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:48:22 +0000 (16:48 +0100)]
Merge branch 'MDL-43332_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:44:11 +0000 (16:44 +0100)]
Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:39:00 +0000 (16:39 +0100)]
Merge branch '35597-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:01:27 +0000 (16:01 +0100)]
Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 14 Jan 2014 08:50:07 +0000 (16:50 +0800)]
Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 14 Jan 2014 08:21:21 +0000 (16:21 +0800)]
Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:57:05 +0000 (15:57 +0800)]
Merge branch 'm27_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:48:49 +0000 (15:48 +0800)]
Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:36:58 +0000 (15:36 +0800)]
Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:26:52 +0000 (15:26 +0800)]
Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle
Damyon Wiese [Tue, 14 Jan 2014 07:18:37 +0000 (15:18 +0800)]
Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:00:11 +0000 (15:00 +0800)]
Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:46:55 +0000 (14:46 +0800)]
Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:43:45 +0000 (14:43 +0800)]
Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 14 Jan 2014 06:29:58 +0000 (14:29 +0800)]
Merge branch 'w02_MDL-43511_m27_bankcache' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:28:15 +0000 (14:28 +0800)]
MDL-40313 question: build shifter after js changes
Damyon Wiese [Tue, 14 Jan 2014 06:23:06 +0000 (14:23 +0800)]
Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:21:06 +0000 (14:21 +0800)]
Merge branch 'MDL-40313' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:59:26 +0000 (13:59 +0800)]
Merge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:25:44 +0000 (13:25 +0800)]
Merge branch 'MDL-43460-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:18:16 +0000 (13:18 +0800)]
Merge branch 'w02_MDL-43488_m27_signreq' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:14:09 +0000 (13:14 +0800)]
Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:06:54 +0000 (13:06 +0800)]
Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle
Conflicts:
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
course/yui/dragdrop/dragdrop.js
Ankit Agarwal [Tue, 7 Jan 2014 06:10:20 +0000 (14:10 +0800)]
MDL-40056 events: Replace old add_to_log calls with new events
Ankit Agarwal [Tue, 7 Jan 2014 06:09:43 +0000 (14:09 +0800)]
MDL-40056 events: Add unit tests for new events
Ankit Agarwal [Tue, 7 Jan 2014 06:06:26 +0000 (14:06 +0800)]
MDL-40056 events: Created Event classes to replace add_to_log() - mod_scorm
Created attempt_deleted event
Created interactions_viewed event
Created report_viewed event
Created sco_launched event
Created tracks_viewed event
Created user_report_viewed event
Created course module related events
Damyon Wiese [Tue, 14 Jan 2014 03:57:09 +0000 (11:57 +0800)]
Merge branch 'MDL-43610-m' of git://github.com/micaherne/moodle
Dan Poltawski [Tue, 14 Jan 2014 03:28:39 +0000 (11:28 +0800)]
Merge branch 'master_MDL-42792' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 14 Jan 2014 02:46:22 +0000 (10:46 +0800)]
Merge branch 'MDL-43412' of git://github.com/timhunt/moodle
Andrew Nicols [Mon, 13 Jan 2014 06:44:18 +0000 (14:44 +0800)]
MDL-43664 Javascript: Use YUI indexOf for pending_js tracking
Some old browsers do not support indexOf and so cannot determine whether JS
script is in progress. The YUI Y.Array module polyfills the indexOf
functionality when it does not exist.
Damyon Wiese [Tue, 14 Jan 2014 01:57:05 +0000 (09:57 +0800)]
MDL-33952 Assignment: Remove behat tests for mod_assignment - it is not a real activity anymore.
Mark Nelson [Mon, 30 Dec 2013 22:20:06 +0000 (14:20 -0800)]
MDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317
Eloy Lafuente (stronk7) [Mon, 13 Jan 2014 20:51:27 +0000 (21:51 +0100)]
Merge branch 'MDL-43109' of https://github.com/mdikih/moodle
Matteo Scaramuccia [Mon, 30 Dec 2013 17:51:25 +0000 (18:51 +0100)]
MDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption().
Matteo Scaramuccia [Sun, 5 Jan 2014 12:42:12 +0000 (13:42 +0100)]
MDL-43577 Messages Incorrect variable expansion in the message template.
Eloy Lafuente (stronk7) [Mon, 13 Jan 2014 18:10:13 +0000 (19:10 +0100)]
Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 13 Jan 2014 15:31:00 +0000 (16:31 +0100)]
Merge branch 'MDL-33600-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 13 Jan 2014 07:38:22 +0000 (15:38 +0800)]
Merge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle
Frederic Massart [Tue, 7 Jan 2014 10:29:39 +0000 (11:29 +0100)]
MDL-40849 gradingform_guide: Fixed CSS issues with Bootstrapbase
Dan Poltawski [Mon, 13 Jan 2014 04:55:36 +0000 (12:55 +0800)]
Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle
Conflicts:
mod/assignment/lang/en/assignment.php
Dan Poltawski [Mon, 13 Jan 2014 04:42:13 +0000 (12:42 +0800)]
Merge branch '43598-43262-27' of git://github.com/samhemelryk/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
lib/yui/src/notification/js/dialogue.js
Dan Poltawski [Mon, 13 Jan 2014 04:34:53 +0000 (12:34 +0800)]
Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Mon, 13 Jan 2014 04:11:17 +0000 (12:11 +0800)]
Merge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 13 Jan 2014 03:11:10 +0000 (11:11 +0800)]
Merge branch '41226-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 03:02:18 +0000 (11:02 +0800)]
Merge branch '40821-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 02:07:53 +0000 (10:07 +0800)]
Merge branch '40693-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 02:03:51 +0000 (10:03 +0800)]
Merge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Wed, 8 Jan 2014 01:24:16 +0000 (14:24 +1300)]
MDL-40205 theme: fixed overflow of block headers
Dan Poltawski [Mon, 13 Jan 2014 01:35:50 +0000 (09:35 +0800)]
Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Mon, 13 Jan 2014 00:54:22 +0000 (08:54 +0800)]
Merge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 16 Dec 2013 05:05:20 +0000 (13:05 +0800)]
MDL-43395 dml: warn about invalid limit params
Help developers to find bugs by throwing a DEBUG_DEVELOPER message
rather than ignoring this case completely.
Sam Hemelryk [Tue, 7 Jan 2014 22:47:47 +0000 (11:47 +1300)]
MDL-43598 dialogue: fixed bug with render procedure
Andrew Nicols [Sun, 8 Dec 2013 15:26:59 +0000 (23:26 +0800)]
MDL-43262 JavaScript: Correct use of centered attribute override
This should be done using an attribute modification, rather than at the
constructor level.
Andrew Nicols [Sun, 8 Dec 2013 14:54:58 +0000 (22:54 +0800)]
MDL-43262 JavaScript: Correct visible attribute override
This should be done using an attribute modification, rather than at the
constructor level.
Andrew Nicols [Sun, 8 Dec 2013 14:49:13 +0000 (22:49 +0800)]
MDL-43262 JavaScript: Correct width attribute override
This should be done using an attribute modification, rather than at the
constructor level.
Sam Hemelryk [Tue, 7 Jan 2014 04:52:59 +0000 (17:52 +1300)]
MDL-40821 theme_bootstrapbase: fixed positioning of profile controls
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 7 Jan 2014 04:40:28 +0000 (17:40 +1300)]
MDL-40821 theme_bootstrapbase: show the current lang in the menu
Sam Hemelryk [Tue, 7 Jan 2014 05:07:07 +0000 (18:07 +1300)]
MDL-40693 theme_bootstrapbase: changed navbar separator to official separator
Sam Hemelryk [Wed, 11 Dec 2013 21:02:22 +0000 (10:02 +1300)]
MDL-35597 admin-plugins: are now sorted alphabetically
Sam Hemelryk [Wed, 27 Nov 2013 21:57:14 +0000 (10:57 +1300)]
MDL-35597 admin: categories now support localised alphabetical sorting
Petr Škoda [Sun, 29 Dec 2013 08:17:52 +0000 (16:17 +0800)]
MDL-43488 remoe city and country requirement from signup
This was supposed to be part of MDL-28558.
Petr Škoda [Sun, 29 Dec 2013 07:46:50 +0000 (15:46 +0800)]
MDL-43511 do not cache the MUC cache in question code
Petr Škoda [Thu, 2 Jan 2014 06:06:37 +0000 (14:06 +0800)]
MDL-43537 drop some more unused ancient admin strings
Petr Škoda [Thu, 2 Jan 2014 05:46:25 +0000 (13:46 +0800)]
MDL-43537 remove environemnt checks and strings that are not used any more
Petr Škoda [Thu, 2 Jan 2014 02:04:08 +0000 (10:04 +0800)]
MDL-43529 delete all unnecessary register_globals checks
Eloy Lafuente (stronk7) [Fri, 10 Jan 2014 18:54:10 +0000 (19:54 +0100)]
MDL-43646 "disapprove" changed to "undo approval"
Eloy Lafuente (stronk7) [Fri, 10 Jan 2014 17:55:17 +0000 (18:55 +0100)]
MDL-43590 move unapprove to undo approval
Michael Aherne [Fri, 10 Jan 2014 12:37:12 +0000 (12:37 +0000)]
MDL-46310 assign Prevent blind marking submission notification email being sent to noreplyemail address
David Monllao [Thu, 9 Jan 2014 10:51:55 +0000 (18:51 +0800)]
MDL-43584 behat: Updating features to use the new expected arguments
David Monllao [Thu, 9 Jan 2014 10:51:07 +0000 (18:51 +0800)]
MDL-43584 behat: Removing DB calls from step definitions as much as possible
Old methods deprecated as the expected arguments
have changed.
David Monllao [Fri, 10 Jan 2014 09:42:05 +0000 (17:42 +0800)]
MDL-43642 behat: Setting the correct files @package
Eloy Lafuente (stronk7) [Fri, 10 Jan 2014 09:08:34 +0000 (10:08 +0100)]
Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle
Dan Marsden [Thu, 9 Jan 2014 08:51:11 +0000 (21:51 +1300)]
MDL-43222 SCORM: correct check for list of attempts and make correct check for current attempt in scorm_get_toc
Dan Marsden [Fri, 10 Jan 2014 08:04:54 +0000 (21:04 +1300)]
MDL-42792 SCORM: Prevent JS error when network connection fails. - return false to SCORM package so that issue can be detected and reported.
Dan Marsden [Thu, 26 Sep 2013 02:17:14 +0000 (14:17 +1200)]
MDL-41577 SCORM: remove old IE9 hack that didn't really work.
Damyon Wiese [Fri, 10 Jan 2014 06:19:48 +0000 (14:19 +0800)]
weekly release 2.7dev
Damyon Wiese [Fri, 10 Jan 2014 06:19:31 +0000 (14:19 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Eloy Lafuente (stronk7) [Fri, 10 Jan 2014 00:03:23 +0000 (01:03 +0100)]
MDL-36721 make upgrade queries cross-db
Andrew Davis [Fri, 27 Dec 2013 02:24:19 +0000 (10:24 +0800)]
MDL-43178 mod_forum: fixed the digest setting confirmation message
Eloy Lafuente (stronk7) [Thu, 9 Jan 2014 22:07:19 +0000 (23:07 +0100)]
Merge branch 'wip-MDL-43283-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Thu, 9 Jan 2014 21:21:37 +0000 (10:21 +1300)]
MDL-43349 cache: added back are_requirements_met calls
Tim Hunt [Thu, 9 Jan 2014 12:43:56 +0000 (12:43 +0000)]
MDL-40313 question bank search classes should be namespaced.
Tim Hunt [Thu, 9 Jan 2014 11:54:22 +0000 (11:54 +0000)]
MDL-40313 Fix code and doc checker warnings.
Ray Morris [Wed, 8 Jan 2014 20:08:40 +0000 (14:08 -0600)]
MDL-40313 questionbank: Add question filtering API
Add new API for filtering questions, refactoring the options to display
old questions and include subcategories into new
question_bank_search_condition classes. Make the new API pluggable via
local_[pluginname]_get_question_bank_search_conditions.
Frederic Massart [Thu, 9 Jan 2014 15:16:59 +0000 (16:16 +0100)]
MDL-43371 mod_lesson: Remove files upon page or module deletion
Frederic Massart [Thu, 9 Jan 2014 09:25:53 +0000 (10:25 +0100)]
MDL-41152 theme_bootstrapbase: Optimise width for gradebook tree view
Eloy Lafuente (stronk7) [Thu, 9 Jan 2014 09:19:25 +0000 (10:19 +0100)]
Merge branch 'MDL-43330_master-skippedexception-namespace' of https://github.com/dmonllao/moodle
Marina Glancy [Thu, 9 Jan 2014 07:37:38 +0000 (15:37 +0800)]
MDL-43283 mod_chat: corrected SQL query to follow strict groupping rules
David Monllao [Thu, 9 Jan 2014 04:08:21 +0000 (12:08 +0800)]
MDL-43330 behat: Using the tag that includes the exception namespace
AMOS bot [Thu, 9 Jan 2014 00:42:11 +0000 (00:42 +0000)]
Automatically generated installer lang files
Helen Foster [Thu, 9 Jan 2014 00:06:01 +0000 (01:06 +0100)]
MDL-43590 Merge English strings from the en_fix language pack
Tim Hunt [Wed, 8 Jan 2014 17:55:25 +0000 (17:55 +0000)]
MDL-43412 quiz with grade period and password did not work.
Once the attempt became overdue, it was impossible to get in to submit
it because of a redirect loop. This fix resovles that loop, so the
student can enter their password and get in.
Andrew Nicols [Wed, 8 Jan 2014 08:34:27 +0000 (19:34 +1100)]
MDL-40119 Forms: Remove cursor style override for calendar button
Frederic Massart [Tue, 7 Jan 2014 11:08:44 +0000 (12:08 +0100)]
MDL-39603 theme_bootstrapbase: Alignment of filter form elements on enrol page
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 08:55:08 +0000 (09:55 +0100)]
Merge branch 'MDL-43423_master-increase-timeout' of git://github.com/dmonllao/moodle
David Monllao [Wed, 8 Jan 2014 08:51:17 +0000 (16:51 +0800)]
MDL-43423 behat: Increasing the timeout to 6 seconds
Damyon Wiese [Thu, 19 Dec 2013 05:04:28 +0000 (13:04 +0800)]
MDL-33952 Assignment - bon voyage!
mod_assignment has been replaced with a stub that only exists to support restoring and
auto upgrading to mod_assign. If you require mod_assignment for some old plugin, then
overwrite with the 2.6 version manually.
Dan Poltawski [Wed, 8 Jan 2014 06:32:57 +0000 (14:32 +0800)]
Merge branch 'wip-MDL-43606-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 8 Jan 2014 05:57:03 +0000 (13:57 +0800)]
MDL-43606 tinymce_managefiles: bump version
to allow smooth upgrade from contributed plugin in 2.5
Dan Poltawski [Wed, 8 Jan 2014 03:56:53 +0000 (11:56 +0800)]
Merge branch 'MDL-43534-master' of git://github.com/andrewnicols/moodle