89567 Commits

Author SHA1 Message Date
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
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
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
Zig Tan
8be71d396b MDL-61482 mod_assign: Clean html in offline grading CSV 2018-06-19 23:19:13 +08:00
David Monllao
fa6f911fc5 Merge branch 'MDL-62588-master' of git://github.com/rezaies/moodle 2018-06-19 12:52:15 +02:00
David Monllao
c85a3823b8 Merge branch 'MDL-44859-master' of https://github.com/lucaboesch/moodle 2018-06-19 12:06:48 +02:00
Jun Pataleta
ec4d05c6b6 Merge branch 'MDL-61894-master' of https://github.com/lucaboesch/moodle 2018-06-19 17:57:31 +08:00
David Monllao
fca5c2de05 Merge branch 'MDL-58702-master' of git://github.com/zig-moodle/moodle 2018-06-19 11:53:21 +02:00
Adrian Greeve
373a09a86a MDL-62391 tool_dataprivacy: Added more detail about data requests.
This adds the detail about who requested the data request to the
tables and data request information page.
2018-06-19 14:50:29 +08:00
Huong Nguyen
430241eb4b MDL-62597 Privacy: Request date column should include time 2018-06-19 14:50:00 +08:00
Andrew Nicols
67196d5080 Merge branch 'MDL-60950-master' of git://github.com/damyon/moodle 2018-06-19 11:36:59 +08:00
Damyon Wiese
994d0da35e MDL-60950 assign: Update incompatible unit test
Maintain compatibility with unit test changes after MDL-55609.
2018-06-19 10:56:53 +08:00
Damyon Wiese
c957707106 MDL-60950 assign: Rename class
testable_assign was renamed to mod_assign_testable_assign
2018-06-19 10:53:51 +08:00
Andrew Nicols
68a482e167 Merge branch 'MDL-62283-master' of https://github.com/Kathrin84/moodle 2018-06-19 10:36:37 +08:00
Andrew Nicols
2ffb5ea5e9 Merge branch 'MDL-62519_master' of git://github.com/markn86/moodle 2018-06-19 10:33:52 +08:00
Damyon Wiese
07d237840e MDL-60950 assign: Robust filtering of grading table
For assignments with gradetype set to none, we need special handling when generating the query to filter submissions that need grading.
2018-06-19 10:09:42 +08:00
Damyon Wiese
a5ff898f90 MDL-60950 assign: Test for the requires grading filter
This test covers when the requires grading filter is applied, but the
assignment has no grade and the feedbackcomments plugin is disabled.
2018-06-19 10:09:42 +08:00
Andrew Nicols
29532b3758 Merge branch 'MDL-62597-master' of https://github.com/HuongNV13/moodle 2018-06-19 09:42:36 +08:00
Eloy Lafuente (stronk7)
f3611eabc8 Merge branch 'MDL-59429-master' of git://github.com/mickhawkins/moodle 2018-06-19 02:06:54 +02:00
Eloy Lafuente (stronk7)
9153d6ea05 Merge branch 'MDL-62638-master' of git://github.com/bmbrands/moodle 2018-06-19 02:03:08 +02:00
Eloy Lafuente (stronk7)
eeb0597493 Merge branch 'MDL-62571_master' of git://github.com/markn86/moodle 2018-06-19 01:49:05 +02:00
Sara Arjona
1d76dd714c MDL-62449 scorm: Move related data to data in the privacy export 2018-06-18 10:42:26 +02:00
Sara Arjona
cd3ef1fbc4 MDL-62449 scorm: Add SCORM data to privacy export (name, description) 2018-06-18 10:42:26 +02:00
Jun Pataleta
0197ac313c Merge branch 'MDL-62614-master' of git://github.com/zig-moodle/moodle 2018-06-18 16:12:40 +08:00
Jun Pataleta
d2b1d001bb Merge branch 'MDL-62709_master' of git://github.com/markn86/moodle 2018-06-18 15:16:18 +08:00
Jun Pataleta
35f5be26ae Merge branch 'MDL-62658_master' of git://github.com/markn86/moodle 2018-06-18 14:36:54 +08:00
Jun Pataleta
4fb6f0b5ce Merge branch 'wip-MDL-62474-master' of git://github.com/abgreeve/moodle 2018-06-18 14:32:42 +08:00
Mark Nelson
4f6cb2ee77 MDL-62658 message_popup: fixed issue with malformed URL being generated 2018-06-18 14:27:54 +08:00
Adrian Greeve
f43ed74cb0 MDL-62474 theme_boost: Update to provider and unit test.
Theme boost contains a user preference which was not reported
before. Unit tests have been added to test the update.
2018-06-18 14:03:38 +08:00
Andrew Nicols
3b6811a113 Merge branch 'MDL-62320-master' of git://github.com/vmdef/moodle 2018-06-18 13:47:21 +08:00
Willian Mano
dfcbcfc319 MDL-62474 theme_boost: Fix Boost privacy provider 2018-06-18 13:33:41 +08:00
Shamim Rezaie
f84df305c0 MDL-62588 enrol_paypal: Add missing instanceid field 2018-06-18 15:14:04 +10:00
Huong Nguyen
af2e8ed947 MDL-62614 Privacy: Core tag provider delete_item_tags function not work 2018-06-18 12:59:13 +08:00
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