Damyon Wiese [Wed, 7 May 2014 05:28:20 +0000 (13:28 +0800)]
Merge branch 'MDL-45290-master-fix' of https://github.com/jethac/moodle
Marina Glancy [Wed, 7 May 2014 05:06:30 +0000 (13:06 +0800)]
Merge branch 'MDL-45387-master' of git://github.com/jethac/moodle
Marina Glancy [Wed, 7 May 2014 05:06:17 +0000 (13:06 +0800)]
Merge branch 'MDL-45201-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Thu, 13 Mar 2014 08:14:45 +0000 (16:14 +0800)]
MDL-44606 Assign: Some grading functions are missing sesskey protection
Dan Poltawski [Wed, 7 May 2014 04:05:17 +0000 (12:05 +0800)]
Merge branch 'wip-MDL-45414-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 7 May 2014 03:50:09 +0000 (11:50 +0800)]
Merge branch 'wip-MDL-45429-master' of git://github.com/marinaglancy/moodle
Eric Merrill [Wed, 7 May 2014 01:43:32 +0000 (21:43 -0400)]
MDL-45439 reports Don't send contextlevel to legacy logging.
It doesn't support the column.
Jetha Chan [Wed, 7 May 2014 02:52:51 +0000 (10:52 +0800)]
MDL-45387 core_form: erroneous escaping on reference list
Fixed erroneous escaping in JS.
Eloy Lafuente (stronk7) [Tue, 6 May 2014 13:57:48 +0000 (15:57 +0200)]
on-demand release 2.7rc1+
Marina Glancy [Tue, 6 May 2014 09:13:37 +0000 (17:13 +0800)]
MDL-45357 events: unittest correction, event description change
Jetha Chan [Tue, 6 May 2014 07:49:30 +0000 (15:49 +0800)]
MDL-45290 rubrics: overflow, delete button alignment
Adjusted delete button alignment, restored overflow rule, amended button alignment, minor RTL fixes.
Andrew Nicols [Tue, 6 May 2014 07:13:10 +0000 (15:13 +0800)]
MDL-45357 events: Remove unnecessary the before 'id' in event descriptions
Andrew Nicols [Tue, 6 May 2014 06:57:42 +0000 (14:57 +0800)]
MDL-45357 events: Normalise event description names
Andrew Nicols [Tue, 6 May 2014 06:32:06 +0000 (14:32 +0800)]
MDL-45357 events: Improve clarity of allow role change descriptions
Mark Nelson [Tue, 6 May 2014 04:47:24 +0000 (21:47 -0700)]
MDL-45357 events: removed unnecessary verb from description
Andrew Nicols [Tue, 6 May 2014 08:09:54 +0000 (16:09 +0800)]
MDL-45338 editor_atto: Correct gesturemoveend listening
Delegate gesturemoveend rather than listen to ensure adequate event filters
and that we apply to only the correct editor.
Marina Glancy [Tue, 6 May 2014 08:05:20 +0000 (16:05 +0800)]
MDL-45429 block_glossary_random: check capability before suggesting to edit
Marina Glancy [Tue, 6 May 2014 04:19:58 +0000 (12:19 +0800)]
Merge branch 'MDL-45409-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 6 May 2014 04:03:44 +0000 (12:03 +0800)]
MDL-45412 Cache: Mongo DB string change (older is less than)
Damyon Wiese [Tue, 6 May 2014 03:58:15 +0000 (11:58 +0800)]
MDL-45412 Cache: Look for the newer classname first (mongo store)
Damyon Wiese [Tue, 6 May 2014 04:03:19 +0000 (12:03 +0800)]
Merge branch '45412-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 6 May 2014 03:48:38 +0000 (11:48 +0800)]
Merge branch 'MDL-45403-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
Dan Poltawski [Tue, 6 May 2014 03:34:17 +0000 (11:34 +0800)]
Merge branch 'MDL-45253-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Marina Glancy [Tue, 6 May 2014 03:28:48 +0000 (11:28 +0800)]
MDL-45414 wiki: fix broken image
Dan Poltawski [Tue, 6 May 2014 03:27:41 +0000 (11:27 +0800)]
Merge branch 'MDL-45338-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 6 May 2014 03:23:39 +0000 (11:23 +0800)]
Merge branch 'MDL-45290-master-fix' of github.com/jethac/moodle
Dan Poltawski [Tue, 6 May 2014 03:16:32 +0000 (11:16 +0800)]
Merge branch 'MDL-45376-master' of https://github.com/sammarshallou/moodle
Jetha Chan [Mon, 5 May 2014 06:41:43 +0000 (14:41 +0800)]
MDL-45290 rubric: IE8 and minor fixes, RTL
Added a fallback style for IE8, adjusted some minor styles, added RTL capability.
Dan Poltawski [Tue, 6 May 2014 02:25:48 +0000 (10:25 +0800)]
Merge branch 'MDL-30106' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 6 May 2014 02:18:44 +0000 (10:18 +0800)]
Merge branch 'MDL-42956-master' of git://github.com/lameze/moodle
Sam Hemelryk [Mon, 5 May 2014 21:30:27 +0000 (09:30 +1200)]
MDL-45412 cachestore_mongodb: added notification of old Mongo version use
Sam Hemelryk [Mon, 5 May 2014 21:29:45 +0000 (09:29 +1200)]
MDL-45412 cachestore_mongodb: fixed use of deprecated Mongo class
Juan Leyva [Fri, 2 May 2014 09:38:17 +0000 (11:38 +0200)]
MDL-30106 forum: get_posts WS fixes in data generator and def. values
Juan Leyva [Fri, 2 May 2014 09:22:29 +0000 (11:22 +0200)]
MDL-30106 forum: Bump version number (upgrading service and installing new ws)
Juan Leyva [Tue, 4 Mar 2014 14:45:27 +0000 (15:45 +0100)]
MDL-30106 forum: New web service mod_forum_get_forum_discussion_posts
Frederic Massart [Mon, 5 May 2014 04:28:33 +0000 (12:28 +0800)]
MDL-45403 editor_atto: Change default for tagMarchRequiresAll to true
Frederic Massart [Fri, 2 May 2014 08:39:04 +0000 (16:39 +0800)]
MDL-45253 editor_atto: Async the highlighting of buttons
Frederic Massart [Fri, 2 May 2014 03:45:11 +0000 (11:45 +0800)]
MDL-45253 editor_atto: Check for button highlights on change event
This will allow a button to be highlighted when a plugin has updated
the content, not only when the selection has changed.
Frederic Massart [Thu, 1 May 2014 09:38:39 +0000 (17:38 +0800)]
MDL-45253 editor_atto: Prevent selection of all nodes when selection is empty
Frederic Massart [Thu, 1 May 2014 08:37:23 +0000 (16:37 +0800)]
MDL-45253 editor_atto: selectionFilterMatches includes parents
Marina Glancy [Mon, 5 May 2014 09:41:01 +0000 (17:41 +0800)]
Merge branch 'MDL-34904-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Mon, 5 May 2014 09:24:08 +0000 (17:24 +0800)]
Merge branch 'MDL-45359-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
Marina Glancy [Mon, 5 May 2014 09:18:04 +0000 (17:18 +0800)]
Merge branch 'MDL-44174-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 5 May 2014 09:17:45 +0000 (17:17 +0800)]
Merge branch 'MDL-45342-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 5 May 2014 09:17:30 +0000 (17:17 +0800)]
Merge branch 'MDL-43319-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 5 May 2014 09:17:11 +0000 (17:17 +0800)]
Merge branch 'MDL-44972-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 5 May 2014 09:16:52 +0000 (17:16 +0800)]
Merge branch '45231-27-2' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 5 May 2014 08:27:36 +0000 (16:27 +0800)]
MDL-44972 Atto dialogues: Change M.core.dialogue attribute name to "focusOnShowSelector"
And some minor cleanups.
Ankit Agarwal [Mon, 5 May 2014 08:26:35 +0000 (16:26 +0800)]
MDL-45409 conditional_activity: Do not iterate over deprecated properties
Marina Glancy [Mon, 5 May 2014 08:09:53 +0000 (16:09 +0800)]
Merge branch 'MDL-45357_master' of git://github.com/markn86/moodle
Mark Nelson [Wed, 30 Apr 2014 22:37:17 +0000 (15:37 -0700)]
MDL-45357 events: changed event descriptions to ensure consistency in core
Damyon Wiese [Mon, 5 May 2014 07:21:11 +0000 (15:21 +0800)]
MDL-44972 Atto: Focus on the first input field in forms in dialogues.
Damyon Wiese [Mon, 5 May 2014 06:05:18 +0000 (14:05 +0800)]
MDL-44224: outdent plugin - handle divs that have been silently switched for ps
Also - fix a shifter warning.
Sam Hemelryk [Mon, 5 May 2014 01:23:09 +0000 (13:23 +1200)]
MDL-44224 atto_indent: converts blockquotes to div indents
Ankit Agarwal [Mon, 5 May 2014 05:28:43 +0000 (13:28 +0800)]
MDL-45201 recent_activity: Fix set type notice in recent activity form
Damyon Wiese [Mon, 5 May 2014 02:43:15 +0000 (10:43 +0800)]
Merge branch 'MDL-45290-master' of git://github.com/jethac/moodle
Damyon Wiese [Mon, 5 May 2014 02:35:28 +0000 (10:35 +0800)]
Merge branch 'MDL-45382-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 5 May 2014 02:18:03 +0000 (10:18 +0800)]
Merge branch 'wip-MDL-45127-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Fri, 2 May 2014 02:23:06 +0000 (14:23 +1200)]
MDL-45231 theme_clean: default navbar to absolute when running behat
Dan Poltawski [Fri, 2 May 2014 09:41:54 +0000 (17:41 +0800)]
Moodle release 2.7rc1
Dan Poltawski [Fri, 2 May 2014 09:41:51 +0000 (17:41 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Adrian Greeve [Fri, 2 May 2014 03:21:45 +0000 (11:21 +0800)]
MDL-45127 mod_lesson: Behat test for reviewing a lesson.
Adrian Greeve [Thu, 24 Apr 2014 02:14:13 +0000 (10:14 +0800)]
MDL-45127 mod_lesson: Fixed reviewing lesson answers changing the lesson grade.
Adrian Greeve [Wed, 23 Apr 2014 03:43:38 +0000 (11:43 +0800)]
MDL-45127 mod_lesson: Updated question edit screen with more help text.
Unless the custom scores is selected in the lesson settings the score section
in the question settings will be disabled. A help link has been added with
a description similar to this one.
Dan Poltawski [Fri, 2 May 2014 06:59:25 +0000 (14:59 +0800)]
Merge branch 'MDL-45054-master' of https://github.com/sammarshallou/moodle
Jetha Chan [Wed, 30 Apr 2014 07:12:31 +0000 (15:12 +0800)]
MDL-45290 rubric: visual fixups
Fixed up visual issues with rubric editor on Clean.
Ankit Agarwal [Fri, 2 May 2014 06:05:13 +0000 (14:05 +0800)]
MDL-34904 lti: Fix notice while using lti in frontpage
Andrew Nicols [Fri, 2 May 2014 06:03:16 +0000 (14:03 +0800)]
MDL-45338 editor_atto: Check for selection changes on touch-based devices too
Frederic Massart [Fri, 2 May 2014 02:23:43 +0000 (10:23 +0800)]
MDL-44174 theme_clean: Updating information in readme file
Ankit Agarwal [Thu, 1 May 2014 05:42:55 +0000 (13:42 +0800)]
MDL-45342 book: Automate MDLQA-2423 - A teacher can create book chapters and subchapters
Frederic Massart [Fri, 2 May 2014 04:02:36 +0000 (12:02 +0800)]
MDL-45382 atto_link: Missing context when finding anchors
Andrew Davis [Fri, 2 May 2014 02:47:27 +0000 (10:47 +0800)]
MDL-45314 core_grade: a JS fix for the grader report
Marina Glancy [Fri, 2 May 2014 03:13:06 +0000 (11:13 +0800)]
Merge branch 'MDL-45237-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Fri, 2 May 2014 02:59:29 +0000 (10:59 +0800)]
Merge branch 'MDL-45362-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Fri, 2 May 2014 01:44:49 +0000 (09:44 +0800)]
Merge branch '44729-27' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Thu, 10 Apr 2014 22:20:09 +0000 (10:20 +1200)]
MDL-44729 theme_bootstrapbase: override the maintenance renderer
This patch overrides the maintenance renderer in the bootstrapbase
theme in order to override the notification method in the same way
we override the core renderer notification method.
This ensures now that clean is standard that notifications during
maintenance tasks (install, upgrade etc) look pretty.
AMOS bot [Fri, 2 May 2014 00:39:03 +0000 (00:39 +0000)]
Automatically generated installer lang files
sam marshall [Thu, 1 May 2014 17:08:06 +0000 (18:08 +0100)]
MDL-45376 Completion: Form locking is still not working right
On submit of the form, it called 'freeze' on the completion-related
fields (even though they shouldn't have been frozen because you
already clicked the unlock button).
Marina Glancy [Thu, 1 May 2014 13:17:01 +0000 (21:17 +0800)]
Merge branch 'MDL-45273' of git://github.com/timhunt/moodle
Marina Glancy [Thu, 1 May 2014 13:16:47 +0000 (21:16 +0800)]
Merge branch 'wip-MDL-43557-master' of https://github.com/abgreeve/moodle
sam marshall [Wed, 30 Apr 2014 14:28:03 +0000 (15:28 +0100)]
MDL-45054 Conditional availability: HTML structure improvements
1. Changed the 'delete' and 'eye' buttons to use an <a> link
tag so that it works without custom tabindex and shows a correct
mouse cursor. This also reduces the code slightly.
2. Changed the Cancel button on the dialog to use the mdl-align
class which is used in Atto dialogs. This results in the button
being centered, consistent with those dialogs.
sam marshall [Thu, 1 May 2014 10:18:06 +0000 (11:18 +0100)]
MDL-45362 Availability: Behat test fails on first of month
Tim Hunt [Thu, 1 May 2014 10:09:05 +0000 (11:09 +0100)]
MDL-45273 quiz fixup settings initialisation.
Adrian Greeve [Thu, 1 May 2014 10:00:39 +0000 (18:00 +0800)]
MDL-43557 events: Update of webservice function called string.
Dan Poltawski [Thu, 1 May 2014 08:34:21 +0000 (16:34 +0800)]
Merge branch 'MDL-36836-master' of git://github.com/jethac/moodle
Damyon Wiese [Thu, 1 May 2014 08:22:41 +0000 (16:22 +0800)]
Revert "MDL-45239 editor_atto: The editor cannot be active if it is not the active element"
This reverts commit
05a7f9e749ac31a0a0c9e59a1e0ddab065ddc2f7.
Jetha Chan [Wed, 30 Apr 2014 04:46:25 +0000 (12:46 +0800)]
MDL-36836 filepicker: alfresco select box fix
Adjusted position of alfresco select box; amended border/background application in base.
Dan Poltawski [Thu, 1 May 2014 06:52:02 +0000 (14:52 +0800)]
Merge branch 'MDL-45365-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 1 May 2014 06:43:22 +0000 (14:43 +0800)]
Merge branch 'MDL-43570' of https://github.com/KristerV/moodle
Conflicts:
version.php
Dan Poltawski [Thu, 1 May 2014 06:16:56 +0000 (14:16 +0800)]
MDL-45237 report_loglive: prevent debug warnings
The use of $PAGE necessitates the $PAGE params to be set. Really
the url shouldn't be necessary for this scenario as its enforced for
things like redirects. But this is the quick fix to keep our logs
clean.
Marina Glancy [Thu, 1 May 2014 06:21:39 +0000 (14:21 +0800)]
Merge branch 'MDL-44398-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Thu, 1 May 2014 06:00:40 +0000 (14:00 +0800)]
MDL-45365 Courselib unit tests: cmid -> instanceid confusion
Yet again an instanceid is being passed instead of a cmid.
Dan Poltawski [Thu, 1 May 2014 05:30:53 +0000 (13:30 +0800)]
MDL-43319 phpdoc: fix too much ham consumption by developers
Andrew Nicols [Thu, 1 May 2014 04:33:43 +0000 (12:33 +0800)]
MDL-45359 JS: Only change mask zIndex on modal dialogues
When dealing with a non-modal dialogue within a modal dialogue, we should
not update the z-index of the underyling maskNode as it does not belong to
this dialogue.
Damyon Wiese [Thu, 1 May 2014 04:29:55 +0000 (12:29 +0800)]
Merge branch 'MDL-45329-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 1 May 2014 04:19:49 +0000 (12:19 +0800)]
MDL-45273 quiz: whitespace fix
Marina Glancy [Thu, 1 May 2014 04:16:48 +0000 (12:16 +0800)]
Merge branch 'MDL-45273' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 1 May 2014 04:06:32 +0000 (12:06 +0800)]
Merge branch 'MDL-44815-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 1 May 2014 04:04:11 +0000 (12:04 +0800)]
Merge branch 'MDL-45314_resize' of git://github.com/andyjdavis/moodle
Andrew Davis [Tue, 29 Apr 2014 03:43:13 +0000 (11:43 +0800)]
MDL-45314 core_grade: keep the two grader report scrollbars the same when the table changes width