Sam Hemelryk [Sun, 9 Feb 2014 22:27:00 +0000 (11:27 +1300)]
Merge branch 'MDL-43838_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Sun, 9 Feb 2014 20:48:19 +0000 (09:48 +1300)]
Merge branch 'MDL-43969-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 9 Feb 2014 20:40:13 +0000 (09:40 +1300)]
Merge branch 'MDL-43992-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 9 Feb 2014 20:30:57 +0000 (09:30 +1300)]
Merge branch 'MDL-44020-MASTER' of git://github.com/jleyva/moodle
Sam Hemelryk [Sun, 9 Feb 2014 20:28:08 +0000 (09:28 +1300)]
Merge branch 'MDL-44046' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Sun, 9 Feb 2014 20:23:51 +0000 (09:23 +1300)]
Merge branch 'MDL-43978_master' of https://github.com/totara/openbadges
Sam Hemelryk [Sun, 9 Feb 2014 20:10:20 +0000 (09:10 +1300)]
MDL-43994 theme_bootstrapbase: consistent commenting between themes
Sam Hemelryk [Sun, 9 Feb 2014 20:06:31 +0000 (09:06 +1300)]
Merge branch 'MDL-43994-master' of git://github.com/andrewnicols/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Sun, 9 Feb 2014 20:04:54 +0000 (09:04 +1300)]
MDL-43804 theme: amended upgrade.txt with more information
Sam Hemelryk [Sun, 9 Feb 2014 19:50:23 +0000 (08:50 +1300)]
Merge branch 'MDL-43804-master' of git://github.com/ankitagarwal/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Sun, 9 Feb 2014 19:44:39 +0000 (08:44 +1300)]
Merge branch 'MDL-44029-quiz-group-delete-handler-bug' of https://github.com/mpetrowi/moodle
Sam Hemelryk [Sun, 9 Feb 2014 19:42:55 +0000 (08:42 +1300)]
Merge branch 'MDL-43946' of https://github.com/merrill-oakland/moodle
Eric Merrill [Fri, 7 Feb 2014 14:29:12 +0000 (09:29 -0500)]
MDL-44046 gradebook Reduce duplicates returned during sortorder fixing.
Juan Leyva [Fri, 7 Feb 2014 11:23:33 +0000 (12:23 +0100)]
MDL-44020 Add core_calendar_get_calendar_events function to the moodle mobile core service
Andrew Nicols [Thu, 6 Feb 2014 06:43:16 +0000 (14:43 +0800)]
MDL-43994 Blocks: Hide the move icon when blocks are docked
Andrew Nicols [Wed, 5 Feb 2014 04:14:01 +0000 (12:14 +0800)]
MDL-43992 Javascript: Remove <return> key listener for confirmation
The listener was previously confirming, even when the cancel or 'No'
buttons were selected. However, having the default action as 'Confirm'
seems dangerous in this situation, so removing this option entirely.
Andrew Nicols [Tue, 4 Feb 2014 03:55:14 +0000 (11:55 +0800)]
MDL-43969 Forms: Adjust ARIA attributes for short forms
The aria-live="polite" attribute is incorrectly added to the fieldset,
causing the entire fieldset to be read out on change in some browsers. This
is unnecessary.
It also does not announce the current state of the fieldset (collaped or
open) and should.
Sam Hemelryk [Thu, 6 Feb 2014 22:46:00 +0000 (11:46 +1300)]
weekly release 2.7dev
Sam Hemelryk [Thu, 6 Feb 2014 22:45:55 +0000 (11:45 +1300)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Yuliya Bozhko [Thu, 6 Feb 2014 20:11:15 +0000 (09:11 +1300)]
MDL-43978 badges: Fix lang string
Matt Petro [Thu, 6 Feb 2014 18:32:04 +0000 (13:32 -0500)]
MDL-44029 mod_quiz: Fixing group deleted handler so it does not remove user overrides.
Andrew Nicols [Thu, 6 Feb 2014 05:33:41 +0000 (13:33 +0800)]
MDL-43687 Javascript: Correct instantiation of the question-preview
This addresses issues discovered during testing, including:
* inclusion of the M.core_question_preview metadata;
* inclusion of required strings; and
* correcting a function signature.
Russell Smith [Wed, 5 Feb 2014 12:23:38 +0000 (23:23 +1100)]
MDL-43926 files: Unit tests cannot assume id values.
Sam Hemelryk [Wed, 5 Feb 2014 21:04:04 +0000 (10:04 +1300)]
Merge branch 'MDL-43936' of git://github.com/timhunt/moodle
Eric Merrill [Wed, 5 Feb 2014 14:56:34 +0000 (09:56 -0500)]
MDL-43946 gradebook upgrade Improve SQL to find duplicate sortorders.
Tim Hunt [Wed, 5 Feb 2014 11:23:42 +0000 (11:23 +0000)]
MDL-43936 questions: fix my lame spelling in upgrade.txt.
Thanks to Mark Nelson for the suggested improvements.
Marina Glancy [Wed, 5 Feb 2014 07:56:30 +0000 (15:56 +0800)]
Merge branch 'MDL-42339' of git://github.com/rwijaya/moodle
Rossiani Wijaya [Wed, 5 Feb 2014 06:47:23 +0000 (14:47 +0800)]
MDL-42339 - removed double formatting for set_title() and set_heading()
Marina Glancy [Wed, 5 Feb 2014 06:32:27 +0000 (14:32 +0800)]
MDL-42425 assign: bumping version for new web services to take effect
Marina Glancy [Wed, 5 Feb 2014 04:49:02 +0000 (12:49 +0800)]
Merge branch '38923-27' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Tue, 4 Feb 2014 20:42:45 +0000 (09:42 +1300)]
MDL-38923 theme_bootstrapbase: pre-integration fixups
* Fixed the way we added the block class to the dock panel in dock.js
* Added a class to the h2 that is used to test dock title width
* Fixed RTL alignment issues as best I could at present
* Fixed overlap of dock + navbar on small screens
* Fixed the docked block width to be constrained to the available space
* Fixed hidden actions on docked blocks
Sam Hemelryk [Tue, 4 Feb 2014 23:36:52 +0000 (12:36 +1300)]
Merge branch 'MDL-41757-master' of https://github.com/jamiepratt/moodle
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
Sam Hemelryk [Thu, 23 Jan 2014 20:42:39 +0000 (09:42 +1300)]
MDL-38923 dock: allowed for space before first time
Sam Hemelryk [Wed, 8 Jan 2014 22:50:50 +0000 (11:50 +1300)]
MDL-38923 theme_bootstrapbase: tidied up dock implementation
Also:
* Changed to a CSS based compacting solution
* Converted dock colours to variables
* RTL fixes for the dock
Bas Brands [Fri, 25 Oct 2013 08:12:50 +0000 (10:12 +0200)]
MDL-38923 theme bootstrapbase: theme clean: enable docking
Yuliya Bozhko [Tue, 4 Feb 2014 20:52:32 +0000 (09:52 +1300)]
MDL-43978 badges: Display error message to guest users viewing "My Badges" page
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
AMOS bot [Tue, 4 Feb 2014 00:42:01 +0000 (00:42 +0000)]
Automatically generated installer lang files
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
David Monllao [Tue, 28 Jan 2014 08:55:59 +0000 (16:55 +0800)]
MDL-43838 behat: Clean theme compatibility with small and medium screen sizes
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
Ankit Agarwal [Wed, 22 Jan 2014 09:20:07 +0000 (17:20 +0800)]
MDL-43804 themes: Update css not to use r0 and r1 identifiers for table rows
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.