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
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
gthomas2
353e78765a
MDL-58052 behat: user session function - use to edit current profile
2017-03-03 13:57:01 +00: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
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
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
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
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
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
Matteo Scaramuccia
f2de8226a8
MDL-57789 files: Used if-then instead of ternary operators
2017-02-25 23:36:07 +01:00
Matteo Scaramuccia
7338ce0182
MDL-57789 files: Let send_stored_file() rely on send_file().
2017-02-25 23:36:04 +01:00
Juan Leyva
eeae783ca3
MDL-58071 user: Return usernotfullysetup exception in WS
...
If there is an empty required custom user profile field, Web Services
should return the usernotfullysetup exception instead ignoring it.
The mobile app already handles this exception for core fields
redirecting the user to web in order to fill the missing field.
2017-02-24 20:11:27 +01:00
sam marshall
38fa1ca558
MDL-55980 Scheduled tasks: Run individual scheduled tasks from web
2017-02-24 10:42:28 +00:00
Brendan Heywood
504d569b71
MDL-50719 cron: Fixed parallel task lock contention issues
2017-02-24 13:13:23 +11:00
Brendan Heywood
5ebd1fb976
MDL-53978 core: Added callbacks for all major render stages
2017-02-24 13:06:54 +11:00
Jake Dallimore
35fcaac78b
MDL-56364 javascript: Prevent bad prototype chains in core dialogue
...
The DIALOGUE object was using Y.clone to copy the input config, messing
up the prototype chains for any objects in the config param. Really,
this doesn't need to clone the config, so I've refactored to avoid doing
so. Also moved some of the other attribute init and setup calls to the
appropriate places (initializer and modifyAttrs).
2017-02-24 08:25:31 +08:00
Jake Dallimore
86f1d1bb86
MDL-35980 comment: add comment info to delete button for screen readers
...
For each delete button in the comments widget, make the spoken text a
string containing the name of the poster and the datetime.
2017-02-24 08:15:40 +08:00
Eloy Lafuente (stronk7)
5c73061bb9
Merge branch 'wip-mdl-57765' of https://github.com/rajeshtaneja/moodle
2017-02-21 23:53:39 +01:00
Tim Hunt
898da28afd
MDL-58040 blocklib: never use global in block manager class
...
This switches everything to ->page, including coverting static method to real one.
2017-02-21 15:19:11 +00:00
Eloy Lafuente (stronk7)
3cb7fc4f9a
Merge branch 'MDL-57619-master' of git://github.com/ankitagarwal/moodle
2017-02-21 01:06:29 +01:00
Eloy Lafuente (stronk7)
860b099f46
Merge branch 'wip-mdl-56616' of https://github.com/rajeshtaneja/moodle
2017-02-21 00:56:26 +01:00
