Commit graph

24858 commits

Author SHA1 Message Date
Michael Hawkins
9af6a71c70 MDL-62801 themes: Added missing filelib include 2018-07-03 13:07:27 +08:00
Mihail Geshoski
daa31a0491 MDL-33509 forms: Change button type in url resource editing page 2018-07-03 11:53:09 +08:00
Eloy Lafuente (stronk7)
b197a1d4cb Merge branch 'MDL-62621-master-ixcomment' of git://github.com/mudrd8mz/moodle 2018-07-02 20:00:29 +02:00
Jake Dallimore
221a79361a Merge branch 'MDL-62801-master' of git://github.com/mickhawkins/moodle 2018-07-02 16:18:23 +08:00
David Mudrák
82b7ad70b1 MDL-62621 comments: Add missing indexes on comments table
The composite index over the fields contextid, commentarea and itemid
helps the comments API to load all comments for the given area
effectively.

The index over the userid field helps the privacy API to load all
comments by the given user.
2018-07-02 10:04:26 +02:00
Eloy Lafuente (stronk7)
aedd74c610 Merge branch 'MDL-61244_master' of https://gitlab.com/marxjohnson/moodle 2018-07-02 01:42:00 +02:00
Tim Hunt
1146659db4 MDL-62838 filters: dont use statics inside functions. Use MUC 2018-06-29 17:24:41 +01:00
Tim Hunt
8aedf6d478 MDL-62834 behat: new step for enabling filters 2018-06-29 11:26:41 +01:00
Michael Hawkins
3f2ed99d26 MDL-62801 themes: Remove old mustache caches when new one generated 2018-06-29 10:49:21 +08:00
Michael Hawkins
ef4e04ee26 MDL-37624 calendar: Added location support 2018-06-29 10:46:54 +08:00
Sergio Rabellino
adeff60562 MDL-61403 filter: Fix for the nolink tag ignored
Fix for the nolink tag ignored if there are some other attributes defined in the same span
2018-06-28 11:01:26 +02:00
Marina Glancy
6e40d1edfe MDL-62526 admin: ask privacy policy agreement for moodle.net 2018-06-28 11:43:48 +08:00
Eloy Lafuente (stronk7)
8f63202014 Merge branch 'MDL-62747' of https://github.com/timhunt/moodle 2018-06-28 00:30:38 +02:00
Eloy Lafuente (stronk7)
d451152b7e Merge branch 'MDL-62783' of https://github.com/timhunt/moodle 2018-06-28 00:25:33 +02:00
Eloy Lafuente (stronk7)
9d05da3f6d Merge branch 'm36_MDL-51080_MAriaDB_Wrong_DB_Type' of https://github.com/scara/moodle 2018-06-27 23:25:03 +02:00
Juan Pablo de Castro
6aa8a3b6d0 MDL-14274 lib/evalmath: support of conditional math in formulas.
- Comparison operators >, ==, <, <=, >=
- "if(condition, valueiftrue, valueif false)" function.

(amended to keep non-related lines unmodified - whitespace & indent)
2018-06-26 10:25:44 +02:00
Tim Hunt
9f38628abc MDL-62792 filters: fix some bad PHPdocs 2018-06-25 15:50:15 +01:00
Tim Hunt
f4e18a0ae7 MDL-62783 XMLDB: Generate PHP with [] arrays 2018-06-22 13:58:27 +01:00
Jake Dallimore
4d5046b0eb MDL-51419 core_files: Support for utf8 in file names in MS Edge 2018-06-22 10:29:23 +08:00
Eloy Lafuente (stronk7)
cb57d12d01 Merge branch 'mdl57404' of https://github.com/egiles/moodle 2018-06-20 01:02:30 +02:00
Tim Hunt
a1bc8928cc MDL-62747 accesslib: rdef caching should handle roles with no caps 2018-06-19 16:26:00 +01:00
Jun Pataleta
ec4d05c6b6 Merge branch 'MDL-61894-master' of https://github.com/lucaboesch/moodle 2018-06-19 17:57:31 +08:00
Andrew Nicols
2ffb5ea5e9 Merge branch 'MDL-62519_master' of git://github.com/markn86/moodle 2018-06-19 10:33:52 +08:00
Andrew Nicols
3b6811a113 Merge branch 'MDL-62320-master' of git://github.com/vmdef/moodle 2018-06-18 13:47:21 +08:00
Andrew Nicols
dcb2cea690 Merge branch 'MDL-62234-master' of git://github.com/bmbrands/moodle 2018-06-18 09:51:18 +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
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
Mark Johnson
e3389c83b2 MDL-61244 caching: Allow granular purging of caches 2018-06-14 15:04:42 +01:00
Andrew Nicols
460dc37184 MDL-60207 modal: Fix close modal behat for clean 2018-06-14 10:19:45 +08:00
Bas Brands
1b21702511 MDL-62234 Theme boost: Improve atto dialogue styling 2018-06-13 11:34:41 +02: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
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
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)
d157f8774e Merge branch 'MDL-62577-m' of https://github.com/micaherne/moodle 2018-06-12 00:07:43 +02:00
Jake Dallimore
28c3f6e4d8 MDL-60819 core_files: fix exception thrown from generate_image_thumbnail
This function now requires gdlib.php.
2018-06-11 10:44:51 +08:00
Mihail Geshoski
5b97c08412 MDL-58063 blocks: Cannot access manage files in HTML block in clean 2018-06-08 08:25:53 +08:00
David Monllao
a7fb68f27f Merge branch 'MDL-62273-master' of https://github.com/sammarshallou/moodle 2018-06-06 11:16:41 +02:00
Jun Pataleta
054900f5ed Merge branch 'MDL-61826-master' of git://github.com/junpataleta/moodle 2018-06-06 11:16:38 +02:00
Andrew Nicols
f32a9acadf Merge branch 'm36_MDL-61702_MariaDB_InnoDB10d3d1_Params_Removed' of https://github.com/scara/moodle 2018-06-06 11:16:25 +02:00
David Monllao
01dc21198f Merge branch 'MDL-46344-master' of https://github.com/lucaboesch/moodle 2018-06-06 11:16:16 +02:00
David Monllao
75ebfbdf99 Merge branch 'MDL-50812-master' of https://github.com/nashtechdev01/moodle 2018-06-06 11:16:13 +02:00
David Monllao
c051057058 Merge branch 'wip-MDL-61694_Check_Password_Callback' of https://github.com/Spudley/moodle 2018-06-06 11:16:06 +02:00
Jun Pataleta
5870677fd4 Merge branch 'MDL-61778-master' of git://github.com/mickhawkins/moodle 2018-06-06 11:16:03 +02:00
Jun Pataleta
7766dbed5d MDL-61826 auth: Make Facebook endpoints more maintainable 2018-06-06 12:44:24 +08:00