95373 Commits

Author SHA1 Message Date
Jun Pataleta
9f1af3771d Merge branch 'MDL-66543-master' of git://github.com/tobiasreischmann/moodle 2019-10-24 23:08:43 +08:00
Tobias Reischmann
556c4f3309 MDL-66543 forms: Make (hard) frozen textareas readonly (or disabled) 2019-10-24 13:44:15 +02:00
Eloy Lafuente (stronk7)
2ffdd72618 Merge branch 'MDL-66935-lock-clashes' of https://github.com/brendanheywood/moodle 2019-10-24 09:59:19 +02:00
Adrian Greeve
4c4413922f Merge branch 'MDL-66876-master' of git://github.com/jleyva/moodle 2019-10-24 15:14:45 +08:00
Adrian Greeve
e1aebcfdd8 Merge branch 'MDL-65017-master' of git://github.com/jleyva/moodle 2019-10-24 13:53:01 +08:00
Jun Pataleta
ff7cf74d6d Merge branch 'MDL-66927-run-new-adhoc' of https://github.com/brendanheywood/moodle 2019-10-24 13:45:27 +08:00
Brendan Heywood
7e086935e3 MDL-66935 core_lock: Fix resource key clashes in db and postgres locks 2019-10-24 15:04:56 +11:00
Jun Pataleta
68a65b0039 Merge branch 'MDL-65896-int-fix-1' of https://github.com/ryanwyllie/moodle 2019-10-24 12:00:45 +08:00
Ryan Wyllie
7b8d852929 MDL-65896 core: more IE11 fixes for emoji picker 2019-10-24 10:41:52 +08:00
Jake Dallimore
ebca610a44 Merge branch 'MDL-65400-master' of git://github.com/jleyva/moodle 2019-10-24 09:28:31 +08:00
Eloy Lafuente (stronk7)
e0ad4189a5 Merge branch 'MDL-64298-master' of git://github.com/jleyva/moodle 2019-10-23 22:21:39 +02:00
Eloy Lafuente (stronk7)
aedd166c67 Merge branch 'MDL-67001-master' of https://github.com/lucaboesch/moodle 2019-10-23 22:16:22 +02:00
Eloy Lafuente (stronk7)
2a724095bd Merge branch 'MDL-67004-master' of git://github.com/dpalou/moodle 2019-10-23 19:50:38 +02:00
Eloy Lafuente (stronk7)
d020e1b779 Merge branch 'MDL-65349-profile-match-greedy' of https://github.com/brendanheywood/moodle 2019-10-23 18:35:46 +02:00
Juan Leyva
016cffb936 MDL-64298 gradereport_user: Fix WS returned parameter description
feedbackformat must be optional always
2019-10-23 17:56:09 +02:00
Sara Arjona
8321ecbfcd Merge branch 'master_MDL-66225_async_backup_state' of https://github.com/mattporritt/moodle 2019-10-23 17:39:10 +02:00
Juan Leyva
e613b1ff43 MDL-66876 core_filter: Fix context in Web Service warning 2019-10-23 17:06:56 +02:00
Juan Leyva
bc72a54cb1 MDL-65400 block: Support returning settings for core blocks 2019-10-23 15:33:56 +02:00
Juan Leyva
c9acdfb6dc MDL-65400 block: Support getting block settings via WS 2019-10-23 15:33:56 +02:00
Dani Palou
187b11f40d MDL-67004 enrol: Include core_enrol_search_users in the mobile service 2019-10-23 12:59:34 +02:00
Sara Arjona
344bb67df3 Merge branch 'MDL-66676_master' of https://github.com/nadavkav/moodle 2019-10-23 12:07:24 +02:00
Luca Bösch
f68616d750 MDL-67001 question: alignment and form spaces. 2019-10-23 10:59:24 +02:00
Ryan Wyllie
628b4ca262 MDL-65896 core: fix emoji picker IE11 support 2019-10-23 15:25:27 +08:00
Jun Pataleta
b9b10b900d MDL-65896 admin: Fix checking for full unicode support
Instead of checking whether the charset is set to 'utf8' when
determining full unicode support, it should be checking whether the
charset is set to 'utf8mb4'.
2019-10-23 15:25:27 +08:00
Jun Pataleta
b412069977 Merge branch 'MDL-66971-master' of git://github.com/peterRd/moodle 2019-10-23 14:55:46 +08:00
Matt Porritt
698222f6cb MDL-66225 Backup: fix irrecoverable state
Fix condition where if an asynchronous backup
completes via the UI and the user refreshes the
page a new backup was created with a mismatched
backup id.
This caused a permanently failing ad-hoc task
and blocked further backups for that course.
2019-10-23 04:20:00 +00:00
Jun Pataleta
b6fcec009e Merge branch 'MDL-65896-master' of https://github.com/ryanwyllie/moodle 2019-10-23 11:13:27 +08:00
Adrian Greeve
3a8b78b19f Merge branch 'MDL-63125' of https://github.com/paulholden/moodle 2019-10-23 11:00:40 +08:00
Ryan Wyllie
e0d798477a MDL-65896 core: add emoji data to thirdpartylibs 2019-10-23 10:59:59 +08:00
Ryan Wyllie
4060fcc662 MDL-65896 admin: add admin setting to show emoji picker
Added an admin setting to show/hide the emoji picker in messaging
because some versions of MySQL don't have full unicode support so
emojis won't save in the dabase.

If we detect that the site is running an unsupported version of MySQL
then the setting can not be enabled. Instead the admin will see a
message explaining that they will need to upgrade their database
before they can enable the emoji picker.
2019-10-23 10:59:59 +08:00
Ryan Wyllie
9f536ec696 MDL-65896 message: add emoji auto complete to message app 2019-10-23 10:59:59 +08:00
Ryan Wyllie
75962db917 MDL-65896 core: create emoji auto complete 2019-10-23 10:59:59 +08:00
Ryan Wyllie
8f80d18766 MDL-65896 message: add emoji picker to message app 2019-10-23 10:59:58 +08:00
Ryan Wyllie
db65ba4564 MDL-65896 core: create emoji picker 2019-10-23 10:59:58 +08:00
Brendan Heywood
60dc024201 MDL-65349 xhprof: Removed greedy matching from wildcard parsing 2019-10-23 11:08:27 +11:00
Sara Arjona
9f997f9bd7 on-demand release 3.8dev+ 2019-10-22 14:49:05 +02:00
Sara Arjona
c6a11a31cf NOBUG: Fixed SVG browser compatibility 2019-10-22 14:49:03 +02:00
Sara Arjona
631aaad19f Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-10-22 14:49:03 +02:00
Jake Dallimore
6de90c84f4 Merge branch 'MDL-64739_master-fix' of git://github.com/dmonllao/moodle 2019-10-22 11:13:43 +08:00
David Monllaó
5da60daa1a MDL-64739 analytics: No need for a fully set model on edit 2019-10-22 10:48:29 +08:00
Peter
0320040469 MDL-66971 core: Update the convenience date grade getter to allow nulls 2019-10-22 10:30:17 +08:00
Paul Holden
d25223a5c4 MDL-63125 forms: Behat test for form autocomplete element. 2019-10-21 23:24:30 +01:00
Eloy Lafuente (stronk7)
a188424bb4 Merge branch 'MDL-66970_master' of git://github.com/dmonllao/moodle 2019-10-21 23:59:18 +02:00
Eloy Lafuente (stronk7)
4019ae73f9 MDL-66954 filter_displayh5p: add it to the list of standard plugins 2019-10-21 23:34:19 +02:00
Eloy Lafuente (stronk7)
be3d6c3f5f Merge branch 'MDL-66954-master' of git://github.com/aanabit/moodle 2019-10-21 23:31:37 +02:00
David Monllaó
b4bb8688a5 MDL-66970 analytics: Extra testing for active enrolments
I sneaked in an unrelated change to enrol-partly-active-ends-afterwards
test case as the endtime and enrolment timestart values were swapped.
The case when the enrolment start is after the analysis end is already
tested in enrol-after-end test case.
2019-10-22 05:13:26 +08:00
David Monllaó
b00d35a6fc MDL-66970 analytics: Fix incorrect use of ?? 2019-10-22 05:13:26 +08:00
Nadav Kavalerchik
22ae1807a5 MDL-66676 theme/boost: Fix form select element icon in RTL mode 2019-10-21 21:34:05 +03:00
Eloy Lafuente (stronk7)
3c75bfa457 Merge branch 'MDL-66980' of https://github.com/timhunt/moodle 2019-10-21 20:26:34 +02:00
Sara Arjona
f3281837b8 Merge branch 'MDL-61121-master-5' of git://github.com/mihailges/moodle 2019-10-21 14:46:17 +02:00