moodle.git
8 years agoMDL-45412 cachestore_mongodb: added notification of old Mongo version use
Sam Hemelryk [Mon, 5 May 2014 21:30:27 +0000 (09:30 +1200)]
MDL-45412 cachestore_mongodb: added notification of old Mongo version use

8 years agoMDL-45412 cachestore_mongodb: fixed use of deprecated Mongo class
Sam Hemelryk [Mon, 5 May 2014 21:29:45 +0000 (09:29 +1200)]
MDL-45412 cachestore_mongodb: fixed use of deprecated Mongo class

8 years agoMerge branch 'MDL-34904-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 5 May 2014 09:41:01 +0000 (17:41 +0800)]
Merge branch 'MDL-34904-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-45359-master' of git://github.com/andrewnicols/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

8 years agoMerge branch 'MDL-44174-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 5 May 2014 09:18:04 +0000 (17:18 +0800)]
Merge branch 'MDL-44174-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-45342-master' of git://github.com/ankitagarwal/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

8 years agoMerge branch 'MDL-43319-master' of git://github.com/danpoltawski/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

8 years agoMerge branch 'MDL-44972-master' of git://github.com/damyon/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

8 years agoMerge branch '45231-27-2' of git://github.com/samhemelryk/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

8 years agoMDL-44972 Atto dialogues: Change M.core.dialogue attribute name to "focusOnShowSelector"
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.

8 years agoMerge branch 'MDL-45357_master' of git://github.com/markn86/moodle
Marina Glancy [Mon, 5 May 2014 08:09:53 +0000 (16:09 +0800)]
Merge branch 'MDL-45357_master' of git://github.com/markn86/moodle

8 years agoMDL-45357 events: changed event descriptions to ensure consistency in core
Mark Nelson [Wed, 30 Apr 2014 22:37:17 +0000 (15:37 -0700)]
MDL-45357 events: changed event descriptions to ensure consistency in core

8 years agoMDL-44972 Atto: Focus on the first input field in forms in dialogues.
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.

8 years agoMDL-44224: outdent plugin - handle divs that have been silently switched for ps
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.

8 years agoMDL-44224 atto_indent: converts blockquotes to div indents
Sam Hemelryk [Mon, 5 May 2014 01:23:09 +0000 (13:23 +1200)]
MDL-44224 atto_indent: converts blockquotes to div indents

8 years agoMerge branch 'MDL-45290-master' of git://github.com/jethac/moodle
Damyon Wiese [Mon, 5 May 2014 02:43:15 +0000 (10:43 +0800)]
Merge branch 'MDL-45290-master' of git://github.com/jethac/moodle

8 years agoMerge branch 'MDL-45382-master' of git://github.com/FMCorz/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

8 years agoMerge branch 'wip-MDL-45127-master' of git://github.com/abgreeve/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

8 years agoMDL-45231 theme_clean: default navbar to absolute when running behat
Sam Hemelryk [Fri, 2 May 2014 02:23:06 +0000 (14:23 +1200)]
MDL-45231 theme_clean: default navbar to absolute when running behat

8 years agoMoodle release 2.7rc1 v2.7.0-rc1
Dan Poltawski [Fri, 2 May 2014 09:41:54 +0000 (17:41 +0800)]
Moodle release 2.7rc1

8 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
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

8 years agoMDL-45127 mod_lesson: Behat test for reviewing a lesson.
Adrian Greeve [Fri, 2 May 2014 03:21:45 +0000 (11:21 +0800)]
MDL-45127 mod_lesson: Behat test for reviewing a lesson.

8 years agoMDL-45127 mod_lesson: Fixed reviewing lesson answers changing the lesson grade.
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.

8 years agoMDL-45127 mod_lesson: Updated question edit screen with more help text.
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.

8 years agoMerge branch 'MDL-45054-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Fri, 2 May 2014 06:59:25 +0000 (14:59 +0800)]
Merge branch 'MDL-45054-master' of https://github.com/sammarshallou/moodle

8 years agoMDL-45290 rubric: visual fixups
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.

8 years agoMDL-34904 lti: Fix notice while using lti in frontpage
Ankit Agarwal [Fri, 2 May 2014 06:05:13 +0000 (14:05 +0800)]
MDL-34904 lti: Fix notice while using lti in frontpage

8 years agoMDL-44174 theme_clean: Updating information in readme file
Frederic Massart [Fri, 2 May 2014 02:23:43 +0000 (10:23 +0800)]
MDL-44174 theme_clean: Updating information in readme file

8 years agoMDL-45342 book: Automate MDLQA-2423 - A teacher can create book chapters and subchapters
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

8 years agoMDL-45382 atto_link: Missing context when finding anchors
Frederic Massart [Fri, 2 May 2014 04:02:36 +0000 (12:02 +0800)]
MDL-45382 atto_link: Missing context when finding anchors

8 years agoMDL-45314 core_grade: a JS fix for the grader report
Andrew Davis [Fri, 2 May 2014 02:47:27 +0000 (10:47 +0800)]
MDL-45314 core_grade: a JS fix for the grader report

8 years agoMerge branch 'MDL-45237-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Fri, 2 May 2014 03:13:06 +0000 (11:13 +0800)]
Merge branch 'MDL-45237-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-45362-master' of https://github.com/sammarshallou/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

8 years agoMerge branch '44729-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 2 May 2014 01:44:49 +0000 (09:44 +0800)]
Merge branch '44729-27' of git://github.com/samhemelryk/moodle

8 years agoMDL-44729 theme_bootstrapbase: override the maintenance renderer
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.

8 years agoAutomatically generated installer lang files
AMOS bot [Fri, 2 May 2014 00:39:03 +0000 (00:39 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-45273' of git://github.com/timhunt/moodle
Marina Glancy [Thu, 1 May 2014 13:17:01 +0000 (21:17 +0800)]
Merge branch 'MDL-45273' of git://github.com/timhunt/moodle

8 years agoMerge branch 'wip-MDL-43557-master' of https://github.com/abgreeve/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

8 years agoMDL-45054 Conditional availability: HTML structure improvements
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.

8 years agoMDL-45362 Availability: Behat test fails on first of month
sam marshall [Thu, 1 May 2014 10:18:06 +0000 (11:18 +0100)]
MDL-45362 Availability: Behat test fails on first of month

8 years agoMDL-45273 quiz fixup settings initialisation.
Tim Hunt [Thu, 1 May 2014 10:09:05 +0000 (11:09 +0100)]
MDL-45273 quiz fixup settings initialisation.

8 years agoMDL-43557 events: Update of webservice function called string.
Adrian Greeve [Thu, 1 May 2014 10:00:39 +0000 (18:00 +0800)]
MDL-43557 events: Update of webservice function called string.

8 years agoMerge branch 'MDL-36836-master' of git://github.com/jethac/moodle
Dan Poltawski [Thu, 1 May 2014 08:34:21 +0000 (16:34 +0800)]
Merge branch 'MDL-36836-master' of git://github.com/jethac/moodle

8 years agoRevert "MDL-45239 editor_atto: The editor cannot be active if it is not the active...
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.

8 years agoMDL-36836 filepicker: alfresco select box fix
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.

8 years agoMerge branch 'MDL-45365-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 1 May 2014 06:52:02 +0000 (14:52 +0800)]
Merge branch 'MDL-45365-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-43570' of https://github.com/KristerV/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

8 years agoMDL-45237 report_loglive: prevent debug warnings
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.

8 years agoMerge branch 'MDL-44398-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Thu, 1 May 2014 06:21:39 +0000 (14:21 +0800)]
Merge branch 'MDL-44398-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-45365 Courselib unit tests: cmid -> instanceid confusion
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.

8 years agoMDL-43319 phpdoc: fix too much ham consumption by developers
Dan Poltawski [Thu, 1 May 2014 05:30:53 +0000 (13:30 +0800)]
MDL-43319 phpdoc: fix too much ham consumption by developers

8 years agoMDL-45359 JS: Only change mask zIndex on modal dialogues
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.

8 years agoMerge branch 'MDL-45329-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Thu, 1 May 2014 04:29:55 +0000 (12:29 +0800)]
Merge branch 'MDL-45329-master' of git://github.com/andrewnicols/moodle

8 years agoMDL-45273 quiz: whitespace fix
Marina Glancy [Thu, 1 May 2014 04:19:49 +0000 (12:19 +0800)]
MDL-45273 quiz: whitespace fix

8 years agoMerge branch 'MDL-45273' of git://github.com/timhunt/moodle
Marina Glancy [Thu, 1 May 2014 04:16:48 +0000 (12:16 +0800)]
Merge branch 'MDL-45273' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-44815-master' of git://github.com/andrewnicols/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

8 years agoMerge branch 'MDL-45314_resize' of git://github.com/andyjdavis/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

8 years agoMDL-45314 core_grade: keep the two grader report scrollbars the same when the table...
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

8 years agoMDL-44815 theme: Make chooser icons the standard 16px
Andrew Nicols [Thu, 1 May 2014 01:53:37 +0000 (09:53 +0800)]
MDL-44815 theme: Make chooser icons the standard 16px

The only exception to this rule is the activity chooser which is allowed
24px.

8 years agoMDL-44815 core: Add chooser type to boundingbox class
Andrew Nicols [Thu, 1 May 2014 01:50:41 +0000 (09:50 +0800)]
MDL-44815 core: Add chooser type to boundingbox class

8 years agoMerge branch 'MDL-45254-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 1 May 2014 03:53:28 +0000 (11:53 +0800)]
Merge branch 'MDL-45254-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js

8 years agoMerge branch 'MDL-45292-master' of git://github.com/jethac/moodle
Marina Glancy [Thu, 1 May 2014 03:48:00 +0000 (11:48 +0800)]
Merge branch 'MDL-45292-master' of git://github.com/jethac/moodle

8 years agoMerge branch 'wip-MDL-45360-master' of git://github.com/abgreeve/moodle
Marina Glancy [Thu, 1 May 2014 03:47:51 +0000 (11:47 +0800)]
Merge branch 'wip-MDL-45360-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'MDL-45343-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Thu, 1 May 2014 03:47:40 +0000 (11:47 +0800)]
Merge branch 'MDL-45343-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-45258-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Thu, 1 May 2014 03:47:27 +0000 (11:47 +0800)]
Merge branch 'MDL-45258-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-45329 admin_task: Allow scheduled task change prevention
Andrew Nicols [Wed, 30 Apr 2014 02:45:37 +0000 (10:45 +0800)]
MDL-45329 admin_task: Allow scheduled task change prevention

Some hosting providers have a requirement to prevent users making
modifications to the configuration of scheduled tasks as doing so may have
a negative impact not only on their own site, but also on the performance
of other sites (depending on host configuration). For example, if the
statistics or automated backup tasks were run every minute, this could have
a negative impact for other users).

8 years agoMerge branch 'MDL-45167-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 1 May 2014 03:37:13 +0000 (11:37 +0800)]
Merge branch 'MDL-45167-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'wip-MDL-45348-master' of git://github.com/abgreeve/moodle
Marina Glancy [Thu, 1 May 2014 03:22:54 +0000 (11:22 +0800)]
Merge branch 'wip-MDL-45348-master' of git://github.com/abgreeve/moodle

8 years agoMDL-45348 report_eventlist: Removed duplicate list link in plugins > report.
Adrian Greeve [Thu, 1 May 2014 01:27:10 +0000 (09:27 +0800)]
MDL-45348 report_eventlist: Removed duplicate list link in plugins > report.

I also fixed up a spelling mistake in the language pack (relatedobservers).

8 years agoMDL-45167 install: Improve styling of installation process
Andrew Nicols [Wed, 30 Apr 2014 07:21:41 +0000 (15:21 +0800)]
MDL-45167 install: Improve styling of installation process

8 years agoMerge branch 'MDL-45283-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 1 May 2014 02:40:14 +0000 (10:40 +0800)]
Merge branch 'MDL-45283-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-44867-m2' of git://github.com/andrewnicols/moodle
Damyon Wiese [Thu, 1 May 2014 02:29:42 +0000 (10:29 +0800)]
Merge branch 'MDL-44867-m2' of git://github.com/andrewnicols/moodle

8 years agoMDL-44867 atto_equation: Adjust the help string describing cursor info
Andrew Nicols [Thu, 1 May 2014 02:18:03 +0000 (10:18 +0800)]
MDL-44867 atto_equation: Adjust the help string describing cursor info

8 years agoMDL-45360 report_eventlist: Fixed up css for the Events list detail page.
Adrian Greeve [Thu, 1 May 2014 02:01:55 +0000 (10:01 +0800)]
MDL-45360 report_eventlist: Fixed up css for the Events list detail page.

When the screen size is reduced the details are moved underneath the headings
prematurely.

8 years agoMDL-43570 filetypes: Added new filetypes - ddoc, bdoc, cdoc
Krister Viirsaar [Wed, 30 Apr 2014 07:05:49 +0000 (10:05 +0300)]
MDL-43570 filetypes: Added new filetypes - ddoc, bdoc, cdoc

8 years agoMDL-45343 report_log: Fix missing enddate clause when using date filter
Ankit Agarwal [Wed, 30 Apr 2014 08:48:40 +0000 (16:48 +0800)]
MDL-45343 report_log: Fix missing enddate clause when using date filter

8 years agoMerge branch 'w19_MDL-45262_m27_choice' of https://github.com/skodak/moodle
Damyon Wiese [Wed, 30 Apr 2014 08:37:53 +0000 (16:37 +0800)]
Merge branch 'w19_MDL-45262_m27_choice' of https://github.com/skodak/moodle

8 years agoMerge branch 'mdl44575-master' of https://github.com/tlock/moodle
Damyon Wiese [Wed, 30 Apr 2014 08:31:41 +0000 (16:31 +0800)]
Merge branch 'mdl44575-master' of https://github.com/tlock/moodle

8 years agoMerge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 30 Apr 2014 07:48:17 +0000 (15:48 +0800)]
Merge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-44867-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 30 Apr 2014 07:40:36 +0000 (15:40 +0800)]
Merge branch 'MDL-44867-master' of git://github.com/andrewnicols/moodle

8 years agoMDL-45256 portfolio: Adding missing global in testcase
Frederic Massart [Wed, 30 Apr 2014 07:32:23 +0000 (15:32 +0800)]
MDL-45256 portfolio: Adding missing global in testcase

8 years agoMDL-45262 remove set_page_detail() leftover from choice report
Petr Skoda [Wed, 30 Apr 2014 07:24:24 +0000 (15:24 +0800)]
MDL-45262 remove set_page_detail() leftover from choice report

8 years agoMerge branch 'MDL-45321' of git://github.com/timhunt/moodle
Damyon Wiese [Wed, 30 Apr 2014 07:25:22 +0000 (15:25 +0800)]
Merge branch 'MDL-45321' of git://github.com/timhunt/moodle

8 years agoMerge branch 'w19_MDL-43557_m27_cleanup' of git://github.com/skodak/moodle
Marina Glancy [Wed, 30 Apr 2014 07:12:56 +0000 (15:12 +0800)]
Merge branch 'w19_MDL-43557_m27_cleanup' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-43557_master' of git://github.com/markn86/moodle
Marina Glancy [Wed, 30 Apr 2014 07:12:31 +0000 (15:12 +0800)]
Merge branch 'MDL-43557_master' of git://github.com/markn86/moodle

8 years agoMDL-43557 add missing description to \mod_quiz\event\attempt_becameoverdue
Petr Skoda [Wed, 30 Apr 2014 07:00:03 +0000 (15:00 +0800)]
MDL-43557 add missing description to \mod_quiz\event\attempt_becameoverdue

8 years agoMDL-43557 fix BC issue in \core\event\course_completed and incorrect description
Petr Skoda [Wed, 30 Apr 2014 05:47:38 +0000 (13:47 +0800)]
MDL-43557 fix BC issue in \core\event\course_completed and incorrect description

8 years agoMerge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 30 Apr 2014 06:58:56 +0000 (14:58 +0800)]
Merge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-45298-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 30 Apr 2014 06:15:40 +0000 (14:15 +0800)]
Merge branch 'MDL-45298-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-45239-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 30 Apr 2014 04:13:49 +0000 (12:13 +0800)]
Merge branch 'MDL-45239-master' of git://github.com/andrewnicols/moodle

8 years agoMDL-45283 restore: Prevent failure when user course grade exists
Frederic Massart [Wed, 30 Apr 2014 04:09:13 +0000 (12:09 +0800)]
MDL-45283 restore: Prevent failure when user course grade exists

When we restore a course, the grade that a user has for the
grade item of the course cannot be created twice. If we try
to create it when it already exists, a database exception is
raised because of index duplication.

The safest way to proceed is certainly to ignore the grade
information from the backup, otherwise we could potentially
overwrite existing information. Though, this only applies
to restore as merge, and it does not affect the update of
the course grade.

8 years agoMDL-43557 fix assertion for course section event description
Petr Skoda [Wed, 30 Apr 2014 03:44:56 +0000 (11:44 +0800)]
MDL-43557 fix assertion for course section event description

8 years agoMerge branch 'MDL-44780_mathjax_default' of https://github.com/andyjdavis/moodle
Dan Poltawski [Wed, 30 Apr 2014 03:25:02 +0000 (11:25 +0800)]
Merge branch 'MDL-44780_mathjax_default' of https://github.com/andyjdavis/moodle

8 years agoMDL-44867 atto_equation: Switch to the Downarrow for cursor position
Andrew Nicols [Wed, 30 Apr 2014 03:14:34 +0000 (11:14 +0800)]
MDL-44867 atto_equation: Switch to the Downarrow for cursor position

The \square macro is not available in standard MimeTeX.

8 years agoMDL-43557 fix relateduserid in \mod_workshop\event\submission_assessed
Petr Skoda [Wed, 30 Apr 2014 02:58:16 +0000 (10:58 +0800)]
MDL-43557 fix relateduserid in \mod_workshop\event\submission_assessed

The assessment is related to the original author of submission.

8 years agoMDL-43557 events: fixed minor issues in existing events
Mark Nelson [Thu, 24 Apr 2014 00:41:12 +0000 (17:41 -0700)]
MDL-43557 events: fixed minor issues in existing events

8 years agoMDL-43557 mod_lesson: removed incorrect usage of snapshots
Mark Nelson [Thu, 24 Apr 2014 00:13:14 +0000 (17:13 -0700)]
MDL-43557 mod_lesson: removed incorrect usage of snapshots

8 years agoMDL-43557 events: renamed event class names
Mark Nelson [Thu, 17 Apr 2014 22:52:34 +0000 (15:52 -0700)]
MDL-43557 events: renamed event class names

1) The core 'item_tagged' class was renamed to 'tag_added'.
2) The core 'item_untagged' class was renamed to 'tag_removed'.
3) The core 'message_read' class was renamed to 'message_viewed'.
4) The mod_forum 'userreport_viewed' class was renamed to 'user_report_viewed'.
5) The report_outline 'activity_viewed' was renamed to 'activity_report_viewed'.
6) The report_outline 'outline_viewed' was renamed to 'report_viewed'.

8 years agoMDL-43557 events: removed underscores from event string keys
Mark Nelson [Thu, 17 Apr 2014 01:29:18 +0000 (18:29 -0700)]
MDL-43557 events: removed underscores from event string keys

AMOS START
 MOV [event_legacy_logged, logstore_legacy],[eventlegacylogged,logstore_legacy]
 MOV [event_cohort_created,cohort],[eventcohortcreated,cohort]
 MOV [event_cohort_deleted,cohort],[eventcohortdeleted,cohort]
 MOV [event_cohort_member_added,cohort],[eventcohortmemberadded,cohort]
 MOV [event_cohort_member_removed,cohort],[eventcohortmemberremoved,cohort]
 MOV [event_cohort_updated,cohort],[eventcohortupdated,cohort]
 MOV [event_group_created,group],[eventgroupcreated,group]
 MOV [event_group_deleted,group],[eventgroupdeleted,group]
 MOV [event_group_member_added,group],[eventgroupmemberadded,group]
 MOV [event_group_member_removed,group],[eventgroupmemberremoved,group]
 MOV [event_group_updated,group],[eventgroupupdated,group]
 MOV [event_grouping_created,group],[eventgroupingcreated,group]
 MOV [event_grouping_deleted,group],[eventgroupingdeleted,group]
 MOV [event_grouping_updated,group],[eventgroupingupdated,group]
 MOV [event_webservice_function_called,webservice],[eventwebservicefunctioncalled,webservice]
 MOV [event_webservice_login_failed,webservice],[eventwebserviceloginfailed,webservice]
 MOV [event_webservice_service_created,webservice],[eventwebserviceservicecreated,webservice]
 MOV [event_webservice_service_deleted,webservice],[eventwebserviceservicedeleted,webservice]
 MOV [event_webservice_service_updated,webservice],[eventwebserviceserviceupdated,webservice]
 MOV [event_webservice_service_user_added,webservice],[eventwebserviceserviceuseradded,webservice]
 MOV [event_webservice_service_user_removed,webservice],[eventwebserviceserviceuserremoved,webservice]
 MOV [event_webservice_token_created,webservice],[eventwebservicetokencreated,webservice]
 MOV [event_webservice_token_sent,webservice],[eventwebservicetokensent,webservice]
 MOV [event_user_loggedin,auth],[eventuserloggedin,auth]
 MOV [event_assessable_uploaded,assignsubmission_file],[eventassessableuploaded,assignsubmission_file]
 MOV [event_assessable_uploaded,assignsubmission_onlinetext],[eventassessableuploaded,assignsubmission_onlinetext]
 MOV [event_chapter_created,mod_book],[eventchaptercreated,mod_book]
 MOV [event_chapter_deleted,mod_book],[eventchapterdeleted,mod_book]
 MOV [event_chapter_updated,mod_book],[eventchapterupdated,mod_book]
 MOV [event_chapter_viewed,mod_book],[eventchapterviewed,mod_book]
 MOV [event_book_exported,booktool_exportimscp],[eventbookexported,booktool_exportimscp]
 MOV [event_book_printed,booktool_print],[eventbookprinted,booktool_print]
 MOV [event_chapter_printed,booktool_print],[eventchapterprinted,booktool_print]
 MOV [event_message_sent,mod_chat],[eventmessagesent,mod_chat]
 MOV [event_sessions_viewed,mod_chat],[eventsessionsviewed,mod_chat]
 MOV [event_answer_created,mod_choice],[eventanswercreated,mod_choice]
 MOV [event_answer_updated,mod_choice],[eventanswerupdated,mod_choice]
 MOV [event_report_viewed,mod_choice],[eventreportviewed,mod_choice]
 MOV [event_assessable_uploaded,mod_forum],[eventassessableuploaded,mod_forum]
 MOV [event_assessable_uploaded,mod_workshop],[eventassessableuploaded,mod_workshop]
AMOS END

8 years agoMerge branch 'MDL-45257-master-2nd' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 30 Apr 2014 02:05:11 +0000 (10:05 +0800)]
Merge branch 'MDL-45257-master-2nd' of git://github.com/FMCorz/moodle