Damyon Wiese [Mon, 17 Feb 2014 06:12:16 +0000 (14:12 +0800)]
Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle
Conflicts:
lang/en/admin.php
Damyon Wiese [Mon, 17 Feb 2014 05:14:45 +0000 (13:14 +0800)]
Merge branch 'MDL-40061_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 17 Feb 2014 04:13:39 +0000 (12:13 +0800)]
Merge branch 'MDL-42618_master' of git://github.com/SWiT/moodle
Dan Poltawski [Mon, 17 Feb 2014 04:06:42 +0000 (12:06 +0800)]
Merge branch 'MDL-27414' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 17 Feb 2014 02:32:33 +0000 (10:32 +0800)]
Merge branch 'MDL-42033' of git://github.com/jmvedrine/moodle
Damyon Wiese [Mon, 17 Feb 2014 01:14:46 +0000 (09:14 +0800)]
Merge branch 'MDL-44018' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 16 Feb 2014 21:16:33 +0000 (10:16 +1300)]
Merge branch 'MDL-44037_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Sun, 16 Feb 2014 21:15:36 +0000 (10:15 +1300)]
Merge branch 'MDL-42404_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Sun, 16 Feb 2014 20:16:32 +0000 (09:16 +1300)]
Merge branch 'MDL-44142-master' of git://github.com/mrverrall/moodle
Sam Hemelryk [Sun, 16 Feb 2014 20:06:58 +0000 (09:06 +1300)]
Merge branch 'MDL-44042-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js
Sam Hemelryk [Sun, 16 Feb 2014 20:04:48 +0000 (09:04 +1300)]
Merge branch 'MDL-44055-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 16 Feb 2014 19:48:39 +0000 (08:48 +1300)]
Merge branch 'MDL-44079-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
Sam Hemelryk [Sun, 16 Feb 2014 19:27:48 +0000 (08:27 +1300)]
Merge branch 'MDL-43979-master' of git://github.com/andrewnicols/moodle
Jean-Michel Vedrine [Sun, 29 Sep 2013 06:14:32 +0000 (08:14 +0200)]
MDL-42033 Files in subdirs not exported correctly by question XML format
Mark Nelson [Sat, 15 Feb 2014 02:09:27 +0000 (18:09 -0800)]
MDL-40061 mod_data: replaced 'record delete' add_to_log call with an event
Mark Nelson [Tue, 11 Feb 2014 06:24:52 +0000 (22:24 -0800)]
MDL-40061 mod_data: replaced 'templates saved' add_to_log call with an event
Mark Nelson [Tue, 11 Feb 2014 06:14:50 +0000 (22:14 -0800)]
MDL-40061 mod_data: replaced 'templates view' add_to_log call with an event
Mark Nelson [Tue, 11 Feb 2014 04:37:37 +0000 (20:37 -0800)]
MDL-40061 mod_data: replaced 'add' add_to_log call with an event
Mark Nelson [Tue, 11 Feb 2014 04:19:21 +0000 (20:19 -0800)]
MDL-40061 mod_data: replaced 'update' add_to_log call with an event
Mark Nelson [Mon, 10 Feb 2014 00:35:59 +0000 (16:35 -0800)]
MDL-40061 mod_data: replaced 'fields update' add_to_log call with an event
Mark Nelson [Mon, 10 Feb 2014 00:09:33 +0000 (16:09 -0800)]
MDL-40061 mod_data: replaced 'fields add' add_to_log call with an event
Mark Nelson [Sun, 9 Feb 2014 23:04:17 +0000 (15:04 -0800)]
MDL-40061 mod_data: replaced 'fields delete' add_to_log call with an event
Jean-Michel Vedrine [Fri, 10 May 2013 07:51:53 +0000 (09:51 +0200)]
MDL-27414 Upgrade the randomsamatch qtype to the new question engine
Added XML import/export
Different randomsamatch qtypes in the same quiz can now pick the same
shortanswer question.
Images are not preserved if shortanswer question is deleted after being
used in a randomsamatch attempt.
Paul Verrall [Thu, 13 Feb 2014 15:48:40 +0000 (15:48 +0000)]
MDL-44142 Cohorts: Use maxusersperpage for list of current users.
Eloy Lafuente (stronk7) [Thu, 13 Feb 2014 14:29:44 +0000 (15:29 +0100)]
weekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 13 Feb 2014 14:29:34 +0000 (15:29 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Andrew Nicols [Fri, 7 Feb 2014 08:06:15 +0000 (16:06 +0800)]
MDL-44042 Javascript: Handle moving to the top of the current section with keyboard
David Monllao [Fri, 7 Feb 2014 05:41:33 +0000 (13:41 +0800)]
MDL-44037 behat: New feature -> publishing rubric templates
This patch automates MDLQA-1186; rubrics can be
shared as templates.
David Monllao [Thu, 6 Feb 2014 11:07:50 +0000 (19:07 +0800)]
MDL-42404 behat: Covering MDL-39710 with behat features
I've contributed to a large an ugly scenario
in favour of performance as separating it in another
scenario or feature would add 3 or 4 minutes to the suite.
David Monllao [Thu, 6 Feb 2014 10:47:37 +0000 (18:47 +0800)]
MDL-42404 behat: Adding feature to test reusing user's rubrics
Automates MDLQA-1187, teachers can reuse their
rubrics in other activity.
David Monllao [Thu, 6 Feb 2014 10:08:05 +0000 (18:08 +0800)]
MDL-42404 behat: Adding rubrics step definitions
David Monllao [Thu, 6 Feb 2014 10:07:37 +0000 (18:07 +0800)]
MDL-42404 behat: Adding edit rubrics feature
Automates the following MDLQA-1185, MDLQA-1188
and MDLQA-1427. All of them related with the
expected outcomes after editing rubrics definitions
that were already used to grade students.
Petr Škoda [Wed, 12 Feb 2014 08:00:09 +0000 (16:00 +0800)]
MDL-43200 fix enrol_manual externallib tests
David Monllao [Thu, 6 Feb 2014 10:06:36 +0000 (18:06 +0800)]
MDL-42404 behat: Adding yui-dialog to dialogue selector
Sam Hemelryk [Tue, 11 Feb 2014 20:24:06 +0000 (09:24 +1300)]
Merge branch 'MDL-41644' of git://github.com/apsdehal/moodle
Sam Hemelryk [Tue, 11 Feb 2014 20:21:54 +0000 (09:21 +1300)]
Merge branch 'wip-mdl-43289' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Tue, 11 Feb 2014 06:42:23 +0000 (14:42 +0800)]
Merge branch '28567-27' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 11 Feb 2014 06:36:41 +0000 (14:36 +0800)]
MDL-42505 whitespace correction
Marina Glancy [Tue, 11 Feb 2014 06:13:39 +0000 (14:13 +0800)]
Merge branch 'MDL-42505-Feedback-Inappropriate-use-of-fieldset-tags-around-cancel-button' of git://github.com/michael-milette/moodle
Andrew Nicols [Tue, 11 Feb 2014 04:17:47 +0000 (12:17 +0800)]
MDL-44079 Javascript: EditPDF editor should be modal
Andrew Nicols [Tue, 11 Feb 2014 04:17:28 +0000 (12:17 +0800)]
MDL-44079 Javascript: Closing a tooltip should pass event details
Andrew Nicols [Tue, 11 Feb 2014 03:26:46 +0000 (11:26 +0800)]
MDL-44079 Javascript: Check whether a dialogue is focused before closing
Andrew Nicols [Mon, 10 Feb 2014 13:24:13 +0000 (21:24 +0800)]
MDL-44055 mod_glossary: Add missing alternate name fields
Andrew Nicols [Mon, 10 Feb 2014 13:14:13 +0000 (21:14 +0800)]
MDL-44055 mod_quiz: Add missing alternate name fields
Sam Hemelryk [Tue, 11 Feb 2014 01:10:52 +0000 (14:10 +1300)]
Merge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle
Conflicts:
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js
AMOS bot [Tue, 11 Feb 2014 00:42:10 +0000 (00:42 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Mon, 10 Feb 2014 23:26:29 +0000 (00:26 +0100)]
Merge branch 'MDL-43338-master' of https://github.com/jamiepratt/moodle
Sam Hemelryk [Mon, 10 Feb 2014 20:32:32 +0000 (09:32 +1300)]
Merge branch 'MDL-43994-im' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 10 Feb 2014 19:27:35 +0000 (08:27 +1300)]
Merge branch 'MDL-43929' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 10 Feb 2014 15:48:26 +0000 (16:48 +0100)]
Merge branch 'MDL-44053' of git://github.com/timhunt/moodle
Andrew Nicols [Mon, 10 Feb 2014 08:58:24 +0000 (16:58 +0800)]
MDL-43979 Javascript: Correct checking of attributes during dialogue init
Various dialogue attributes are optional and are provided by the parent and
not provided as attributes to the dialogue being initted.
As a result, if the setting is not provided during init, we were assuming
that the value would be false rather than checking the real attribute.
Marina Glancy [Mon, 10 Feb 2014 10:15:57 +0000 (18:15 +0800)]
Merge branch '43977-27' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Adrian Greeve [Mon, 16 Dec 2013 05:58:03 +0000 (13:58 +0800)]
MDL-43289 mod_assign: Creation of new submission events.
New events have been created for submission plugins. This is
part of the consistancy move by adding the same type of event through
all of the modules.
AMOS BEGIN
MOV [event_submission_updated,mod_assign],[eventsubmissionupdated,mod_assign]
AMOS END
Sam Hemelryk [Mon, 10 Feb 2014 02:58:36 +0000 (15:58 +1300)]
Merge branch 'MDL-44059-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Fri, 17 Jan 2014 05:42:47 +0000 (13:42 +0800)]
MDL-44059 libraries: Add a method to return html for row instead of just printing it
Sam Hemelryk [Mon, 10 Feb 2014 02:26:05 +0000 (15:26 +1300)]
Merge branch 'wip_master_mdl-32724' of https://github.com/iarenaza/moodle
Sam Hemelryk [Mon, 10 Feb 2014 02:21:41 +0000 (15:21 +1300)]
Merge branch 'MDL-43774_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 10 Feb 2014 01:53:51 +0000 (14:53 +1300)]
Merge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 10 Feb 2014 01:36:03 +0000 (09:36 +0800)]
MDL-43941 Behat: Section visibility tests should not check if activities are visible
It should be possible for activities to be visible even when the section
they are in is hidden.
However, when a section is hidden, all activities in that section are also
then initially hidden. Therefore, this commit splits out the hidden test to
a new test so that the initial state of activities after hiding can still
be tested.
Andrew Nicols [Mon, 3 Feb 2014 11:55:43 +0000 (19:55 +0800)]
MDL-43941 Course: Allow AJAX show/hide of activities in hidden and orphaned sections
Sam Hemelryk [Mon, 10 Feb 2014 01:16:12 +0000 (14:16 +1300)]
Merge branch 'MDL-40938-27' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 10 Feb 2014 01:11:25 +0000 (14:11 +1300)]
Merge branch 'MDL-43200' of git://github.com/apsdehal/moodle
Andrew Nicols [Mon, 10 Feb 2014 00:50:02 +0000 (08:50 +0800)]
MDL-43994 Blocks: Hide the move icon when blocks are docked on Afterburner too
Sam Hemelryk [Mon, 10 Feb 2014 00:12:57 +0000 (13:12 +1300)]
Merge branch 'MDL-42882-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 9 Feb 2014 23:56:36 +0000 (12:56 +1300)]
MDL-44056 question: added new default property to unit tests
Mark Nelson [Sun, 9 Feb 2014 22:48:29 +0000 (14:48 -0800)]
MDL-40061 mod_data: replaced 'view all' add_to_log call with an event
Mark Nelson [Sun, 9 Feb 2014 22:45:47 +0000 (14:45 -0800)]
MDL-40061 mod_data: replaced 'view' add_to_log call with an event
Sam Hemelryk [Sun, 9 Feb 2014 22:32:13 +0000 (11:32 +1300)]
Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 9 Feb 2014 22:30:12 +0000 (11:30 +1300)]
Merge branch 'MDL-44056' of git://github.com/timhunt/moodle
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
Sam Hemelryk [Thu, 6 Feb 2014 22:07:39 +0000 (11:07 +1300)]
MDL-43977 theme_bootstrapbase: small fix to make custom menu work with JS disabled
Sam Hemelryk [Wed, 29 Jan 2014 20:39:11 +0000 (09:39 +1300)]
MLD-28567 calendar: improved course filter process
Tim Hunt [Fri, 7 Feb 2014 22:13:44 +0000 (22:13 +0000)]
MDL-44053 question restore from 2.0: fix regression from MDL-43670
Tim Hunt [Sun, 9 Feb 2014 17:47:39 +0000 (17:47 +0000)]
MDL-44056 questions: restore essay attempts from 2.0 notice.
Mary Evans [Sun, 9 Feb 2014 00:45:46 +0000 (00:45 +0000)]
MDL-40938 theme_bootstrapbase: Fix for text fields in login block.
AMOS bot [Sun, 9 Feb 2014 00:42:12 +0000 (00:42 +0000)]
Automatically generated installer lang files
Tim Hunt [Thu, 6 Feb 2014 09:50:30 +0000 (09:50 +0000)]
MDL-44018 quesiton variant was not backed up or restored.
Tim Hunt [Thu, 6 Feb 2014 15:00:56 +0000 (15:00 +0000)]
MDL-43929 question manual grading: keep comment when validation fails.
If the validation failed, so the manual grading page was re-displayed
with a validation error, then any comment that had just been typed in
was getting lost. This fixes that.
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.
Andrew Nicols [Wed, 29 Jan 2014 16:36:19 +0000 (00:36 +0800)]
MDL-43267 Javascript: Improve focus before and after drag/drop
James Pratt [Wed, 11 Dec 2013 09:59:27 +0000 (16:59 +0700)]
MDL-43338 quiz statistics : refactoring question statistics code
to improve readability and maintainability.
Andrew Nicols [Wed, 29 Jan 2014 16:35:02 +0000 (00:35 +0800)]
MDL-43267 Javascript: Remove aria drag/drop related attributes for drag/drop
Since we provide an alternative interface rather than describing the
locations for each drop, we should not add aria-grabbed, or
aria-dropeffect.
Andrew Nicols [Wed, 29 Jan 2014 16:32:25 +0000 (00:32 +0800)]
MDL-43267 Javascript: Improve accessibility of keyboard move
Change the keyboard move descriptions to allow for more detailed
descriptions such as:
* "After 'X'"; or
* "To top of section 'Y'"
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