Commit graph

23543 commits

Author SHA1 Message Date
Dan Poltawski
7ebe17f38a Merge branch 'wip-mdl-58056' of https://github.com/rajeshtaneja/moodle 2017-03-07 11:08:24 -03:00
Tim Hunt
ea049ee618 MDL-58035 lib: log when the expected theme cannot be initialised 2017-03-07 13:29:46 +00:00
David Monllao
68aab93ea5 Merge branch 'MDL-57280-master' of git://github.com/ryanwyllie/moodle 2017-03-07 13:13:51 +01:00
David Monllao
9a2e5ad36c Merge branch 'wip-MDL-57485-master' of git://github.com/abgreeve/moodle 2017-03-07 12:15:46 +01:00
David Monllao
02c7f6e888 Merge branch 'MDL-58057-master' of https://github.com/snake/moodle 2017-03-07 12:09:00 +01:00
David Monllao
996731dded Merge branch 'MDL-45584_master' of git://github.com/markn86/moodle 2017-03-07 12:00:01 +01:00
Dan Poltawski
a3da85e42e Merge branch 'MDL-58040' of git://github.com/timhunt/moodle 2017-03-07 07:43:46 -03:00
Dan Poltawski
473efd8d53 Merge branch 'MDL-58052_behat_get_session_user' of https://github.com/gthomas2/moodle 2017-03-07 06:54:37 -03:00
Andrew Nicols
0c90bfe39b Merge branch 'MDL-57972-master' of git://github.com/ryanwyllie/moodle 2017-03-07 14:35:00 +08:00
Ryan Wyllie
75378ded5f MDL-57972 mustache: add shortentext template helper
Part of MDL-55611
2017-03-07 06:33:56 +00:00
Ryan Wyllie
180f5f23a6 MDL-57972 javascript: add upgrade instructions for truncate.js
Part of MDL-55611
2017-03-07 06:33:56 +00:00
Ryan Wyllie
7172b33e24 MDL-57972 javascript: Change truncate.js behaviour
Updated truncate.js to behave closer to the moodle implementation of
shorten_text.

Part of MDL-55611
2017-03-07 05:22:38 +00:00
Ryan Wyllie
d74d91f49a MDL-57972 javascript: Add truncate.js third party lib
Part of MDL-55611
2017-03-07 05:22:34 +00:00
Andrew Nicols
342af35ab8 Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle 2017-03-07 12:07:50 +08:00
Jake Dallimore
e858840437 MDL-58057 core_files: properly trim curl whitelist config when fetching 2017-03-07 09:49:22 +08:00
Ryan Wyllie
b6563dcfc3 MDL-57975 javascript: add sessionstorage.js
Part of MDL-55611
2017-03-07 01:29:13 +00:00
Andrew Nicols
29ce005862 MDL-55528 admin: Add a new generic admin setting type 2017-03-07 08:22:42 +08:00
Dan Poltawski
8b9196d7d2 Merge branch 'MDL-57887-nginx-username-logging' of https://github.com/brendanheywood/moodle 2017-03-06 13:43:38 -03:00
Jun Pataleta
ca75ec4fe0 MDL-55956 db: Add priority column for event table
* New priority column in order to enable the rendering of a single,
relevant calendar event for a module that has user/group overrides.
* Insert refresh_mod_calendar_events_task record to task_adhoc
table to upgrade existing calendar events for mod plugins via cron
after upgrade process.
2017-03-06 16:15:26 +08:00
Jun Pataleta
37d0c7c7fd MDL-55956 core: New adhoc task refresh_mod_calendar_events_task
* New adhoc task that loops over mod plugins and calls the
<modname>_refresh_events() hook, if available.
2017-03-06 16:12:07 +08:00
Adam Olley
b3e4fbc011 MDL-58160 coursecat: Use set_many to populate category cache
When the course category cache needs to be repopulated, two entries are added
to the cache for each category. In core this is currently done in a for-loop,
resulting in N set calls to the cache (where N is twice the number of
categories in Moodle).

This change switches that code to using a single set_many cache call instead,
which makes this an O(1) operation instead of O(N).

For a site with say, 1000 categories, this results in only 1 set call to the
cachestore instead of 2000.
2017-03-06 12:04:25 +10:30
gthomas2
353e78765a MDL-58052 behat: user session function - use to edit current profile 2017-03-03 13:57:01 +00:00
Pau Ferrer Ocaña
fb41d2f0ef MDL-57990 course: Add sortorder as public field 2017-03-03 11:53:52 +01:00
Adrian Greeve
d630c0e37b MDL-57485 themes: Set images to default display type.
Imported images in atto would no longer hold a URL
tag around it. display: block was the culprit.
2017-03-03 11:15:23 +08:00
Juan Leyva
44acbb815f MDL-57914 mod_data: Allow to export properties for external_files 2017-03-02 22:57:04 +01:00
Russell Smith
f3789f2fb3 MDL-45584 cache: Make identifiers part of the cache creation.
It is now safe to cache a reference to a cache and expect consistent results.

Changing identifiers altered cache results where a reference was
held to the cache. Identifiers have been set to be cached with
identifiers included so the caches are separate.

As a consequence of this it was identified that invalidation events
and identifiers don't easily work together as an event can't determine
which identifiers should be used for cache invalidation.  So invalidation
events have been made incompatible with identifiers being set.  No core
code used this combination as it's not possible to understand any expected
behaviour.

Event invalidation for application and session caches was centralised to the same
location.  The only difference was the name of the lastinvalidation variable. This
improves support and consistency of invalidation code.
2017-03-02 11:06:17 +08:00
Andrew Nicols
50dcc8af9c MDL-53978 core: Do not run callbacks if upgrade is running 2017-03-02 10:24:05 +08:00
Eloy Lafuente (stronk7)
bb9716ccd6 Merge branch 'MDL-57321-master' of git://github.com/cameron1729/moodle 2017-03-02 00:00:37 +01:00
David Mudrák
0355e76ffa MDL-58114 plugin manager: Fix exception parameters 2017-03-01 15:05:44 +01:00
Cameron Ball
f6d94dc01f
MDL-57321 theme_boost: Consistently apply attributes on elements 2017-03-01 11:35:44 +08:00
Eloy Lafuente (stronk7)
b0253c3323 Merge branch 'wip-MDL-48228-master-v2' of git://github.com/abgreeve/moodle 2017-03-01 02:56:56 +01:00
Eloy Lafuente (stronk7)
b239dfd9aa Merge branch 'MDL-53978-master-fix' of https://github.com/andrewnicols/moodle 2017-03-01 02:46:06 +01:00
Andrew Nicols
e890de5531 Merge branch 'm33_MDL-57789_Add_Cache_Control_Immutable_Support' of https://github.com/scara/moodle 2017-03-01 09:31:45 +08:00
Andrew Nicols
5d86494808 MDL-53978 core: Improve cache usage when no callbacks are defined 2017-03-01 09:18:13 +08:00
Adrian Greeve
8c1288dbdb MDL-48228 database: Unit test addition and update. 2017-03-01 09:03:12 +08:00
Adrian Greeve
0bbefd81cd MDL-48228 database: Make utf8mb4 the default character set for mysql.
Thanks to Jetha Chan for providing the initial patch that this is
based on.
2017-03-01 09:03:12 +08:00
Eloy Lafuente (stronk7)
dd6b41a5c7 Merge branch 'MDL-58071-master' of git://github.com/jleyva/moodle 2017-02-28 22:57:09 +01:00
Eloy Lafuente (stronk7)
211843420d Merge branch 'MDL-55980-master' of https://github.com/sammarshallou/moodle 2017-02-28 22:11:16 +01:00
David Monllao
f3221d8d79 Merge branch 'wip-MDL-51833-master' of git://github.com/abgreeve/moodle 2017-02-28 11:29:33 +01:00
Rajesh Taneja
db4b59fa03
MDL-58068 testing: Whitelist alternative_file_system_class in testing
Unit test and behat should be allowed to
run with alternative file system
2017-02-28 14:58:49 +08:00
Andrew Nicols
b6cab2b505 Merge branch 'MDL-58038-master-3' of https://github.com/snake/moodle 2017-02-28 12:19:33 +08:00
Jake Dallimore
9e44cec27f MDL-58038 email: make sure all allowedemaildomain entries are respected
Fixes a bug with exploding the config var, in which trailing carriage
returns were causing string matches to fail.
2017-02-28 12:17:52 +08:00
Rajesh Taneja
26bf6d4ead
MDL-57940 behat: Allow behat parallel run to start with delay
Behat parallel run if executed together
then selenium might fail to launch browser
and timeout. It would be nice to have a
custom delay between the start of each process
2017-02-27 16:15:31 +08:00
Andrew Nicols
d9a5f82086 Merge branch 'MDL-53978-render-callbacks' of https://github.com/brendanheywood/moodle 2017-02-27 15:20:28 +08:00
Andrew Nicols
71cc1e529d Merge branch 'MDL-50719-fast-locks' of https://github.com/brendanheywood/moodle 2017-02-27 13:42:55 +08:00
Andrew Nicols
696099b94f Merge branch 'MDL-35980-master' of git://github.com/snake/moodle 2017-02-27 11:58:23 +08:00
Ryan Wyllie
0531ce1a29 MDL-57280 javascript: add modal registry
Add a modal registry for the types and make the factory use it to allow
code to register modal types at run time and use the factory for
non-core modals.
2017-02-27 01:05:44 +00:00
Adrian Greeve
7c8afa8ff8 MDL-51833 tool_monitor: Improve access check for monitor. 2017-02-27 08:59:45 +08:00
Matteo Scaramuccia
203c5bce27 MDL-57789 files: Reviewed lifetime value 2017-02-25 23:42:37 +01:00
Matteo Scaramuccia
ed0a1cd708 MDL-57789 files: Use immutable Cache-Control extension. 2017-02-25 23:42:35 +01:00