Commit graph

67608 commits

Author SHA1 Message Date
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
Andrew Davis
abdfe18ddb MDL-44454 core_user: removed unused code from user/index.php 2014-04-07 12:02:15 +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
Jason Fowler
9754ab92da MDL-44765 Atto: Fix the accessibility warning events for image dialogue 2014-04-07 07:59:45 +08:00
Aaron Wells
d54404e5bb MDL-44971 Add hook to "add_attempt" for mod/assign/submission plugins 2014-04-07 10:52:48 +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
Sam Hemelryk
af23b60598 MDL-44944 theme_bootstrapbase: fixed content spacing issue with docked region
Thanks Mary Evans for the peer-review and better solution
2014-04-07 08:12:35 +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
566889aaa8 MDL-42317 output: reviewed standard/base layouts and converted where a better option was available 2014-04-06 15:57:32 +12:00
Sam Hemelryk
20015af513 MDL-42317 theme_bootstrapbase: more responsive styling for forms with blocks pre && post 2014-04-06 15:40:09 +12: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
shashirepo
600be271c6 MDL-39833 course: require token change
MDL-39833 course: require token change
2014-04-05 12:29:47 +05:30
Eric Merrill
288e7b0921 MDL-36141 course Define role to limit access to Other users. 2014-04-04 14:58:48 -04:00
Tim Hunt
3a528d4e76 MDL-44948 add tool_qeupgradehelper to the list of deleted plugins. 2014-04-04 19:21:23 +01: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
sam marshall
15c8c47401 MDL-44891 Behat: Add step to check attribute
This commit creates a Behat step of the form:

Then the "title" attribute of "Toggle visibility" "button"
should contain "Show"

This is useful because unless I missed something there is currently
no step that checks attribute values; this seems like a simple
generic step. Behat is intended to check user-visible effects in
the resulting HTML, and sometimes these effects are implemented
using attribute values (two common examples are the alt= attribute,
which is visible to screenreader users, and the title= attribute,
which is visible to all users; there's also the src attribute of
images, and lots of other possibilities too).
2014-04-04 18:17:39 +01:00
sam marshall
c0fb7f4417 MDL-44891 Behat: Add step to check attribute
This commit creates a Behat step of the form:

Then the "title" attribute of "Toggle visibility" "button"
should contain "Show"

This is useful because unless I missed something there is currently
no step that checks attribute values; this seems like a simple
generic step. Behat is intended to check user-visible effects in
the resulting HTML, and sometimes these effects are implemented
using attribute values (two common examples are the alt= attribute,
which is visible to screenreader users, and the title= attribute,
which is visible to all users; there's also the src attribute of
images, and lots of other possibilities too).
2014-04-04 18:16:28 +01:00
Juan Leyva
4595c79b74 MDL-44408 Adding missing order (so we start looking for newest discussions) 2014-04-04 12:13:47 +02:00
Juan Leyva
1fee2cd4e9 MDL-44408 Add "pagination" to WebService get_forum_discussions 2014-04-04 12:13:47 +02: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
Andrew Nicols
49a510efbd MDL-44241 atto_unlink: Merge into atto_link 2014-04-04 12:03:02 +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
Jetha Chan
0a1456dfa8 MDL-44810 editor_atto: restore selection after button press
Fixed issue where clicking on buttons erroneously lost viewport focus and selection.
2014-04-04 11:47:56 +08:00
Marina Glancy
f5c6e8db1d MDL-18598 forum: redefine index to allow faster cron jobs 2014-04-04 11:37:17 +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
Mark Nelson
d999407125 MDL-40908 core_tag: created an 'item_untagged' event 2014-04-03 20:26:22 -07:00
Ankit Agarwal
df13233697 MDL-41123 report_completion: Add events to completion report
Replace add_to_log with user_report_viewed event
add a report_viewed event
2014-04-04 10:32:26 +08:00
Rajesh Taneja
fef8ee9114 MDL-44945 mod_workshop: fixed event snapshot 2014-04-04 10:09:08 +08:00