22079 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
c39e659a33 Merge branch 'MDL-37745-master' of git://github.com/lucaboesch/moodle into master 2020-07-30 01:01:47 +02:00
Victor Deniz Falcon
f8c999616a Merge branch 'MDL-66707-master' of git://github.com/rezaies/moodle 2020-07-29 22:36:49 +01:00
Victor Deniz Falcon
4d0e43ffc5 Merge branch 'MDL-69199-master' of git://github.com/aanabit/moodle 2020-07-29 11:43:32 +01:00
Eloy Lafuente (stronk7)
8ab154a5c1 Merge branch 'MDL-69319-master' of https://github.com/snake/moodle 2020-07-29 00:16:09 +02:00
Eloy Lafuente (stronk7)
24ccd6e908 Merge branch 'MDL-68107-master' of git://github.com/bmbrands/moodle 2020-07-28 12:40:04 +02:00
Bas Brands
99ddf538ca MDL-68107 mod_label: make images dropped onto courses responsive 2020-07-27 09:55:43 +02:00
Luca Bösch
84197640eb MDL-37745 mod_choice: Show taken and limit. 2020-07-26 00:08:37 +02:00
Sergio Comerón
a1087ef609 MDL-66755 forum: Subscription cancel when edit a message 2020-07-24 09:05:17 +02:00
Amaia Anabitarte
2d710f35cd MDL-69199 mod_quiz: Show timefinish in user Complete report 2020-07-23 18:53:49 +02:00
Andrew Nicols
b284293402 MDL-69138 behat: Update session->visit() to use visit step 2020-07-22 16:43:08 +08:00
Eloy Lafuente (stronk7)
8e44da5653 Merge branch 'MDL-69160-master' of git://github.com/andrewnicols/moodle 2020-07-21 23:29:29 +02:00
Adrian Greeve
17e99314a2 Merge branch 'MDL-67657-master' of git://github.com/andrewnicols/moodle 2020-07-21 14:47:14 +08:00
Adrian Greeve
d817ccaca5 Merge branch 'MDL-67436-master' of https://github.com/jondo/moodle 2020-07-21 08:28:53 +08:00
Jake Dallimore
f956926db5 MDL-69319 mod_lti: style and docs changes in external tests 2020-07-20 13:01:21 +08:00
Jake Dallimore
cea2645a81 MDL-69319 mod_lti: replace try/catch with expectException in ext tests 2020-07-20 13:00:47 +08:00
Jake Dallimore
5aff8a7852 MDL-69319 mod_lti: remove unused vars from externallib_test 2020-07-20 12:51:27 +08:00
Jake Dallimore
7c7c5286a4 MDL-69319 mod_lti: move test data generation out of common setup 2020-07-20 12:51:25 +08:00
Adrian Greeve
867509ac25 Merge branch 'MDL-69113' of https://github.com/jonof/moodle 2020-07-20 10:20:47 +08:00
Jake Dallimore
261400d4ea MDL-69319 mod_lti: call clean_returnvalue in external tests 2020-07-20 09:29:40 +08:00
Eloy Lafuente (stronk7)
5a32562f82 Merge branch 'MDL-69165-master' of https://github.com/HuongNV13/moodle 2020-07-16 16:21:27 +02:00
Sara Arjona
2eb31f8bb3 Merge branch 'MDL-68605_master' of https://github.com/t-schroeder/moodle 2020-07-16 16:21:27 +02:00
Sara Arjona
d189edb843 Merge branch 'MDL-68210-master' of https://github.com/snake/moodle 2020-07-16 16:21:27 +02:00
Robert Pollak
beca5a9300 MDL-67436 mod_assign: "Assignments per page": Sort "All" after "100" 2020-07-16 09:34:57 +02:00
Andrew Nicols
cd6eadd407 MDL-67657 behat: Convert existing uses of executeScript 2020-07-16 11:06:31 +08:00
Shamim Rezaie
4bd0eaf732 MDL-66707 mod_forum: do not blindly mark discussion replies as read 2020-07-15 22:20:40 +10:00
Sara Arjona
9f9682cfe2 Merge branch 'MDL-69068-master' of git://github.com/andrewnicols/moodle 2020-07-15 12:20:20 +02:00
Sara Arjona
b8d16ecad1 Merge branch 'MDL-45002_master' of https://github.com/grillonbleu/moodle 2020-07-15 09:51:37 +02:00
Andrew Nicols
b49cb92e82 MDL-69068 behat: New step to support singular generators 2020-07-15 15:27:31 +08:00
François Moreau
760ed019ee MDL-45002 mod_quiz: completion option, at least N attempts completed 2020-07-14 15:32:06 -04:00
Andrew Nicols
b0627a1a11 MDL-69160 workshop: Ensure steps are chained 2020-07-13 14:22:32 +08:00
Andrew Nicols
fc5e5d4999 Merge branch 'MDL-68784' of https://github.com/Peterburnett/moodle 2020-07-08 12:35:37 +08:00
Huong Nguyen
579da44a70 MDL-69165 Questions: Incorrect id used in init_submit_button function 2020-07-08 10:54:24 +07:00
Peter Burnett
7482fef18b MDL-68784: Updated variable for graph report 2020-07-08 13:48:30 +10:00
Andrew Nicols
0a5291c013 Merge branch 'MDL-60494-stray_img_end' of https://github.com/leonstr/moodle 2020-07-08 09:23:31 +08:00
Jake Dallimore
c032adf341 MDL-68210 mod_lesson: fix random failure in override behat test 2020-07-08 09:08:27 +08:00
Jake Dallimore
c467de9ac6 MDL-68210 overrides: allow copy and delete of inactive overrides
This brings lesson and assign in line with the expected behaviour
already implemented in quiz. When an override is inactive, all controls
are shown.
2020-07-08 09:08:27 +08:00
Eloy Lafuente (stronk7)
e47c53ae4a Merge branch 'MDL-68784' of https://github.com/Peterburnett/moodle 2020-07-07 18:51:50 +02:00
Tim Schroeder
3786de22f2
MDL-68605 mod_assign: return grp submissns from ws
Co-authored-by: Septatrix <24257556+Septatrix@users.noreply.github.com>
2020-07-07 12:55:04 +02:00
Andrew Nicols
877a3f70d0 Merge branch 'MDL-69106-master' of git.in.moodle.com:cameron/moodle 2020-07-07 14:13:22 +08:00
Leon Stringer
9679c49c35 MDL-60494 mod_lti: Invalid </img>, example context
<img> was followed by an invalid </img>.  Also added example context for
template so it passes CI checks.
2020-07-05 15:56:04 +01:00
Jake Dallimore
ccae2f74f8 Merge branch 'MDL-69130-master-enfix' of git://github.com/mudrd8mz/moodle 2020-07-02 12:07:58 +08:00
Jake Dallimore
c39dc16da4 Merge branch 'MDL-58926-ajax-timer' of https://github.com/rboyatt/moodle 2020-07-02 09:37:00 +08:00
Peter Burnett
91f26b5874 MDL-68784 scorm: Removed limit on allowed scorm users in report 2020-06-30 15:14:53 +10:00
Cameron Ball
548c44c89c MDL-69106 assignfeedback_editpdf: Keep files in conversion queue
In some circumstances, a submission waiting to be converted needs to persist
in the conversion queue so that it can be polled on subsequent cron runs.
2020-06-30 11:03:11 +08:00
Andrew Nicols
868a1c377d MDL-69072 mod_scorm: Stop mink reset after tests
This is now done for all scenarios. It is no longer necessary to do so
specifically for mod_scorm.
2020-06-26 21:17:23 +08:00
Helen Foster
38d5e3db1b MDL-69130 lang: Import fixed English strings (en_fix)
Significant string change:

- presentationoraltrequired,atto_image - wording changed to mention
  'decorative only' checkbox
2020-06-25 21:54:13 +02:00
Jonathon Fowler
c31a32140b MDL-69113 assign: save grader app workflow/marker filters correctly 2020-06-25 14:39:08 +10:00
Victor Deniz Falcon
e055a45160 Merge branch 'MDL-66899-log-quiz-regrade' of https://github.com/rboyatt/moodle 2020-06-18 04:16:53 +01:00
Jun Pataleta
26f3788857 Merge branch 'MDL-67294-master' of git://github.com/mihailges/moodle 2020-06-17 10:33:55 +08:00
Mihail Geshoski
2e5e143061 MDL-67294 assignsubmission_file: Make sure record exists before updating 2020-06-17 00:50:22 +08:00