moodle.git
7 years agoMerge branch 'MDL-36141' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:22:23 +0000 (11:22 +1200)]
Merge branch 'MDL-36141' of https://github.com/merrill-oakland/moodle

7 years agoMerge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 7 Apr 2014 20:59:54 +0000 (08:59 +1200)]
Merge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
lib/editor/atto/plugins/table/yui/src/button/js/button.js
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js

7 years agoMDL-43682 report_loglive: fixed whitespace issue
Sam Hemelryk [Mon, 7 Apr 2014 20:51:17 +0000 (08:51 +1200)]
MDL-43682 report_loglive: fixed whitespace issue

7 years agoMerge branch 'MDL-43682-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 7 Apr 2014 20:50:38 +0000 (08:50 +1200)]
Merge branch 'MDL-43682-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-44760 editor_atto: Make menus consistent with Clean theme
Andrew Nicols [Thu, 27 Mar 2014 04:40:25 +0000 (12:40 +0800)]
MDL-44760 editor_atto: Make menus consistent with Clean theme

7 years agoMerge branch 'MDL-43856-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 7 Apr 2014 09:28:34 +0000 (17:28 +0800)]
Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle

7 years agoMDL-43856 MathJax: Remove unused build folder.
Damyon Wiese [Mon, 7 Apr 2014 09:21:43 +0000 (17:21 +0800)]
MDL-43856 MathJax: Remove unused build folder.

This is left over from when I renamed the module.

7 years agoMerge branch 'MDL-43856-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 7 Apr 2014 08:58:46 +0000 (16:58 +0800)]
Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle

7 years agoMDL-43682 Some imporvements to loglive report
Ankit Agarwal [Mon, 7 Apr 2014 03:42:16 +0000 (11:42 +0800)]
MDL-43682 Some imporvements to loglive report

7 years agoMDL-43682 log: Fix issues with log report
Ankit Agarwal [Fri, 4 Apr 2014 06:42:42 +0000 (14:42 +0800)]
MDL-43682 log: Fix issues with log report

Following fixes have been made:-
Porfile links where generating errors when there was no courseid present. Fixed the same.
get_readers() method was accessing an undefined property.
popups were used for action and ip address before the whole rewrite, we should maintain the same behaviour.
Fixed string issues.
Pass context to format_string method

7 years agoMDL-43682 loglive: Rewrite loglive to use new logging stores
Ankit Agarwal [Fri, 4 Apr 2014 06:42:19 +0000 (14:42 +0800)]
MDL-43682 loglive: Rewrite loglive to use new logging stores

AMOS BEGIN
 CPY [eventcomponent,report_log],[eventcomponent,report_loglive]
 CPY [eventcontext,report_log],[eventcontext,report_loglive]
 CPY [eventloggedas,report_log],[eventloggedas,report_loglive]
 CPY [eventorigin,report_log],[eventorigin,report_loglive]
 CPY [eventrelatedfullnameuser,report_log],[eventrelatedfullnameuser,report_loglive]
 CPY [nologreaderenabled,report_log],[nologreaderenabled,report_loglive]
 CPY [selectlogreader,report_log],[selectlogreader,report_loglive]
AMOS END

7 years agoMerge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 7 Apr 2014 08:57:06 +0000 (16:57 +0800)]
Merge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-44761-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Mon, 7 Apr 2014 08:16:32 +0000 (16:16 +0800)]
Merge branch 'MDL-44761-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'wip-mdl-44873' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Mon, 7 Apr 2014 08:16:25 +0000 (16:16 +0800)]
Merge branch 'wip-mdl-44873' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-44927-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 7 Apr 2014 08:10:14 +0000 (16:10 +0800)]
Merge branch 'MDL-44927-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-41569-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 7 Apr 2014 08:01:56 +0000 (16:01 +0800)]
Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-44927 Atto: Improve table editing UX
Damyon Wiese [Thu, 3 Apr 2014 06:00:22 +0000 (14:00 +0800)]
MDL-44927 Atto: Improve table editing UX

Hide context menu items that don't apply.
Add "Edit table" menu entry to change the caption / headers.

7 years agoMDL-43856 MathJAX: Small correction to readme_moodle.txt
Damyon Wiese [Mon, 7 Apr 2014 07:44:06 +0000 (15:44 +0800)]
MDL-43856 MathJAX: Small correction to readme_moodle.txt

The CDN urls have been moved to settings.php.

7 years agoMerge branch 'wip-MDL-43021-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 7 Apr 2014 07:19:11 +0000 (15:19 +0800)]
Merge branch 'wip-MDL-43021-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-41476 scorm settings- SCORM1.2 standard mode and CMIString length
Nobelium [Wed, 12 Mar 2014 08:31:03 +0000 (08:31 +0000)]
MDL-41476 scorm settings- SCORM1.2 standard mode and CMIString length

Adding SCORM 1.2 standard mode checkbox in scorm admin panel. By default it will be enabled
(i.e: config name = `scorm12standard`, plugin name = `scorm`, value = `1`)
If `scorm12standard` is `1` CMIString256 is of length 256 and CMIString4096 is of length is 4096
if `scorm12standard` is `0` CMIString256 and CMIString4096 are of length is 64000

7 years agoMerge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 7 Apr 2014 05:10:41 +0000 (13:10 +0800)]
Merge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Apr 2014 03:43:12 +0000 (15:43 +1200)]
Merge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-44748-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 7 Apr 2014 03:18:52 +0000 (15:18 +1200)]
Merge branch 'MDL-44748-master' of git://github.com/damyon/moodle

7 years agoMerge branch '44967-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 7 Apr 2014 03:15:51 +0000 (11:15 +0800)]
Merge branch '44967-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-44758-master' of git://github.com/jethac/moodle
Sam Hemelryk [Mon, 7 Apr 2014 03:02:40 +0000 (15:02 +1200)]
Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle

Conflicts:
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js

7 years agoMerge branch 'wip-mdl-44945' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 7 Apr 2014 02:53:56 +0000 (10:53 +0800)]
Merge branch 'wip-mdl-44945' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-44758 editor-atto: prevent table-in-table creation
Jetha Chan [Tue, 1 Apr 2014 04:40:33 +0000 (12:40 +0800)]
MDL-44758 editor-atto: prevent table-in-table creation

Prevent new table creation, displaying table context menu instead when cursor is within caption, when multiple cells are selected, when selection contains both nodes within and outside of the table, and when selection contains nodes from multiple tables.

7 years agoMerge branch '41551-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 7 Apr 2014 02:28:27 +0000 (10:28 +0800)]
Merge branch '41551-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-44940' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 7 Apr 2014 01:16:12 +0000 (13:16 +1200)]
Merge branch 'MDL-44940' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-44846-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 6 Apr 2014 20:48:50 +0000 (08:48 +1200)]
Merge branch 'MDL-44846-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-44949-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 6 Apr 2014 20:15:34 +0000 (08:15 +1200)]
Merge branch 'MDL-44949-master' of git://github.com/damyon/moodle

7 years agoMDL-44882 always set maintenance mode on non-cached admin pages
Petr Škoda [Wed, 2 Apr 2014 03:59:43 +0000 (11:59 +0800)]
MDL-44882 always set maintenance mode on non-cached admin pages

This should resolve all issues with themes during upgrades.

7 years agoMDL-41551 theme_base: improved custom block region handling for base
Sam Hemelryk [Sun, 30 Mar 2014 22:46:50 +0000 (11:46 +1300)]
MDL-41551 theme_base: improved custom block region handling for base

7 years agoMDL-41551 blocks: added tracking and recognition of custom block regions
Sam Hemelryk [Sun, 30 Mar 2014 22:46:18 +0000 (11:46 +1300)]
MDL-41551 blocks: added tracking and recognition of custom block regions

7 years agoMDL-41511 blocks: improved how custom block regions were being rendered.
Sam Hemelryk [Sun, 23 Feb 2014 21:38:17 +0000 (10:38 +1300)]
MDL-41511 blocks: improved how custom block regions were being rendered.

There is a new theme property 'blockrendermethod' that can be set by the
theme in its config.php and tells Moodle what method it is using to render
blocks in the layout files.
Either blocks, or blocks_for_region.
Then when adding custom block regions to a page content we ensure we use
the same method the theme is using elsewhere.

This is really a hack becuase we (I) didn't properly deprecate
blocks_for_region when I added the blocks method.

7 years agoMDL-44967 upgrade: fixed theme removal when themes have been removed already
Sam Hemelryk [Sat, 5 Apr 2014 22:50:34 +0000 (10:50 +1200)]
MDL-44967 upgrade: fixed theme removal when themes have been removed already

7 years agoMDL-36141 course Define role to limit access to Other users.
Eric Merrill [Wed, 26 Mar 2014 14:17:23 +0000 (10:17 -0400)]
MDL-36141 course Define role to limit access to Other users.

7 years agoMDL-44940 quiz editing page problems from MDL-43749.
Tim Hunt [Fri, 4 Apr 2014 13:48:56 +0000 (14:48 +0100)]
MDL-44940 quiz editing page problems from MDL-43749.

* If the quiz starts with an empty page, you could not move the first
question up onto it.
* Adding page breaks in the middle sometimes added them in the wrong
place.
* Adding a new page at the end is problematic, and here we fix it as
much as possible, by letting you move the last question down to create a
new page. This needs MDL-40987 to be fixed properly.

7 years agoMDL-40843 workshop: sort entries in recent activity block by time
Marina Glancy [Wed, 19 Mar 2014 05:57:09 +0000 (13:57 +0800)]
MDL-40843 workshop: sort entries in recent activity block by time

7 years agoMDL-40843 workshop: show user names in recent activity
Marina Glancy [Thu, 6 Mar 2014 03:57:06 +0000 (11:57 +0800)]
MDL-40843 workshop: show user names in recent activity

7 years agoMDL-40843 recent_activity: corrections to grouping and user fields
Marina Glancy [Wed, 19 Mar 2014 03:36:30 +0000 (11:36 +0800)]
MDL-40843 recent_activity: corrections to grouping and user fields

7 years agoMDL-40872 Restore functionality of showrecentsubmissions setting
Marina Glancy [Thu, 25 Jul 2013 01:54:38 +0000 (11:54 +1000)]
MDL-40872 Restore functionality of showrecentsubmissions setting

7 years agoMDL-43856 MathJax: Dynamically load mathjax into the page (as required).
Damyon Wiese [Fri, 4 Apr 2014 06:18:50 +0000 (14:18 +0800)]
MDL-43856 MathJax: Dynamically load mathjax into the page (as required).

This is to solve a tricky edge case, when a page has no equations, and then an AJAX
action loads filtered content which contains an equation. (The glossary filter can do this).

To fix this I split the loading into configuration and typesetting. The config always happens,
but does not load the external mathjax libraries. The typesetting happens when an equation is
found - and is what triggers the load of MathJax. This can happen in response to an AJAX event.

7 years agoMDL-43856 MathJax: Add a setting for additional delimiters to support e.g. ASCIIMATH
Damyon Wiese [Fri, 4 Apr 2014 03:18:54 +0000 (11:18 +0800)]
MDL-43856 MathJax: Add a setting for additional delimiters to support e.g. ASCIIMATH

7 years agoMDL-44873 behat: Added suppport for clean error class.
Rajesh Taneja [Fri, 4 Apr 2014 05:22:58 +0000 (13:22 +0800)]
MDL-44873 behat: Added suppport for clean error class.

7 years agoMDL-44873 theme_bootstrapbase: Added support for notifytiny class
Rajesh Taneja [Fri, 4 Apr 2014 05:19:13 +0000 (13:19 +0800)]
MDL-44873 theme_bootstrapbase: Added support for notifytiny class

7 years agoMDL-44949 Atto: JS error when picking an image from a repository
Damyon Wiese [Fri, 4 Apr 2014 04:03:01 +0000 (12:03 +0800)]
MDL-44949 Atto: JS error when picking an image from a repository

7 years agoMDL-44761 editor_atto: Add keyboard shortcut descriptions to the button titles.
Andrew Nicols [Tue, 25 Mar 2014 15:15:14 +0000 (23:15 +0800)]
MDL-44761 editor_atto: Add keyboard shortcut descriptions to the button titles.

7 years agoMDL-44945 mod_workshop: fixed event snapshot
Rajesh Taneja [Fri, 4 Apr 2014 02:09:08 +0000 (10:09 +0800)]
MDL-44945 mod_workshop: fixed event snapshot

7 years agoMDL-43856 MathJax: Coding style cleanups.
Damyon Wiese [Thu, 3 Apr 2014 06:26:56 +0000 (14:26 +0800)]
MDL-43856 MathJax: Coding style cleanups.

7 years agoMDL-43856 MathJax: Improvements to the MathJax filter
Damyon Wiese [Tue, 1 Apr 2014 07:20:59 +0000 (15:20 +0800)]
MDL-43856 MathJax: Improvements to the MathJax filter

* Remove all traces of mathjax from the atto equation editor - it is filter agnostic
* Add a M.core.event module for core events that can be published/subscribed to by plugins (loose coupling)
* Add a FILTER_CONTENT_UPDATED event so plugins can tell the filter system when nodes are added to the page
* Implement a listener for this event in the MathJax filter
* Fire this event from the equation editor and from the glossary filter
* Add a nolink tag to the mathjax filter, so equations will not be processed by the other filters
* Add a smarter throttle function to the equation editor preview updates (Y.throttle is dumb)

7 years agoMDL-43856 MathJax: Add to standard plugins list
Damyon Wiese [Tue, 25 Mar 2014 08:42:07 +0000 (16:42 +0800)]
MDL-43856 MathJax: Add to standard plugins list

7 years agoMDL-43856 MathJax: alter the equation editor to make it use MathJax if it is available.
Damyon Wiese [Thu, 20 Mar 2014 06:25:44 +0000 (14:25 +0800)]
MDL-43856 MathJax: alter the equation editor to make it use MathJax if it is available.

If MathJax is loaded by any means, the editor should use it instead of the filter. This prevents
slow ajax requests and gives much better rendering. MathJax could be loaded by the filter,
or it could just be done the old way by sticking the include in the page header.

7 years agoMDL-43856 MathJax: Add a mathjax loader filter.
Damyon Wiese [Wed, 20 Nov 2013 08:47:16 +0000 (16:47 +0800)]
MDL-43856 MathJax: Add a mathjax loader filter.

7 years agoweekly release 2.7dev
Marina Glancy [Thu, 3 Apr 2014 04:39:44 +0000 (12:39 +0800)]
weekly release 2.7dev

7 years agoMDL-44747 editor_atto: Improved configuration error messages
Frederic Massart [Thu, 3 Apr 2014 03:20:49 +0000 (11:20 +0800)]
MDL-44747 editor_atto: Improved configuration error messages

7 years agoMDL-43021 course: corrections to the shortname and idnumber uniqueness validation
Marina Glancy [Thu, 3 Apr 2014 03:07:01 +0000 (11:07 +0800)]
MDL-43021 course: corrections to the shortname and idnumber uniqueness validation

7 years agoMDL-44832 behat: Fixed behat test
Rajesh Taneja [Thu, 3 Apr 2014 02:54:51 +0000 (10:54 +0800)]
MDL-44832 behat: Fixed behat test

7 years agoMDL-44846 Atto: Make the color plugins reliable.
Damyon Wiese [Mon, 31 Mar 2014 05:19:59 +0000 (13:19 +0800)]
MDL-44846 Atto: Make the color plugins reliable.

The problem is that in IE, the browser implements color commands with font tags (<font color=...>).

We specifically strip font tags to avoid abuse when pasting from word (the world has seen enough of Tahoma).

This solution instead uses Rangy to set inline styles on the selection. This works in all browsers nicely.

I also updated the toggleInlineSelectionClass function to use the same rangy function. This solves problems with
whitespace squashing in ie.

7 years agoMDL-44720 modinfo: whitespace fix
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 21:17:10 +0000 (23:17 +0200)]
MDL-44720 modinfo: whitespace fix

7 years agoMerge branch 'wip-MDL-44720-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 19:32:42 +0000 (21:32 +0200)]
Merge branch 'wip-MDL-44720-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'master_MDL-44753' of https://github.com/danmarsden/moodle
Damyon Wiese [Wed, 2 Apr 2014 08:33:06 +0000 (16:33 +0800)]
Merge branch 'master_MDL-44753' of https://github.com/danmarsden/moodle

7 years agoMDL-44590 course: fix deprecated behat step use
Dan Poltawski [Wed, 2 Apr 2014 07:57:48 +0000 (15:57 +0800)]
MDL-44590 course: fix deprecated behat step use

7 years agoMDL-44753 SCORM: make correct selection of first sco - also fixes MDL-44896
Dan Marsden [Wed, 2 Apr 2014 07:50:21 +0000 (20:50 +1300)]
MDL-44753 SCORM: make correct selection of first sco - also fixes MDL-44896

7 years agoMerge branch 'MDL-44739-master-fixup' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 2 Apr 2014 06:57:40 +0000 (14:57 +0800)]
Merge branch 'MDL-44739-master-fixup' of git://github.com/FMCorz/moodle

7 years agoMDL-44739 theme_more: Force default settings to be set
Frederic Massart [Wed, 2 Apr 2014 06:41:58 +0000 (14:41 +0800)]
MDL-44739 theme_more: Force default settings to be set

7 years agoMerge branch 'MDL-42891-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Wed, 2 Apr 2014 06:54:59 +0000 (14:54 +0800)]
Merge branch 'MDL-42891-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-42891 adminstration: update strings and display for login fails
Ankit Agarwal [Wed, 2 Apr 2014 06:18:25 +0000 (14:18 +0800)]
MDL-42891 adminstration: update strings and display for login fails

7 years agoMerge branch 'MDL-32729-im' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Wed, 2 Apr 2014 03:37:19 +0000 (16:37 +1300)]
Merge branch 'MDL-32729-im' of git://github.com/andrewnicols/moodle

7 years agoMDL-32729 Question: Load all hidden fields from the source form
Andrew Nicols [Wed, 2 Apr 2014 02:52:02 +0000 (10:52 +0800)]
MDL-32729 Question: Load all hidden fields from the source form

7 years agoMerge branch 'MDL-30085_grade_ws' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 02:05:19 +0000 (04:05 +0200)]
Merge branch 'MDL-30085_grade_ws' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-44749-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Wed, 2 Apr 2014 01:56:46 +0000 (09:56 +0800)]
Merge branch 'MDL-44749-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-32729 Question: Correct button selection when openin qbank chooser
Andrew Nicols [Wed, 2 Apr 2014 01:41:31 +0000 (09:41 +0800)]
MDL-32729 Question: Correct button selection when openin qbank chooser

Some browsers do not bubble form submission events to the window, and we
had more than one form on the page in certain conditions. We need to select
all of the forms on a page and then test the action.

7 years agoMDL-44749 atto_collapse: Skip button inclusion if it will impact UX
Andrew Nicols [Tue, 25 Mar 2014 04:25:16 +0000 (12:25 +0800)]
MDL-44749 atto_collapse: Skip button inclusion if it will impact UX

Do not show the collapse button if:
* it's specified after the cut-off and would therefore be unusable; or
* the total number of groups matches the number of groups to display anyway.

7 years agoMerge branch 'MDL-41063' of git://github.com/jmvedrine/moodle
Marina Glancy [Wed, 2 Apr 2014 01:46:35 +0000 (09:46 +0800)]
Merge branch 'MDL-41063' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-31262' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 01:18:05 +0000 (03:18 +0200)]
Merge branch 'MDL-31262' of git://github.com/timhunt/moodle

7 years agoMerge branch 'master_MDL-44753' of git://github.com/danmarsden/moodle
Marina Glancy [Wed, 2 Apr 2014 01:15:33 +0000 (09:15 +0800)]
Merge branch 'master_MDL-44753' of git://github.com/danmarsden/moodle

7 years agoMDL-24408 Whitespace fix.
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 01:14:36 +0000 (03:14 +0200)]
MDL-24408 Whitespace fix.

7 years agoMerge branch 'MDL-24408_2' of https://github.com/oasychev/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 01:14:06 +0000 (03:14 +0200)]
Merge branch 'MDL-24408_2' of https://github.com/oasychev/moodle

7 years agoMerge branch 'wip-MDL-34012-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 00:57:15 +0000 (02:57 +0200)]
Merge branch 'wip-MDL-34012-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 00:47:59 +0000 (02:47 +0200)]
Merge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'w14_MDL-44843_m27_localedash' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 00:22:51 +0000 (02:22 +0200)]
Merge branch 'w14_MDL-44843_m27_localedash' of https://github.com/skodak/moodle

7 years agoMerge branch 'wip-MDL-41102-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 00:18:54 +0000 (02:18 +0200)]
Merge branch 'wip-MDL-41102-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle
Sam Hemelryk [Wed, 2 Apr 2014 00:04:46 +0000 (13:04 +1300)]
Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle
Eloy Lafuente (stronk7) [Tue, 1 Apr 2014 23:52:41 +0000 (01:52 +0200)]
Merge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle

7 years agoMerge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 1 Apr 2014 23:12:52 +0000 (01:12 +0200)]
Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-44000-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 1 Apr 2014 22:27:30 +0000 (00:27 +0200)]
Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle

Conflicts:
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js

7 years agoMDL-44753 SCORM: add check during SCORM restore to make sure valid launch sco is set
Dan Marsden [Wed, 26 Mar 2014 08:35:18 +0000 (21:35 +1300)]
MDL-44753 SCORM: add check during SCORM restore to make sure valid launch sco is set

7 years agoMerge branch 'MDL-44832-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:54:33 +0000 (09:54 +1300)]
Merge branch 'MDL-44832-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:54:13 +0000 (09:54 +1300)]
Merge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/deprecatedlib.php

7 years agoMerge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:51:47 +0000 (09:51 +1300)]
Merge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-44772-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:43:25 +0000 (09:43 +1300)]
Merge branch 'MDL-44772-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

7 years agoMerge branch 'MDL-44762-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:29:11 +0000 (09:29 +1300)]
Merge branch 'MDL-44762-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:28:49 +0000 (09:28 +1300)]
Merge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

7 years agoMerge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:27:23 +0000 (09:27 +1300)]
Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-43284-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:27:03 +0000 (09:27 +1300)]
Merge branch 'MDL-43284-master' of git://github.com/phalacee/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 1 Apr 2014 19:50:09 +0000 (21:50 +0200)]
Merge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle
Marina Glancy [Tue, 1 Apr 2014 09:40:35 +0000 (17:40 +0800)]
Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle

7 years agoMerge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle
Marina Glancy [Tue, 1 Apr 2014 09:40:22 +0000 (17:40 +0800)]
Merge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle

7 years agoMDL-42891 administration: Replace use of logtable in notify_login_failures() with...
Ankit Agarwal [Fri, 21 Feb 2014 05:15:46 +0000 (13:15 +0800)]
MDL-42891 administration: Replace use of logtable in notify_login_failures() with new logging apis