77104 Commits

Author SHA1 Message Date
Andrew Nicols
c25f0b4d27 Merge branch 'MDL-52936_master' of https://github.com/marxjohnson/moodle 2016-03-01 10:05:53 +08:00
Andrew Nicols
2b38214a16 Merge branch 'MDL-53214-master' of git://github.com/cameron1729/moodle 2016-03-01 09:40:44 +08:00
Eloy Lafuente (stronk7)
d9dfc410ad Merge branch 'wip-MDL-53172-master' of https://github.com/marinaglancy/moodle 2016-03-01 01:59:31 +01:00
Andrew Nicols
80f79ad6ec Merge branch 'MDL-50175-master' of git://github.com/danpoltawski/moodle 2016-03-01 08:07:56 +08:00
Dan Poltawski
b70b436875 Merge branch 'MDL-44952-master' of git://github.com/marinaglancy/moodle 2016-02-29 16:34:22 +08:00
Dan Poltawski
c3717ca64e Merge branch 'MDL-50794-master-workshop-restrict-filetypes' of git://github.com/mudrd8mz/moodle 2016-02-29 16:15:27 +08:00
Dan Poltawski
9b44810fbf Merge branch 'MDL-53213' of https://github.com/mr-russ/moodle 2016-02-29 15:37:25 +08:00
Andrew Nicols
7f1303728d Merge branch 'MDL-52965_master' of git://github.com/dmonllao/moodle 2016-02-29 15:20:44 +08:00
Andrew Nicols
da45d10a51 MDL-48362 enrol: Correct singleselect use in behat test 2016-02-29 15:16:10 +08:00
Andrew Nicols
dfc18848db Merge branch 'MDL-48362-master' of git://github.com/damyon/moodle 2016-02-29 14:46:20 +08:00
Damyon Wiese
f758951565 MDL-48362 enrol: Convert guest to standard enrolment ui
Also - provide automatic course navigation links when using the standard ui.
2016-02-29 14:33:06 +08:00
Andrew Nicols
90a11c2abb Merge branch 'MDL-53249-master' of git://github.com/merrill-oakland/moodle 2016-02-29 14:22:31 +08:00
Andrew Nicols
ae3c6ee42d MDL-52346 caching: Coding style fixes 2016-02-29 14:14:01 +08:00
Andrew Nicols
8bd28ed696 Merge branch 'MDL-52346' of git://github.com/mr-russ/moodle 2016-02-29 14:12:03 +08:00
Damyon Wiese
51c736f037 MDL-48362 enrol: Auto generate the edit action icons when using the new ui 2016-02-29 14:00:31 +08:00
Dan Poltawski
17ac1b5349 Merge branch 'MDL-30811-master' of git://github.com/andrewnicols/moodle 2016-02-29 13:43:53 +08:00
Andrew Nicols
d96a4e2a59 MDL-53206 caching: Remove accidental use of fullresult variable 2016-02-29 13:20:29 +08:00
Damyon Wiese
60010fd614 MDL-48362 enrol: Use a standard UI and validation for enrolment plugins
Convert core enrolment plugins to use standard editing ui.
2016-02-29 12:31:41 +08:00
Dan Poltawski
57853ea8f9 Merge branch 'MDL-53208' of https://github.com/mr-russ/moodle 2016-02-29 10:29:09 +08:00
Dan Poltawski
7f02500bd8 Merge branch 'MDL-53154-master' of git://github.com/junpataleta/moodle 2016-02-29 10:13:06 +08:00
Andrew Nicols
0e8ce68a17 MDL-30811 core: Fix tests where continue button has been removed 2016-02-29 09:05:58 +08:00
Andrew Nicols
372d6b923b MDL-30811 core: Replace use of continue_button with redirect 2016-02-29 09:05:58 +08:00
Andrew Nicols
d954b54f9e MDL-30811 forum: Update use of redirect to include message and type 2016-02-29 09:05:57 +08:00
Andrew Nicols
3ad964190c MDL-30811 core: Make use of session notifications in redirect() 2016-02-29 09:05:57 +08:00
Andrew Nicols
0346323cec MDL-30811 output: Add support for session notifications 2016-02-29 09:05:56 +08:00
Andrew Nicols
a31d1e5726 Merge branch 'wip-MDL-52397-master' of git://github.com/abgreeve/moodle 2016-02-29 08:33:41 +08:00
Andrew Nicols
243468030a MDL-30811 output: Tidy up notifications 2016-02-28 19:16:34 +08:00
Russell Smith
d22a01fd99 MDL-53213 caching: Faster databasemeta caching for all databases. 2016-02-28 17:03:14 +11:00
Russell Smith
fdff8077e0 MDL-53208 caching: Update serialization rules for performance.
- We only now serialize when required, eg when the store doesn't do it.
- static acceleration now serializes on set to reduce overhead on load.
- null now works in static acceleration as we use an array for storage metadata
- static acceleration delete uses isset rather than an array_search.
2016-02-28 17:01:51 +11:00
Russell Smith
76349f871e MDL-53208 caching: Remove TTL wrapper on static acceleration.
TTL is only updated between script runs.  If it's valid
when it's added to static acceleration, it will be valid
for the entire script run.
2016-02-28 17:01:50 +11:00
Russell Smith
98d580888b MDL-53208 caching: parse_key not required for static cache.
static cache operates on a single cache instance, it can't share
with others and can use the supplied key immediately.
2016-02-28 17:01:50 +11:00
Russell Smith
80788d03e1 MDL-53208 caching: Update serialization rules for performance.
- We only now serialize when required, eg when the store doesn't do it.
- static acceleration now serializes on set to reduce overhead on load.
- null now works in static acceleration as we use an array for storage metadata
- static acceleration delete uses isset rather than an array_search.
2016-02-28 17:01:50 +11:00
Russell Smith
b2159f2d3f MDL-53208 caching: Enable dereferencing as a feature.
If the cache does all the dereferencing when it stores and loads
the objects, then the cache loaders don't need to do that work.
This is true of all caches that use something other than PHP's memory
to store their results.
2016-02-28 17:01:49 +11:00
Russell Smith
5007975d1e MDL-53206 caching: Ensure get_many and set_many dereference objects. 2016-02-28 17:01:49 +11:00
Marina Glancy
b259fa6645 MDL-53172 core: adjust CSS for inplace_editable 2016-02-27 11:29:27 +08:00
Andrew Nicols
490934a4ed MDL-53172 javascript: Fix coding style violations 2016-02-27 11:29:27 +08:00
Andrew Nicols
38cf8b6661 MDL-53172 javascript: Stop requiring body manipulation on load 2016-02-27 11:29:27 +08:00
Marina Glancy
8de48ad0ae MDL-53172 core: toggle and select in inplace_editable 2016-02-27 11:29:24 +08:00
Eric Merrill
1f0d77f7cd MDL-53249 atto: Make sure all editors see end move event 2016-02-25 21:37:16 -05:00
Russell Smith
4350192a8d MDL-52346 caching: Allow localstorage as a cache option.
We display a notification on screen during configuration telling
the administrator if it's safe to map this store to a local storage
cache or not.
2016-02-26 10:58:20 +11:00
David Mudrák
996f7e8228 MDL-50794 workshop: Improve the file type restricting implementation
This is basically a clean up and what I think improved version of the
original Mahmoud's patch.

The actual checking for allowed file extensions has been re-implemented
and is now covered by unit tests. The list of allowed extensions is now
also assed to the filemanager element's accepted_types option to prevent
picking other files (we still need the in-place validation though). The
form validation is simplified a bit. The custom validation of file size
introduced in the previous patch has been removed as not related to this
issue (also I believe it should not be done at this level).
2016-02-25 18:03:18 +01:00
M Kassaei
1a282212c1 MDL-50794 workshop: Allow restricting submitted file types
It was reported at the Open University that there have been some
problems with the formats of files submitted by students. Not all
students completed their outlines as a Word .doc (despite this being the
format of the template provided). Some formats (e.g. .pages) couldn’t be
translated by some of the reviewing students. Therefore, they were
unable to provide a review and the submitting students not receiving any
comments.

This patch allows the teacher to define list of allowed file types that
can be attached to submitted work and/or overall feedback in the
workshop.
2016-02-25 18:03:18 +01:00
KeenRivals
83ea83ec19 MDL-50175 graphics: Optimized SVGs with SVGO. 2016-02-25 11:56:42 +00:00
KeenRivals
26c19b02d5 MDL-50175 graphics: Optimized PNG images with optipng
Used options: -o7 -strip all and advdef -z4 -i50.

(With ./lib excluded)
2016-02-25 11:56:37 +00:00
Mark Johnson
024b1eade0 MDL-52936 theme_bootstrapbase: Fix link hover bug on iOS 2016-02-25 11:38:11 +00:00
Davo Smith
aa066e99f7 MDL-52965 medialib: fix preload attribute 2016-02-25 15:25:27 +08:00
Andrew Nicols
03b8b55f10 weekly release 3.1dev 2016-02-25 13:52:15 +08:00
Andrew Nicols
5fef7d9c04 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-02-25 13:52:11 +08:00
Andrew Nicols
84fbbd9985 Merge branch 'MDL-45104-master-fix' of github.com:xow/moodle 2016-02-25 10:14:06 +08:00
John Okely
a285d561ef MDL-45104 logging: Check if legacy log is enabled 2016-02-25 10:00:02 +08:00