89601 Commits

Author SHA1 Message Date
Jake Dallimore
f61ee4e857 weekly release 3.6dev 2018-06-28 14:02:55 +08:00
Eloy Lafuente (stronk7)
ce514b08ee Merge branch 'MDL-62325-master' of git://github.com/rezaies/moodle 2018-06-28 02:05:50 +02:00
Eloy Lafuente (stronk7)
b66476d15d Merge branch 'wip-MDL-62755-master' of git://github.com/abgreeve/moodle 2018-06-28 01:55:53 +02:00
Eloy Lafuente (stronk7)
d7a10f5746 Merge branch 'MDL-61889-master' of git://github.com/junpataleta/moodle 2018-06-28 01:44:26 +02: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
Jake Dallimore
2bffba3cb6 Merge branch 'MDL-61732-master' of https://github.com/Dagefoerde/moodle 2018-06-27 12:17:48 +08:00
Eloy Lafuente (stronk7)
ef0a8b99b2 Merge branch 'MDL-45088-master' of https://github.com/lucaboesch/moodle 2018-06-27 03:21:53 +02:00
Eloy Lafuente (stronk7)
242b8fc0f3 Merge branch 'MDL-62703-master' of git://github.com/bmbrands/moodle 2018-06-27 03:17:31 +02:00
Eloy Lafuente (stronk7)
e872f93325 Merge branch 'MDL-41265-master' of git://github.com/mihailges/moodle 2018-06-27 03:06:47 +02:00
Eloy Lafuente (stronk7)
d77104e28c Merge branch 'MDL-62471_master' of git://github.com/dmonllao/moodle 2018-06-27 02:38:27 +02:00
Eloy Lafuente (stronk7)
0eac61de66 Merge branch 'MDL-62735-master-refactor' of https://github.com/snake/moodle 2018-06-26 10:44:08 +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
Jake Dallimore
decd90e2a3 Merge branch 'MDL-62698' of git://github.com/timhunt/moodle 2018-06-26 15:26:21 +08:00
Jun Pataleta
dd26f1be12 MDL-61889 tool_dataprivacy: Fix CI errors 2018-06-26 13:20:31 +08:00
Eloy Lafuente (stronk7)
01911b9f1f Merge branch 'MDL-59047-master' of git://github.com/bmbrands/moodle 2018-06-26 03:04:35 +02:00
Eloy Lafuente (stronk7)
cb6ba9b1be Merge branch 'MDL-62730-master' of https://github.com/snake/moodle 2018-06-26 02:53:42 +02:00
Eloy Lafuente (stronk7)
8e059bc39f Merge branch 'MDL-51419-master' of https://github.com/snake/moodle 2018-06-26 02:41:43 +02:00
Shamim Rezaie
d6e821294e MDL-62325 enrol_paypal: Added some keys and indexes to enrol_paypal.
- Added these keys to the enrol_paypal db: courseid, userid, instanceid
- Added these indexes to the enrol_paypal db: business, receiver_email
2018-06-25 11:57:26 +10:00
Adrian Greeve
11d828ef6f MDL-62755 mod_assign: Update to unit tests.
Overrides are now checked to be exported properly.
2018-06-25 09:49:13 +08:00
Adrian Greeve
ea24047619 MDL-62755 mod_assign: Fix override export problem.
The cutoffdate and allowsubmissionsfromdate were not
being exported.
2018-06-25 09:49:13 +08:00
Mihail Geshoski
f721ac68d4 MDL-41265 resource: Page resource option to show/hide last modified 2018-06-25 09:13:04 +08:00
Tim Hunt
f4e18a0ae7 MDL-62783 XMLDB: Generate PHP with [] arrays 2018-06-22 13:58:27 +01:00
Tim Hunt
bc6687bab3 MDL-62698 quiz_overview: new index should not be unique 2018-06-22 13:32:04 +01:00
Christian Glahn
4e715dd69d MDL-61732 filters: Have emoticons respect nolink
Also extracts static emoticon cache to a field in order to increases
testability of filter_emoticon, because we are now able to reset the
static emoticon cache before tests, particularly for observing the
response to changing $CFG->emoticons.
2018-06-22 10:30:55 +02: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
Jake Dallimore
548c260d82 MDL-62730 themes: Fix calendar icon alignment for datetime in Boost 2018-06-22 10:16:28 +08:00
Jake Dallimore
692e22f9ed MDL-62735 core_search: searchareas page now respects indexing support 2018-06-22 10:14:09 +08:00
Luca Bösch
2846038ed1 MDL-45088 xmldb: Fix table alignment 2018-06-21 19:38:41 +02:00
Eloy Lafuente (stronk7)
6153be6850 weekly release 3.6dev 2018-06-21 14:00:54 +02:00
Jun Pataleta
2a969f3cd6 Merge branch 'MDL-62017-master' of https://github.com/lucaboesch/moodle 2018-06-20 19:40:39 +08:00
David Monllao
62dc3fde0a Merge branch 'MDL-61482-master' of git://github.com/zig-moodle/moodle 2018-06-20 13:29:17 +02:00
David Monllao
130ab46d37 Merge branch 'MDL-44646-master' of https://github.com/lucaboesch/moodle 2018-06-20 13:07:32 +02:00
David Monllao
88b4c9d260 MDL-62471 tool_dataprivacy: Test compatible with 32 bits OS 2018-06-20 12:48:28 +02:00
Luca Bösch
936e9c82b2 MDL-62017 tool_customlang: format language customisation buttons. 2018-06-20 10:53:23 +02:00
Luca Bösch
78f6d02b8c MDL-44646 administration: Users can be filtered by course enrollment 2018-06-20 06:48:59 +02:00
Andrew Nicols
e3037af566 Merge branch 'master_MDL-62705_results_order_no_context' of https://github.com/mattporritt/moodle 2018-06-20 08:35:59 +08:00
Andrew Nicols
7febc1e3d8 Merge branch 'wip-MDL-62391-master' of git://github.com/abgreeve/moodle 2018-06-20 08:33:32 +08:00
Eloy Lafuente (stronk7)
cb57d12d01 Merge branch 'mdl57404' of https://github.com/egiles/moodle 2018-06-20 01:02:30 +02:00
Eloy Lafuente (stronk7)
b7dcb575d2 Merge branch 'MDL-62014-master' of git://github.com/nashtechdev01/moodle 2018-06-20 00:57:21 +02:00
Eloy Lafuente (stronk7)
61a9f8d147 Merge branch 'MDL-36424-master' of https://github.com/lucaboesch/moodle 2018-06-19 19:19:59 +02:00
Eloy Lafuente (stronk7)
77eee742f0 Merge branch 'wip-MDL-61786-master' of git://github.com/abgreeve/moodle 2018-06-19 19:14:43 +02:00
Eloy Lafuente (stronk7)
cb461375a8 Merge branch 'MDL-62358-master' of https://github.com/HuongNV13/moodle 2018-06-19 19:05:26 +02:00
Eloy Lafuente (stronk7)
706898c83e Merge branch 'MDL-44791-master' of https://github.com/lucaboesch/moodle 2018-06-19 18:59:41 +02:00
Eloy Lafuente (stronk7)
3a55517a53 Merge branch 'MDL-62449-master' of git://github.com/sarjona/moodle 2018-06-19 18:18:51 +02:00
Tim Hunt
a1bc8928cc MDL-62747 accesslib: rdef caching should handle roles with no caps 2018-06-19 16:26:00 +01:00
Zig Tan
8be71d396b MDL-61482 mod_assign: Clean html in offline grading CSV 2018-06-19 23:19:13 +08:00
Bas Brands
d7dbf65770 MDL-62703 Themes: remove hover styles in course listings 2018-06-19 16:32:08 +02:00
Bas Brands
7605e3899f MDL-59047 question type: short answer boost styles 2018-06-19 14:32:35 +02:00