Commit graph

90325 commits

Author SHA1 Message Date
Andrew Nicols
dcb2cea690 Merge branch 'MDL-62234-master' of git://github.com/bmbrands/moodle 2018-06-18 09:51:18 +08:00
Andrew Nicols
b885f0bf60 Merge branch 'MDL-57968-master' of git://github.com/cescobedo/moodle 2018-06-18 08:57:13 +08:00
Evan Giles
53007faad1 MDL-57404 admin_settings: Allow comments in ip block
This adds the ability to to add comments to ip lists in moodle.

Currently, the configiplist textentry box does not allow the user to annotate
the IP addresses defined.  For example, I'd like to be able to define:
 192.168.1.1     # London office
 10.1.1.1        # New york office
 118.209.246.240 # My home IP

This would allow me to revisit this list after a few months, and remove
IP addresses that are no longer required - without having to manually confirm
each IP address
2018-06-16 21:08:46 +10:00
Victor Deniz
046dd892c7 MDL-62320 mimetypes: Add JSON to the default mime types list 2018-06-15 12:54:23 +01:00
Kathrin Osswald
c449fbcf72 MDL-62283 theme Boost: No nav drawer pref on small screens 2018-06-15 13:14:28 +02:00
Damyon Wiese
43c8e1f596 MDL-62643 assign: Skip empty online text files
Online text assignment submissions with no text entered into the editor should not
create a blank html document for providing feedback.
2018-06-15 14:07:08 +08:00
HungTran
d2d82a9d7d MDL-62014 course: Add title to activity completion button 2018-06-15 10:18:26 +07:00
Michael Hawkins
0be294c005 MDL-59429 roles: Log add/remove admin users. 2018-06-15 10:22:54 +08:00
Zig Tan
e689e4d446 MDL-58702 backup: Fix restoration of role mappings labels
Changes:
- Add logic to retrieve all the existing current roles.
- Apply the backup's role shortname by matching on the archetype.
- Added backup lang string 'undefinedrolemapping'.
2018-06-15 09:55:53 +08:00
Matt Porritt
784ed31ea0 MDL-62705 Global Search: results order selection does not display
As of 3.5 a search plugin can define the result orders it supports.
When a search plugin defines multiple sort orders and the search is
conducted without a context (no context query param in the URL),
the code to load the available sort orders from the enabled search
backend is never called.

This patch gets the supported search orders for the enabled search
engine regardless of context being provided or not. As prior, the
search order selection will not display if the only result order
option is relevance.
2018-06-15 11:31:36 +10:00
Matteo Scaramuccia
09ca972877 MDL-51080 env: warn when running MariaDB w/ wrong dbtype 2018-06-14 23:54:35 +02:00
Luca Bösch
e6914883ed MDL-61894 tag: Modal buttons style. 2018-06-14 17:34:29 +02:00
Luca Bösch
df24fb7172 MDL-44859 grade: Inverse the order of the add category and item buttons 2018-06-14 17:33:41 +02:00
Luca Bösch
b1a8a5052c MDL-44791 admin: Open server check doc links in new window. 2018-06-14 17:33:35 +02:00
Ed Basset
1764defb5a MDL-36424 wiki: set group so subwiki tabs/pages display correctly 2018-06-14 17:33:18 +02:00
Mark Johnson
e3389c83b2 MDL-61244 caching: Allow granular purging of caches 2018-06-14 15:04:42 +01:00
Huong Nguyen
628b4c86af MDL-62358 Question: Improve number function
Support all 'question numbers' that might be needed
2018-06-14 19:43:55 +07:00
Huong Nguyen
cf9b6587c0 MDL-62597 Privacy: Request date column should include time 2018-06-14 19:40:31 +07:00
Eloy Lafuente (stronk7)
9e7c397889 weekly release 3.6dev 2018-06-14 10:55:47 +02:00
Eloy Lafuente (stronk7)
7fb9a2550e Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-06-14 10:55:44 +02:00
Mark Nelson
cd9ecbd81c MDL-62709 core_message: convert NULL format types in task 2018-06-14 13:18:46 +08:00
David M Penner
8791c50d64 MDL-62709 core_message: fix for silently ignored errors in task 2018-06-14 12:20:42 +08:00
Jun Pataleta
3662898b7c Merge branch 'MDL-60207-master' of git://github.com/andrewnicols/moodle 2018-06-14 10:29:11 +08:00
Andrew Nicols
460dc37184 MDL-60207 modal: Fix close modal behat for clean 2018-06-14 10:19:45 +08:00
Mark Nelson
0c34cc5a93 MDL-31443 core_backup: change review heading to 'Restore settings' 2018-06-13 17:49:38 +02:00
Luca Bösch
2e8491a5be MDL-31443 core_backup: revert changes to util/ui/renderer.php 2018-06-13 17:49:38 +02:00
Bas Brands
1b21702511 MDL-62234 Theme boost: Improve atto dialogue styling 2018-06-13 11:34:41 +02:00
Jun Pataleta
398e912054 Merge branch 'MDL59980_block_bug' of git://github.com/kristian-94/moodle 2018-06-13 10:00:00 +08:00
Andrew Nicols
0e75d337ee Merge branch 'MDL-60207-master' of git://github.com/ryanwyllie/moodle 2018-06-13 09:41:45 +08:00
Andrew Nicols
c3f13f534d Merge branch 'MDL-6074-master' of git://github.com/mihailges/moodle 2018-06-13 09:38:55 +08:00
Mihail Geshoski
5226999dd7 MDL-6074 blocks: Hide user in online users block 2018-06-13 09:02:24 +08:00
AMOS bot
33866de211 Automatically generated installer lang files 2018-06-13 00:07:55 +00:00
Kristian Ringer
c0bc8d38a5 MDL-59980 core_admin: Fix bug preventing block modification in settings 2018-06-13 09:36:27 +10:00
Eloy Lafuente (stronk7)
a9f6dd075a Merge branch 'MDL-62651-master' of git://github.com/andrewnicols/moodle 2018-06-12 18:38:05 +02:00
Eloy Lafuente (stronk7)
d0f9d0ef4d Merge branch 'MDL-62446-master' of git://github.com/lameze/moodle 2018-06-12 18:21:40 +02:00
David Monllao
4a47a69519 Merge branch 'MDL-58063-master' of git://github.com/mihailges/moodle 2018-06-12 11:05:37 +02:00
David Monllao
bcb4a27dd6 Merge branch 'MDL-55609-master' of git://github.com/andrewnicols/moodle 2018-06-12 10:07:35 +02:00
Mark Nelson
6ffd66f350 MDL-62519 atto_recordrtc: detach click listener when recording again 2018-06-12 14:35:03 +08:00
Jun Pataleta
d495276134 Merge branch 'wip-MDL-62574-master' of git://github.com/abgreeve/moodle 2018-06-12 11:57:01 +08:00
Adrian Greeve
666aae9deb MDL-62574 core_privacy: Unit tests to check the context base.
This now tests the possibility of a context being deleted.
2018-06-12 11:24:38 +08:00
Adrian Greeve
c84cb13cd4 MDL-62574 core_privacy: Check the contextlist for real contexts.
There are situations when contexts will be deleted in the provider.
The context list is not updated and so we have introduced a try
catch.
2018-06-12 11:24:38 +08:00
Andrew Nicols
7ab9d0aedf Merge branch 'wip_MDL-62576_master' of git://github.com/gjb2048/moodle 2018-06-12 10:25:01 +08:00
Andrew Nicols
01d0c0cb49 Merge branch 'MDL-62628-master' of git://github.com/mihailges/moodle 2018-06-12 09:49:18 +08:00
Andrew Nicols
6f38bb9bdc Merge branch 'MDL-60819-master' of https://github.com/snake/moodle 2018-06-12 08:58:49 +08:00
Eloy Lafuente (stronk7)
e692de3e58 Merge branch 'MDL-62649-master' of git://github.com/mihailges/moodle 2018-06-12 01:45:13 +02:00
Eloy Lafuente (stronk7)
3036620e0b Merge branch 'MDL-62460-master' of git://github.com/junpataleta/moodle 2018-06-12 01:41:37 +02:00
Eloy Lafuente (stronk7)
3afd0a2523 Merge branch 'MDL-31443-master' of https://github.com/lucaboesch/moodle 2018-06-12 01:35:19 +02:00
Eloy Lafuente (stronk7)
d157f8774e Merge branch 'MDL-62577-m' of https://github.com/micaherne/moodle 2018-06-12 00:07:43 +02:00
Mark Nelson
4626c848c2 MDL-62571 mod_forum: fixed redirection URLs 2018-06-11 18:29:58 +08:00
David Monllao
009ab16689 Merge branch 'MDL-61484-master' of git://github.com/junpataleta/moodle 2018-06-11 10:33:52 +02:00