2309 Commits

Author SHA1 Message Date
Paul Holden
51539ba383 MDL-40669 tool_uploaduser: set emailstop during upload Behat test. 2019-09-18 21:41:28 +01:00
Andrew Nicols
5034f0a12b MDL-66550 theme: Wrap JS calls in pendingJS 2019-09-12 20:58:10 +08:00
Andrew Nicols
d10ed4d240 MDL-66550 behat: Standardise finding in core functionality 2019-09-10 21:29:03 +08:00
Jake Dallimore
a7e33b03a4 Merge branch 'MDL-56223-master' of git://github.com/lameze/moodle 2019-09-05 17:20:03 +08:00
Simey Lameze
d5727ed3ba MDL-56223 calendar: skip events updating if nothing has changed 2019-09-05 16:18:37 +08:00
Ryan Wyllie
f9664b0c19 MDL-62284 output: prevent nested JS mustache handler calls
Prevent the JS mustache helper from being executed from within
the render call of another mustache helper because it can allow
users to inject JS into the page.
2019-09-04 11:22:51 +08:00
Andrew Nicols
8cb4578de8 MDL-66181 behat: You check checkboxes, not click them 2019-09-02 17:04:35 +02:00
Adrian Greeve
ef848e0aa8 Merge branch 'MDL-66468-master' of git://github.com/jleyva/moodle 2019-08-28 08:54:26 +08:00
Juan Leyva
418a86c660 MDL-66468 file: Return text content when using IGNORE_FILE_MERGE 2019-08-22 13:10:39 +01:00
Adrian Greeve
0052d1b666 Merge branch 'MDL-65443' of https://github.com/NeillM/moodle 2019-08-21 16:35:34 +08:00
Adrian Greeve
700adfb9cf Merge branch 'MDL-66378-master' of git://github.com/andrewnicols/moodle 2019-08-21 08:54:34 +08:00
Andrew Nicols
6fd975cc07 MDL-66378 behat: Correct grammar of resize step 2019-08-21 08:39:51 +08:00
Andrew Nicols
a6df6800d4 MDL-66378 behat: All args are required for document.evaluate 2019-08-21 08:24:08 +08:00
Neill Magill
e3ec42093a MDL-65443 core: Log when a context is locked or unlocked 2019-08-20 08:52:35 +01:00
Adrian Greeve
5074882e13 Merge branch 'MDL-66378-master' of git://github.com/andrewnicols/moodle 2019-08-20 13:43:11 +08:00
François Moreau
6ab44bdbc6 MDL-65404 tool_uploaduser: Add a column for enrolment time start. 2019-08-19 14:25:24 -04:00
Andrew Nicols
460a0a74c4 MDL-66378 behat: JS does not work with newlines in an xpath 2019-08-19 08:16:40 +08:00
Andrew Nicols
7d6d23294f MDL-66378 behat: Before/after detection should be constrainable
The default before/after detection checks the entire body. Any match of
the text will therefore be found.

Add support for specification of a container for the nodes.
2019-08-17 11:44:48 +08:00
Andrew Nicols
17a7dc9da5 MDL-66378 behat: Add non-JS fallback for before/after 2019-08-17 11:44:48 +08:00
sam marshall
5298a6bc11 MDL-66378 Behat: Speed up 'before/after' step in Chrome
On some Chrome versions the xpath used for before/after is slow
and (sometimes) uses a lot of memory. This change uses pure
JavaScript to do the before/after calculation, which should always
be fast.
2019-08-17 11:44:48 +08:00
Jun Pataleta
1648b5ac6e Merge branch 'MDL-66147-master' of https://github.com/snake/moodle 2019-08-13 16:34:34 +08:00
Adrian Greeve
2217ca91ee Merge branch 'MDL-57623' of git://github.com/Chocolate-lightning/moodle 2019-08-13 14:27:30 +08:00
Mathew May
09dedee2e1 MDL-57623 behat: Remove deprecated step from 3.3 2019-08-13 14:24:34 +08:00
Andrew Nicols
c188ddfe93 Merge branch 'MDL-59524-master' of git://github.com/cescobedo/moodle 2019-08-13 12:56:32 +08:00
Jun Pataleta
a7faa3f1c5 Merge branch 'MDL-66104' of git://github.com/stronk7/moodle 2019-08-12 14:51:59 +08:00
Jake Dallimore
612b210d76 MDL-66147 core: add get_time_interval_string()
Returns a formatted string representation of the difference between two
timestamps, defaulting to 'Xd Xh Xm' format, but supporting custom
format strings containing any chars from:
https://www.php.net/manual/en/dateinterval.format.php.
2019-08-12 09:35:51 +08:00
cescobedo
0504254f1d MDL-59524 general: Remove strings deprecated in 3.4 2019-08-12 00:13:08 +02:00
Jun Pataleta
d3455c0da1 Merge branch 'MDL-59470' of https://github.com/Chocolate-lightning/moodle 2019-08-08 10:40:51 +08:00
Mathew May
71fd7b1139 MDL-59470 behat: Add a element comtains x occurrences step 2019-08-08 09:16:19 +08:00
Jun Pataleta
30c8bf169e Merge branch 'MDL-50346-master' of git://github.com/andrewnicols/moodle 2019-08-07 17:11:31 +08:00
Sara Arjona
96d497204f Merge branch 'MDL-61649-master' of git://github.com/aanabit/moodle 2019-08-07 13:33:04 +08:00
Andrew Nicols
0261d1effa MDL-50346 core: Allow sub-directories in template names 2019-08-07 11:44:49 +08:00
Amaia Anabitarte
c7f88457cd MDL-61649 email: Send plain/html format emails based on user preference 2019-08-07 11:20:02 +08:00
Andrew Nicols
638097810d Merge branch 'mdl-66280' of https://github.com/Peterburnett/moodle 2019-08-07 10:22:04 +08:00
Andrew Nicols
1108ccba62 Merge branch 'MDL-66034-master' of git://github.com/lameze/moodle 2019-08-06 09:30:14 +08:00
Simey Lameze
2d526dcb33 MDL-66034 core_role: improve role events php unit coverage 2019-08-05 13:09:19 +08:00
Simey Lameze
3a18032dbf MDL-66034 core: delete role_capabilities_updated event triggers 2019-08-05 13:09:19 +08:00
Simey Lameze
32306e8390 MDL-66034 core_role: add more detail to role allow event classes 2019-08-05 13:09:19 +08:00
Andrew Nicols
6047801767 Merge branch 'MDL-64032-master' of https://github.com/HuongNV13/moodle 2019-08-05 12:55:35 +08:00
[Peter Burnett]
d82b6004bf MDL-66280 core: Added unit tests for print_password_policy 2019-08-02 11:34:23 +10:00
Eloy Lafuente (stronk7)
764167136f MDL-66104 output: HTMLPurifier to allow <nolink> tags everywhere
Before the patch, HTMLPurifier was instructed to handle <nolink>
tags in block mode. That implies that any block tag enclosing it
had to be closed for HTML compliance.

But <noscript> tags are not part of the final output (they are
removed) but just internally used to skip filtering certain areas.

So they can be virtually everywhere, HTMLPurifier just should allow
them without any change, both to parent or children tags.
2019-08-01 17:52:33 +02:00
Adrian Greeve
f1cb94488e Merge branch 'MDL-58974-master' of git://github.com/vmdef/moodle 2019-08-01 09:02:52 +08:00
Victor Deniz Falcon
a9e58c14f9 MDL-58974 core_analytics: Add behat tests
Behat testing to cover model management and predictions generation
and visualization.
2019-07-31 11:13:05 +01:00
Jun Pataleta
3c84d36f94 Merge branch 'MDL-65831-master' of git://github.com/aanabit/moodle 2019-07-31 10:55:58 +08:00
Amaia Anabitarte
c9469fb488 MDL-65831 behat: New steps to switch offline mode for moodle app behats 2019-07-29 09:50:41 +08:00
Huong Nguyen
0fc30827dc MDL-64032 enrol_manual: Make consistent the UI for setting enrolment
Add end date/duration for the UI for setting enrolment should be consistent
2019-07-23 14:21:43 +07:00
Jun Pataleta
9320787005 MDL-46267 core: Remove $CFG->httpswwwroot
* It's unnecessary since $CFG->loginhttps has already been removed and
  it's no longer being used in core anymore.
2019-07-22 10:59:42 +08:00
Mathew May
f305ffc933 MDL-65744 lib: Modify minify test to check properly 2019-07-16 17:06:06 +08:00
Mathew May
ad4d9cf745 MDL-65744 lib: Modify minify test to check properly 2019-07-16 17:05:33 +08:00
Eloy Lafuente (stronk7)
65b10696c5 Merge branch 'MDL-65931-master' of https://github.com/sammarshallou/moodle 2019-07-11 00:33:57 +02:00