mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 08:30:04 +01:00
Code Issues Projects Releases Wiki Activity
90,139 Commits 36 Branches 527 Tags
Commit Graph

24858 Commits

Author SHA1 Message Date
Jake Dallimore
8981ac0197 Merge branch 'MDL-62657-master' of git://github.com/junpataleta/moodle 2018-08-29 09:30:07 +08:00
Andrew Nicols
e36019c2f3 Merge branch 'wip-MDL-62742-master' of git://github.com/marinaglancy/moodle 2018-08-29 08:31:08 +08:00
Eloy Lafuente (stronk7)
1766184e97 Merge branch 'MDL-63094-master' of git://github.com/andrewnicols/moodle 2018-08-28 23:53:58 +02:00
Eloy Lafuente (stronk7)
770fc03ef6 Merge branch 'MDL-62914-master' of git://github.com/lameze/moodle 2018-08-28 23:15:36 +02:00
David Monllao
4f855defce Merge branch 'wip-MDL-63165-master' of https://github.com/Beedell/moodle 2018-08-28 12:28:25 +02:00
Marina Glancy
442f12f81a MDL-62742 core: rename coursecat->core_course_category 
Also rename course_in_list -> core_course_list_element
Deprecate class coursecat_sortable_records
 2018-08-28 11:36:23 +02:00
David Monllao
ed20d9dbe9 Merge branch 'MDL-63210_master' of git://github.com/markn86/moodle 2018-08-27 11:46:27 +02:00
John Beedell
d0a60444a1 MDL-63165 Question: xml import of question categories 2018-08-24 15:20:18 +01:00
Mark Nelson
ce1db1f7db MDL-63210 core: convert for loop to forEach in JS 2018-08-24 11:31:32 +08:00
Jake Dallimore
7e93539cf6 MDL-36255 core_grade: fix to ensure correct context used for filters 
Some grade object (outcomes,scales) can be created at site or course
context, so this patch just makes sure we use the respective context
when applying format_string to the name in the get_name() function.
 2018-08-22 17:55:50 +08:00
Andrew Nicols
4d1a42fb7c MDL-63094 js: Do not check visibility before hiding backdrop 
It's possible for the backdrop to be created during the show, before the
modal is actually fully shown.

This check is unnecessary because the getBackdrop() function always
returns a value and will always succeed.
 2018-08-22 10:23:30 +08:00
Henning Bostelmann
0e141964e0 MDL-62914 Calendar: handle TZURL iCal property 2018-08-22 10:07:41 +08:00
Jake Dallimore
805ce3de79 Merge branch 'MDL-36255-master' of https://github.com/lucaboesch/moodle 2018-08-21 16:04:17 +08:00
Jun Pataleta
69781cdae1 MDL-62657 user: More users fields for creation/update WS functions 2018-08-21 12:08:20 +08:00
Andrew Nicols
440dad627f Merge branch 'MDL-62660-master' of git://github.com/junpataleta/moodle 2018-08-21 11:09:33 +08:00
Andrew Nicols
9adf5f0595 Merge branch 'MDL-57281-master' of https://github.com/vmdef/moodle 2018-08-21 10:49:10 +08:00
Andrew Nicols
13b4a1f4bb Merge branch 'MDL-63131-master' of https://github.com/sammarshallou/moodle 2018-08-21 08:57:17 +08:00
sam marshall
b5311ce466 MDL-63131 Web services: Callback to allow web service overrides 2018-08-20 15:32:34 +01:00
Víctor Déniz Falcón
02fda279ed MDL-57281 behat: deprecated step definition I navigate to node in 
Definition step deprecated and affected tests modified.
 2018-08-20 12:53:26 +01:00
Andrew Nicols
7bd269e82d MDL-62660 tool_dataprivacy: Add method for unit tests to run adhoc tasks 2018-08-20 15:31:20 +08:00
Luca Bösch
8ad225b431 MDL-36255 grades: allow multilang filters in grades 2018-08-20 08:29:36 +02:00
Jake Dallimore
215ecb017a Merge branch 'MDL-62884-master' of git://github.com/damyon/moodle 2018-08-17 16:02:05 +08:00
Jake Dallimore
71926adb0d Merge branch 'MDL-63050-master' of git://github.com/andrewnicols/moodle 2018-08-15 10:59:37 +08:00
Eloy Lafuente (stronk7)
326792694e Merge branch 'MDL-58409-master_needs_clean_in_autocomplete_element' of https://github.com/dravek/moodle 2018-08-14 17:29:48 +02:00
David Monllao
8e6c2ce300 Merge branch 'MDL-36754-master' of git://github.com/andrewnicols/moodle 2018-08-14 10:18:55 +02:00
Andrew Nicols
2e8d476165 MDL-36754 core_files: Add back missing baseurl line 2018-08-14 15:54:12 +08:00
David Monllao
3ff9233a18 Merge branch 'MDL-36754-master' of git://github.com/andrewnicols/moodle 2018-08-14 08:49:45 +02:00
Jake Dallimore
ed9d61ef4a Merge branch 'MDL-63031-master' of https://github.com/prg3/moodle 2018-08-14 12:11:25 +08:00
Paul Greidanus
05f6ed0034 MDL-63031 administration: Allow plugins to define trace storage 
This will allow the use of other storage systems implemented
in plugins.
It also allows for disabling the built in DB based profiling, which
will be useful when using an external target to not waste DB storage.
 2018-08-13 21:54:48 -06:00
Andrew Nicols
88d89512e4 MDL-36754 output: Support token pluginfiles in userpic 2018-08-14 07:08:29 +08:00
Andrew Nicols
883f655552 MDL-36754 output: Support token pluginfiles in group pic 2018-08-14 07:06:09 +08:00
Andrew Nicols
8af75f08e8 MDL-36754 tests: Move moodle_url tests to own file 2018-08-14 07:06:09 +08:00
Andrew Nicols
91f1f28233 MDL-36754 core_files: Support tokens when rewriting text 
Support use of a token for access to pluginfile.php when rewriting text
content.

This is primarily intended for notifications where the user is unlikely
to be logged into Moodle when receiving the notification.
 2018-08-14 06:57:32 +08:00
Andrew Nicols
4a74ab0200 MDL-36754 core_files: Add a token version of pluginfile 2018-08-14 06:57:32 +08:00
Jun Pataleta
2454ddb6ef Merge branch 'MDL-45170-master' of git://github.com/junpataleta/moodle 2018-08-08 16:27:55 +08:00
Jun Pataleta
c353ad20c3 MDL-45170 core: Integration review fixes 
* Pass $forcehttps parameter to call extract_draft_file_urls_from_text()
 call in \core_weblib_testcase::test_extract_draft_file_urls_from_text()
* Style fixes
 2018-08-08 16:17:32 +08:00
Charles Fulton
7d7d3b1731 MDL-45170 files: check other draftfile areas when processing 2018-08-08 16:15:23 +08:00
Andrew Nicols
0c759ba614 Merge branch 'MDL-56335-master' of git://github.com/mihailges/moodle 2018-08-08 13:14:00 +08:00
Andrew Nicols
03655bb050 Merge branch 'MDL-50225_master' of git://github.com/markn86/moodle 2018-08-08 08:14:55 +08:00
Eloy Lafuente (stronk7)
54635fdee8 Merge branch 'MDL-62750_master' of https://github.com/aanabit/moodle 2018-08-07 17:10:14 +02:00
Eloy Lafuente (stronk7)
c8bea6ae57 Merge branch 'MDL-53297-master' of git://github.com/cescobedo/moodle 2018-08-07 15:57:00 +02:00
Eloy Lafuente (stronk7)
925d1dc60e Merge branch 'MDL-62065-master' of git://github.com/cescobedo/moodle 2018-08-07 15:51:34 +02:00
David Matamoros
18e2f40377 MDL-58409 core_form: needs clean in autocomplete element 2018-08-07 10:59:34 +02:00
Andrew Nicols
6acae5165c Merge branch 'MDL-62975_master' of git://github.com/markn86/moodle 2018-08-07 14:38:00 +08:00
Andrew Nicols
dcb2d4bfcf Merge branch 'MDL-62798-master' of git://github.com/mihailges/moodle 2018-08-07 13:07:31 +08:00
Andrew Nicols
4af25b000f Merge branch 'MDL-54741-master' of git://github.com/mihailges/moodle 2018-08-07 12:19:44 +08:00
Andrew Nicols
7b4dbb05e3 Merge branch 'MDL-55449-master' of git://github.com/abgreeve/moodle 2018-08-07 11:44:38 +08:00
Adrian Greeve
cc4952e997 MDL-55449 messages: Remove support for stdClass messages. 
This also makes message_sent::create_from_ids() $courseid
parameter required.
 2018-08-07 11:04:22 +08:00
Andrew Nicols
2a8830379f Merge branch 'wip-MDL-61424-master' of git://github.com/marinaglancy/moodle 2018-08-07 08:18:58 +08:00
Amaia Anabitarte
23c2316697 MDL-62750 lang: Trim langlist setting values 2018-08-06 09:38:14 +01:00