moodle.git
2 years agoMerge branch 'MDL-67681_master' of https://github.com/marxjohnson/moodle
Sara Arjona [Tue, 4 Feb 2020 11:16:39 +0000 (12:16 +0100)]
Merge branch 'MDL-67681_master' of https://github.com/marxjohnson/moodle

2 years agoMerge branch 'MDL-60126-master-3' of git://github.com/mihailges/moodle
Andrew Nicols [Tue, 4 Feb 2020 02:33:19 +0000 (10:33 +0800)]
Merge branch 'MDL-60126-master-3' of git://github.com/mihailges/moodle

2 years agoMerge branch 'MDL-58584-master' of git://github.com/rezaies/moodle
Andrew Nicols [Tue, 4 Feb 2020 02:30:32 +0000 (10:30 +0800)]
Merge branch 'MDL-58584-master' of git://github.com/rezaies/moodle

2 years agoMDL-60126 competency: Unit tests
Peter [Wed, 15 Jan 2020 00:46:22 +0000 (08:46 +0800)]
MDL-60126 competency: Unit tests

2 years agoMDL-60126 core: upgrade step to clean user comp
Simey Lameze [Thu, 14 Sep 2017 02:04:55 +0000 (10:04 +0800)]
MDL-60126 core: upgrade step to clean user comp

2 years agoMDL-60126 competency: delete content upon user delete
Simey Lameze [Thu, 14 Sep 2017 02:03:51 +0000 (10:03 +0800)]
MDL-60126 competency: delete content upon user delete

2 years agoMerge branch 'MDL-67052-mysql-locks' of https://github.com/brendanheywood/moodle
Eloy Lafuente (stronk7) [Mon, 3 Feb 2020 18:32:58 +0000 (19:32 +0100)]
Merge branch 'MDL-67052-mysql-locks' of https://github.com/brendanheywood/moodle

2 years agoMerge branch 'MDL-67721-master' of git://github.com/rezaies/moodle
Sara Arjona [Mon, 3 Feb 2020 13:52:16 +0000 (14:52 +0100)]
Merge branch 'MDL-67721-master' of git://github.com/rezaies/moodle

2 years agoMerge branch 'MDL-67511-master' of git://github.com/andrewnicols/moodle
Sara Arjona [Mon, 3 Feb 2020 13:10:15 +0000 (14:10 +0100)]
Merge branch 'MDL-67511-master' of git://github.com/andrewnicols/moodle

2 years agoMDL-58584 core_ddl: getDropTableSQL should not do more than what it says
Shamim Rezaie [Wed, 22 Jan 2020 01:21:30 +0000 (12:21 +1100)]
MDL-58584 core_ddl: getDropTableSQL should not do more than what it says

2 years agoMDL-58584 core: remove duplications from get_columns functions
Shamim Rezaie [Tue, 21 Jan 2020 13:50:15 +0000 (00:50 +1100)]
MDL-58584 core: remove duplications from get_columns functions

2 years agoMDL-67511 core: Adjust spacing at top of toast-wrapper
Andrew Nicols [Thu, 19 Dec 2019 01:26:36 +0000 (09:26 +0800)]
MDL-67511 core: Adjust spacing at top of toast-wrapper

2 years agoweekly release 3.9dev
Eloy Lafuente (stronk7) [Thu, 30 Jan 2020 15:10:59 +0000 (16:10 +0100)]
weekly release 3.9dev

2 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 30 Jan 2020 15:10:56 +0000 (16:10 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

2 years agoMDL-67681 Cache: Store coursecattree array in a single key
Mark Johnson [Tue, 14 Jan 2020 09:58:48 +0000 (09:58 +0000)]
MDL-67681 Cache: Store coursecattree array in a single key

2 years agoMerge branch 'MDL-67353_reset' of https://github.com/stronk7/moodle
Jun Pataleta [Thu, 30 Jan 2020 04:35:56 +0000 (12:35 +0800)]
Merge branch 'MDL-67353_reset' of https://github.com/stronk7/moodle

2 years agoMerge branch 'MDL-67351-master_required_setting' of https://github.com/catalyst/moodle
Adrian Greeve [Thu, 30 Jan 2020 00:11:33 +0000 (08:11 +0800)]
Merge branch 'MDL-67351-master_required_setting' of https://github.com/catalyst/moodle

2 years agoMDL-67351 quiz: Change advanced quiz settings types to use flags.
Andrew Madden [Wed, 29 Jan 2020 23:50:59 +0000 (10:50 +1100)]
MDL-67351 quiz: Change advanced quiz settings types to use flags.

Change all 'with_advanced' setting types in quiz/settings to their
regular counterparts and apply the 'advanced' admin flag to them
instead. Settings that extend with_advanced setting types are
unchanged.

2 years agoMDL-67351 quiz: Move quiz form defaults logic out of form.
Andrew Madden [Wed, 29 Jan 2020 23:50:01 +0000 (10:50 +1100)]
MDL-67351 quiz: Move quiz form defaults logic out of form.

By including the mod_form:apply_admin_defaults() method in the quiz
moodle_form, each element does not need to set default and advanced
states individually.

2 years agoMDL-67351 admin: Create new 'required' admin flag setting.
Andrew Madden [Fri, 17 Jan 2020 04:01:35 +0000 (15:01 +1100)]
MDL-67351 admin: Create new 'required' admin flag setting.

Extend the admin flag options, that currently allow the 'advanced' and 'locked' states
of a form setting to be controlled by a plugins admin settings, to also include
the 'required' state. These options appear as a list of checkboxes next to the admin
setting.

2 years agoMDL-67353 course: move form tearDown() to reset_all_data()
Eloy Lafuente (stronk7) [Wed, 29 Jan 2020 22:43:57 +0000 (23:43 +0100)]
MDL-67353 course: move form tearDown() to reset_all_data()

We are already cleaning all sort of caches, statics, singletons
there and it's better to ensure they are always reset to avoid
myterious failures @ distance.

2 years agoMDL-67052 locks: Added a native MySQL / MariaDB lock implementation
Brendan Heywood [Wed, 29 Jan 2020 22:19:09 +0000 (09:19 +1100)]
MDL-67052 locks: Added a native MySQL / MariaDB lock implementation

2 years agoMDL-67052 locks: Fixed backwards unit tests for unstacked locks
Brendan Heywood [Wed, 29 Jan 2020 22:19:01 +0000 (09:19 +1100)]
MDL-67052 locks: Fixed backwards unit tests for unstacked locks

2 years agoMDL-64169 course: fix padding when display on one section per page
Michelle Melton [Tue, 8 Oct 2019 17:55:54 +0000 (13:55 -0400)]
MDL-64169 course: fix padding when display on one section per page

(amended to keep the $o.= consistent with surrounding code)

2 years agoMerge branch 'wip-MDL-67545-master' of https://github.com/Beedell/moodle
Eloy Lafuente (stronk7) [Wed, 29 Jan 2020 18:28:56 +0000 (19:28 +0100)]
Merge branch 'wip-MDL-67545-master' of https://github.com/Beedell/moodle

2 years agoMerge branch 'MDL-67626_master' of git://github.com/adpe/moodle
Jun Pataleta [Wed, 29 Jan 2020 13:36:12 +0000 (21:36 +0800)]
Merge branch 'MDL-67626_master' of git://github.com/adpe/moodle

2 years agoMerge branch 'MDL-67768-master-componentdirs' of git://github.com/mudrd8mz/moodle
Adrian Greeve [Wed, 29 Jan 2020 02:01:08 +0000 (10:01 +0800)]
Merge branch 'MDL-67768-master-componentdirs' of git://github.com/mudrd8mz/moodle

2 years agoMerge branch 'MDL-67472-master' of git://github.com/bmbrands/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jan 2020 21:56:37 +0000 (22:56 +0100)]
Merge branch 'MDL-67472-master' of git://github.com/bmbrands/moodle

2 years agoMerge branch 'MDL-52189' of https://github.com/jonof/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jan 2020 21:43:22 +0000 (22:43 +0100)]
Merge branch 'MDL-52189' of https://github.com/jonof/moodle

2 years agoMerge branch 'MDL-67447-master-autocomplete' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jan 2020 21:23:43 +0000 (22:23 +0100)]
Merge branch 'MDL-67447-master-autocomplete' of git://github.com/mudrd8mz/moodle

2 years agoMerge branch 'MDL-67722-master' of git://github.com/mickhawkins/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jan 2020 19:13:08 +0000 (20:13 +0100)]
Merge branch 'MDL-67722-master' of git://github.com/mickhawkins/moodle

2 years agoMerge branch 'MDL-56389' of https://github.com/paulholden/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jan 2020 10:04:05 +0000 (11:04 +0100)]
Merge branch 'MDL-56389' of https://github.com/paulholden/moodle

2 years agoMerge branch 'MDL-57755_master' of https://github.com/t-schroeder/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jan 2020 09:26:32 +0000 (10:26 +0100)]
Merge branch 'MDL-57755_master' of https://github.com/t-schroeder/moodle

2 years agoMDL-67768 core: Add some common dirs to core_component::$ignoreddirs
David Mudrák [Wed, 22 Jan 2020 12:01:24 +0000 (13:01 +0100)]
MDL-67768 core: Add some common dirs to core_component::$ignoreddirs

The core_component::$ignoreddirs lists all directories that are reserved
and cannot be used as valid plugin names. This is particularly important
for some plugin types such as 'webservice' that share the same root
location as the core subsystem of the same name.

2 years agoMerge branch 'MDL-67740-master-behatstepsfilter' of git://github.com/mudrd8mz/moodle
Adrian Greeve [Tue, 28 Jan 2020 07:05:45 +0000 (15:05 +0800)]
Merge branch 'MDL-67740-master-behatstepsfilter' of git://github.com/mudrd8mz/moodle

2 years agoMerge branch 'master_MDL-67746' of https://github.com/golenkovm/moodle
Adrian Greeve [Tue, 28 Jan 2020 05:11:41 +0000 (13:11 +0800)]
Merge branch 'master_MDL-67746' of https://github.com/golenkovm/moodle

2 years agoMerge branch 'MDL-38511-bulk-actions' of https://github.com/brendanheywood/moodle
Adrian Greeve [Tue, 28 Jan 2020 03:07:44 +0000 (11:07 +0800)]
Merge branch 'MDL-38511-bulk-actions' of https://github.com/brendanheywood/moodle

2 years agoAutomatically generated installer lang files
AMOS bot [Tue, 28 Jan 2020 00:11:35 +0000 (00:11 +0000)]
Automatically generated installer lang files

2 years agoMerge branch 'MDL-67691' of https://github.com/stronk7/moodle
Adrian Greeve [Mon, 27 Jan 2020 23:52:21 +0000 (07:52 +0800)]
Merge branch 'MDL-67691' of https://github.com/stronk7/moodle

2 years agoMDL-67721 mod_forum: See 'view grade' button on single discussion forums
Shamim Rezaie [Mon, 27 Jan 2020 17:59:15 +0000 (04:59 +1100)]
MDL-67721 mod_forum: See 'view grade' button on single discussion forums

2 years agoMerge branch 'MDL-64531-master-questiondeletejson' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2020 16:07:33 +0000 (17:07 +0100)]
Merge branch 'MDL-64531-master-questiondeletejson' of git://github.com/mudrd8mz/moodle

2 years agoMerge branch 'MDL-67577-master' of git://github.com/bmbrands/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2020 15:15:21 +0000 (16:15 +0100)]
Merge branch 'MDL-67577-master' of git://github.com/bmbrands/moodle

2 years agoMerge branch 'MDL-67730-master' of git://github.com/rezaies/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2020 11:21:21 +0000 (12:21 +0100)]
Merge branch 'MDL-67730-master' of git://github.com/rezaies/moodle

2 years agoMerge branch 'm39_MDL-67414_Add_PostgreSQL_12x_Support_v2' of https://github.com...
Eloy Lafuente (stronk7) [Mon, 27 Jan 2020 11:16:08 +0000 (12:16 +0100)]
Merge branch 'm39_MDL-67414_Add_PostgreSQL_12x_Support_v2' of https://github.com/scara/moodle

2 years agoMDL-67577 core_message: navbar_output order
Bas Brands [Mon, 27 Jan 2020 11:14:16 +0000 (12:14 +0100)]
MDL-67577 core_message: navbar_output order

* moved the logic from core_message_popup_render_navbar_output to
message_popup_render_navbar_output in message/output/popup/lib.php

* using float: left instead of float: right in theme

2 years agoMDL-67414 database: Fixed PostgreSQL 12.x support
Matteo Scaramuccia [Fri, 29 Nov 2019 23:03:31 +0000 (00:03 +0100)]
MDL-67414 database: Fixed PostgreSQL 12.x support

2 years agoMDL-67447 form: Fix the duplicate autocomplete selection node
David Mudrák [Wed, 4 Dec 2019 08:10:51 +0000 (09:10 +0100)]
MDL-67447 form: Fix the duplicate autocomplete selection node

When the autocomplete selection is updated, the content of the selection
wrapper is replaced with the new list of selected items. We must replace
only the content of the selection wrapper and not to nest it into
itself.

2 years agoAutomatically generated installer lang files
AMOS bot [Sat, 25 Jan 2020 00:11:31 +0000 (00:11 +0000)]
Automatically generated installer lang files

2 years agoMDL-67545 Antivirus: new option for clam scan failure
John Beedell [Wed, 18 Dec 2019 11:24:13 +0000 (11:24 +0000)]
MDL-67545 Antivirus: new option for clam scan failure

2 years agoMDL-67353 filters: fix filterlib tests
Eloy Lafuente (stronk7) [Sun, 12 Jan 2020 03:16:35 +0000 (04:16 +0100)]
MDL-67353 filters: fix filterlib tests

- move resetAfterTest() to test units.
- remove setUp(), moving code to remove_all_filters_from_config().
- remove class properties, moving to return values of own setup_xxx() methods.

2 years agoMDL-67353 favourites: Random DB id matching solved
Eloy Lafuente (stronk7) [Sun, 12 Jan 2020 12:20:33 +0000 (13:20 +0100)]
MDL-67353 favourites: Random DB id matching solved

Depending on the tests executed it was possible to arrive
to favourites tests with 2 "concepts" (say userid and contextid,
or userid and itemid) having the same ID.

Then, the array_diff() operations used by some mock stuff in the
tests wrongly was returning matches by value, ultimately causing
the test to fail.

Now, the matching is performed using array_diff_assoc() that takes
keys into considation when performing the match.

2 years agoMDL-67353 course: Fix more broken unit tests
Andrew Nicols [Sun, 10 Nov 2019 23:08:28 +0000 (07:08 +0800)]
MDL-67353 course: Fix more broken unit tests

2 years agoMDL-67353 course: Fix broken unit test
Andrew Nicols [Sun, 10 Nov 2019 12:53:25 +0000 (20:53 +0800)]
MDL-67353 course: Fix broken unit test

2 years agoMDL-67740 behat: Show info as collapsed at the acceptance testing page
David Mudrák [Mon, 20 Jan 2020 20:29:20 +0000 (21:29 +0100)]
MDL-67740 behat: Show info as collapsed at the acceptance testing page

The static information with the links to Behat documentation is quite
long an irrelevant for experienced developers returning to this page. No
need to waste the prominent screen place with it - better to offer it
only when needed via collapsible form section.

2 years agoMDL-67740 behat: Improve the layout of the acceptance testing page
David Mudrák [Mon, 20 Jan 2020 20:04:27 +0000 (21:04 +0100)]
MDL-67740 behat: Improve the layout of the acceptance testing page

- The CSS contains more specific selectors.
- Make use of the whole screen width for the list of found steps.
- Visually distinguish found steps from each other.
- Make it look less like a unicorn rainbow.

2 years agoMDL-67740 behat: Fix the name of the class in the inline documentation
David Mudrák [Mon, 20 Jan 2020 20:00:16 +0000 (21:00 +0100)]
MDL-67740 behat: Fix the name of the class in the inline documentation

The said class is provided by the moodlehq/behat-extension composer
package and was renamed as a part of upgrade to Behat 3.0.x (MDL-46891).

2 years agoMDL-67740 behat: Allow multiple words filter at acceptance testing page
David Mudrák [Mon, 20 Jan 2020 19:56:48 +0000 (20:56 +0100)]
MDL-67740 behat: Allow multiple words filter at acceptance testing page

Because of the too strict input param type, the form did not allow to
search for Behat steps containing the given phrase. The patch sets the
param type to match the one in the form definition, and makes sure that
the submitted value can be safely used as a CLI script argument.

2 years agoMDL-57755 message: fix notificaiton read status when messaging disabled
Tim Schroeder [Wed, 16 Oct 2019 15:28:04 +0000 (17:28 +0200)]
MDL-57755 message: fix notificaiton read status when messaging disabled

2 years agoMDL-67746 Tasks: Cleanup task logs in chunks.
Mikhail Golenkov [Tue, 21 Jan 2020 05:02:30 +0000 (16:02 +1100)]
MDL-67746 Tasks: Cleanup task logs in chunks.

2 years agoweekly release 3.9dev
Adrian Greeve [Fri, 24 Jan 2020 02:16:48 +0000 (10:16 +0800)]
weekly release 3.9dev

2 years agoNOBUG: Fixed file access permissions
Adrian Greeve [Fri, 24 Jan 2020 02:16:48 +0000 (10:16 +0800)]
NOBUG: Fixed file access permissions

2 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Adrian Greeve [Fri, 24 Jan 2020 02:16:39 +0000 (10:16 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

2 years agoMDL-56389 message_popup: less greedy marking of notifications as read.
Paul Holden [Fri, 7 Jun 2019 13:46:40 +0000 (14:46 +0100)]
MDL-56389 message_popup: less greedy marking of notifications as read.

Only mark those notifications that were returned in the last query as
read, based on the time they were requested.

2 years agoMDL-56389 message: allow marking notifications as read up to given time.
Paul Holden [Fri, 7 Jun 2019 09:58:30 +0000 (10:58 +0100)]
MDL-56389 message: allow marking notifications as read up to given time.

2 years agoMerge branch 'MDL-51225-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Thu, 23 Jan 2020 10:13:33 +0000 (11:13 +0100)]
Merge branch 'MDL-51225-master' of git://github.com/junpataleta/moodle

2 years agoMDL-51225 mod_forum: Revert @javascript tag removal
Jun Pataleta [Thu, 23 Jan 2020 07:23:25 +0000 (15:23 +0800)]
MDL-51225 mod_forum: Revert @javascript tag removal

Put back the removed  @javascript tag to prevent random goutte
fails.

2 years agoMerge branch 'MDL-67118' of https://github.com/stronk7/moodle
Jun Pataleta [Thu, 23 Jan 2020 04:55:38 +0000 (12:55 +0800)]
Merge branch 'MDL-67118' of https://github.com/stronk7/moodle

2 years agoMerge branch 'MDL-67115' of https://github.com/stronk7/moodle
Jun Pataleta [Thu, 23 Jan 2020 03:43:39 +0000 (11:43 +0800)]
Merge branch 'MDL-67115' of https://github.com/stronk7/moodle

2 years agoMerge branch 'MDL-67703-master' of git://github.com/lameze/moodle
Adrian Greeve [Thu, 23 Jan 2020 03:09:05 +0000 (11:09 +0800)]
Merge branch 'MDL-67703-master' of git://github.com/lameze/moodle

2 years agoMerge branch 'MDL-65775-master' of git://github.com/ferranrecio/moodle
Adrian Greeve [Thu, 23 Jan 2020 02:50:37 +0000 (10:50 +0800)]
Merge branch 'MDL-65775-master' of git://github.com/ferranrecio/moodle

2 years agoMerge branch 'MDL-65952' of https://github.com/fabiendallet/moodle
Jun Pataleta [Thu, 23 Jan 2020 02:45:19 +0000 (10:45 +0800)]
Merge branch 'MDL-65952' of https://github.com/fabiendallet/moodle

2 years agoMDL-67730 lib: Fix to make the library php74 compliant.
Shamim Rezaie [Wed, 22 Jan 2020 04:57:38 +0000 (15:57 +1100)]
MDL-67730 lib: Fix to make the library php74 compliant.

2 years agoMerge branch 'MDL-67296-master' of git://github.com/vmdef/moodle
Eloy Lafuente (stronk7) [Wed, 22 Jan 2020 22:46:06 +0000 (23:46 +0100)]
Merge branch 'MDL-67296-master' of git://github.com/vmdef/moodle

2 years agoMDL-67296 core_h5p: tests modified to use exttests
Víctor Déniz Falcón [Wed, 22 Jan 2020 20:40:12 +0000 (20:40 +0000)]
MDL-67296 core_h5p: tests modified to use exttests

2 years agoMerge branch 'MDL-66897-master-1' of git://github.com/mihailges/moodle
Jun Pataleta [Wed, 22 Jan 2020 15:17:14 +0000 (23:17 +0800)]
Merge branch 'MDL-66897-master-1' of git://github.com/mihailges/moodle

2 years agoMDL-67296 core_h5p: minor changes
Víctor Déniz Falcón [Wed, 22 Jan 2020 14:48:16 +0000 (14:48 +0000)]
MDL-67296 core_h5p: minor changes

core.php-Avoid to use the factory for each content type
h5p_get_content_types_task-new method to simplify test execution
framework.php-returns error if you get a 404 response after requesting a file

2 years agoMDL-38511 admin: Allow plugins to define custom bulk actions
Brendan Heywood [Wed, 22 Jan 2020 07:06:25 +0000 (18:06 +1100)]
MDL-38511 admin: Allow plugins to define custom bulk actions

2 years agoMerge branch 'MDL-67424-master' of git://github.com/rezaies/moodle
Adrian Greeve [Wed, 22 Jan 2020 05:56:33 +0000 (13:56 +0800)]
Merge branch 'MDL-67424-master' of git://github.com/rezaies/moodle

2 years agoMDL-66897 mod_assign: Properly display error messages in quick grading
Mihail Geshoski [Wed, 22 Jan 2020 05:37:07 +0000 (13:37 +0800)]
MDL-66897 mod_assign: Properly display error messages in quick grading

2 years agoMerge branch 'MDL-67438' of https://github.com/stronk7/moodle
Adrian Greeve [Wed, 22 Jan 2020 05:29:01 +0000 (13:29 +0800)]
Merge branch 'MDL-67438' of https://github.com/stronk7/moodle

2 years agoMerge branch 'MDL-67456' of https://github.com/stronk7/moodle
Adrian Greeve [Wed, 22 Jan 2020 05:12:27 +0000 (13:12 +0800)]
Merge branch 'MDL-67456' of https://github.com/stronk7/moodle

2 years agoMerge branch 'MDL-67653' of https://github.com/timhunt/moodle
Adrian Greeve [Wed, 22 Jan 2020 03:02:35 +0000 (11:02 +0800)]
Merge branch 'MDL-67653' of https://github.com/timhunt/moodle

2 years agoMerge branch 'MDL-67660-master-v2' of https://github.com/TobiGa/moodle
Adrian Greeve [Wed, 22 Jan 2020 02:41:03 +0000 (10:41 +0800)]
Merge branch 'MDL-67660-master-v2' of https://github.com/TobiGa/moodle

2 years agoMerge branch 'MDL-67684-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Wed, 22 Jan 2020 02:38:13 +0000 (10:38 +0800)]
Merge branch 'MDL-67684-master' of git://github.com/andrewnicols/moodle

2 years agoMDL-67730 lib: Upgrade ADODB to version 5.20.16
Shamim Rezaie [Wed, 22 Jan 2020 02:34:20 +0000 (13:34 +1100)]
MDL-67730 lib: Upgrade ADODB to version 5.20.16

2 years agoMerge branch 'MDL-67680-master' of git://github.com/marinaglancy/moodle
Adrian Greeve [Wed, 22 Jan 2020 02:28:23 +0000 (10:28 +0800)]
Merge branch 'MDL-67680-master' of git://github.com/marinaglancy/moodle

2 years agoMDL-52189 file: skip deleting temp files that appear during cleanup
Colin Campbell [Thu, 10 Oct 2019 01:38:25 +0000 (11:38 +1000)]
MDL-52189 file: skip deleting temp files that appear during cleanup

2 years agoMerge branch 'MDL-67656-master' of git://github.com/andrewnicols/moodle
Adrian Greeve [Wed, 22 Jan 2020 01:44:17 +0000 (09:44 +0800)]
Merge branch 'MDL-67656-master' of git://github.com/andrewnicols/moodle

2 years agoMerge branch 'MDL-66858' of https://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Wed, 22 Jan 2020 00:57:18 +0000 (01:57 +0100)]
Merge branch 'MDL-66858' of https://github.com/stronk7/moodle

2 years agoMDL-66858 master: Enable <header> tags in Atto editor.
Michael Milette [Mon, 13 Jan 2020 21:19:31 +0000 (16:19 -0500)]
MDL-66858 master: Enable <header> tags in Atto editor.

(amended to add the src/editor/js/clean.js
file that was originally missing)

2 years agoMerge branch 'MDL-51225-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2020 22:33:19 +0000 (23:33 +0100)]
Merge branch 'MDL-51225-master' of git://github.com/junpataleta/moodle

2 years agoMerge branch 'MDL-66237-master' of git://github.com/mickhawkins/moodle
Adrian Greeve [Tue, 21 Jan 2020 03:08:27 +0000 (11:08 +0800)]
Merge branch 'MDL-66237-master' of git://github.com/mickhawkins/moodle

2 years agoMerge branch 'MDL-66108' of https://github.com/paulholden/moodle
Jun Pataleta [Tue, 21 Jan 2020 01:51:24 +0000 (09:51 +0800)]
Merge branch 'MDL-66108' of https://github.com/paulholden/moodle

2 years agoMerge branch 'MDL-66024' of https://github.com/paulholden/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2020 21:47:17 +0000 (22:47 +0100)]
Merge branch 'MDL-66024' of https://github.com/paulholden/moodle

2 years agoMerge branch 'MDL-66220-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2020 21:33:45 +0000 (22:33 +0100)]
Merge branch 'MDL-66220-master' of git://github.com/junpataleta/moodle

2 years agoMerge branch 'MDL-66712-master-selfautounenrol' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2020 21:27:20 +0000 (22:27 +0100)]
Merge branch 'MDL-66712-master-selfautounenrol' of git://github.com/mudrd8mz/moodle

2 years agoMerge branch 'MDL-65884' of https://github.com/paulholden/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2020 19:13:29 +0000 (20:13 +0100)]
Merge branch 'MDL-65884' of https://github.com/paulholden/moodle

2 years agoMDL-64531 course: Add Behat test for deleting a quiz with own questions
David Mudrák [Mon, 20 Jan 2020 17:01:22 +0000 (18:01 +0100)]
MDL-64531 course: Add Behat test for deleting a quiz with own questions

Teachers can delete Quiz activities that have a question in their own
context via AJAX request with the course recycle bin disabled. This used
to lead to "Unexpected token < in JSON" because of the extra HTML in the
output.

2 years agoMDL-64531 course: course_delete_module shouldn't output during AJAX
Tim Hunt [Mon, 20 Jan 2020 16:15:55 +0000 (17:15 +0100)]
MDL-64531 course: course_delete_module shouldn't output during AJAX

Committer's note: This change was originally part of a bigger patchset
submitted by the author. This is a stripped-down version that does not
use phpunit tests for the new behaviour.

2 years agoMerge branch 'MDL-67724-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2020 09:53:18 +0000 (10:53 +0100)]
Merge branch 'MDL-67724-master' of git://github.com/junpataleta/moodle