Commit graph

67469 commits

Author SHA1 Message Date
Dan Poltawski
b48eaedeb9 Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle 2014-04-07 17:28:34 +08:00
Damyon Wiese
22cee6a7ea MDL-43856 MathJax: Remove unused build folder.
This is left over from when I renamed the module.
2014-04-07 17:21:43 +08:00
Dan Poltawski
4834cfdf59 Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle 2014-04-07 16:58:46 +08:00
Damyon Wiese
e017c50bcf Merge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle 2014-04-07 16:57:06 +08:00
Marina Glancy
a8e4b006ce Merge branch 'MDL-44761-master' of git://github.com/andrewnicols/moodle 2014-04-07 16:16:32 +08:00
Marina Glancy
502ff062a0 Merge branch 'wip-mdl-44873' of git://github.com/rajeshtaneja/moodle 2014-04-07 16:16:25 +08:00
Dan Poltawski
e2e1622946 Merge branch 'MDL-44927-master' of git://github.com/damyon/moodle 2014-04-07 16:10:14 +08:00
Dan Poltawski
5e8be14cb9 Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-07 16:01:56 +08:00
Damyon Wiese
353473aa59 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.
2014-04-07 15:57:59 +08:00
Damyon Wiese
1c9785d52d MDL-43856 MathJAX: Small correction to readme_moodle.txt
The CDN urls have been moved to settings.php.
2014-04-07 15:44:06 +08:00
Damyon Wiese
2aa476bbc8 Merge branch 'wip-MDL-43021-master' of git://github.com/marinaglancy/moodle 2014-04-07 15:19:11 +08:00
Nobelium
e3528983f2 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
2014-04-07 14:07:48 +08:00
Dan Poltawski
0678d09213 Merge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle 2014-04-07 13:10:41 +08:00
Sam Hemelryk
54c4398a6d Merge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle 2014-04-07 15:43:12 +12:00
Sam Hemelryk
b017ff6da6 Merge branch 'MDL-44748-master' of git://github.com/damyon/moodle 2014-04-07 15:18:52 +12:00
Damyon Wiese
c61269af86 Merge branch '44967-27' of git://github.com/samhemelryk/moodle 2014-04-07 11:15:51 +08:00
Sam Hemelryk
5ee0b3ceaf 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
2014-04-07 15:02:40 +12:00
Dan Poltawski
d69f584fe6 Merge branch 'wip-mdl-44945' of https://github.com/rajeshtaneja/moodle 2014-04-07 10:53:56 +08:00
Jetha Chan
3a6511a530 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.
2014-04-07 10:44:29 +08:00
Dan Poltawski
1c9e738b54 Merge branch '41551-27' of git://github.com/samhemelryk/moodle 2014-04-07 10:28:27 +08:00
Sam Hemelryk
b96bee62b1 Merge branch 'MDL-44940' of git://github.com/timhunt/moodle 2014-04-07 13:16:12 +12:00
Sam Hemelryk
2429e44011 Merge branch 'MDL-44846-master' of git://github.com/damyon/moodle 2014-04-07 08:48:50 +12:00
Sam Hemelryk
70aab3836a Merge branch 'MDL-44949-master' of git://github.com/damyon/moodle 2014-04-07 08:15:34 +12:00
Petr Škoda
1a361486a9 MDL-44882 always set maintenance mode on non-cached admin pages
This should resolve all issues with themes during upgrades.
2014-04-06 20:37:55 +08:00
Sam Hemelryk
04f1a90d05 MDL-41551 theme_base: improved custom block region handling for base 2014-04-06 15:17:48 +12:00
Sam Hemelryk
292dcf047f MDL-41551 blocks: added tracking and recognition of custom block regions 2014-04-06 15:17:47 +12:00
Sam Hemelryk
225c418fd2 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.
2014-04-06 15:17:47 +12:00
Sam Hemelryk
9bebe2bbbc MDL-44967 upgrade: fixed theme removal when themes have been removed already 2014-04-06 10:50:34 +12:00
Tim Hunt
07a0370bf8 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.
2014-04-04 19:03:16 +01:00
Marina Glancy
9fb549a543 MDL-40843 workshop: sort entries in recent activity block by time 2014-04-04 16:52:02 +08:00
Marina Glancy
a1bff2f92a MDL-40843 workshop: show user names in recent activity 2014-04-04 16:52:01 +08:00
Marina Glancy
e19c086c36 MDL-40843 recent_activity: corrections to grouping and user fields 2014-04-04 16:52:01 +08:00
Marina Glancy
d6f418cb77 MDL-40872 Restore functionality of showrecentsubmissions setting 2014-04-04 15:11:13 +08:00
Damyon Wiese
aaf6f1e8f2 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.
2014-04-04 14:18:50 +08:00
Damyon Wiese
894e20395d MDL-43856 MathJax: Add a setting for additional delimiters to support e.g. ASCIIMATH 2014-04-04 13:30:08 +08:00
Rajesh Taneja
f8b589c90c MDL-44873 behat: Added suppport for clean error class. 2014-04-04 13:22:58 +08:00
Rajesh Taneja
0ac63cfce7 MDL-44873 theme_bootstrapbase: Added support for notifytiny class 2014-04-04 13:19:13 +08:00
Damyon Wiese
8d1c017979 MDL-44949 Atto: JS error when picking an image from a repository 2014-04-04 12:03:01 +08:00
Andrew Nicols
d86e45f0ce MDL-44761 editor_atto: Add keyboard shortcut descriptions to the button titles. 2014-04-04 11:32:20 +08:00
Rajesh Taneja
fef8ee9114 MDL-44945 mod_workshop: fixed event snapshot 2014-04-04 10:09:08 +08:00
Damyon Wiese
441f94b263 MDL-43856 MathJax: Coding style cleanups. 2014-04-03 14:36:42 +08:00
Damyon Wiese
cc90cedc85 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)
2014-04-03 14:36:36 +08:00
Damyon Wiese
289ed254a7 MDL-43856 MathJax: Add to standard plugins list 2014-04-03 14:36:33 +08:00
Damyon Wiese
8939ebac77 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.
2014-04-03 14:36:25 +08:00
Damyon Wiese
7f6753151e MDL-43856 MathJax: Add a mathjax loader filter. 2014-04-03 14:36:16 +08:00
Marina Glancy
1a727e121e weekly release 2.7dev 2014-04-03 12:39:44 +08:00
Frederic Massart
52329a32f1 MDL-44747 editor_atto: Improved configuration error messages 2014-04-03 11:24:05 +08:00
Marina Glancy
e13016850c MDL-43021 course: corrections to the shortname and idnumber uniqueness validation 2014-04-03 11:07:01 +08:00
Rajesh Taneja
ae8c220fd5 MDL-44832 behat: Fixed behat test 2014-04-03 10:59:58 +08:00
Damyon Wiese
af6a2e9459 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.
2014-04-03 10:52:41 +08:00