21985 Commits

Author SHA1 Message Date
Jun Pataleta
323f5f46c7 Merge branch 'MDL-68855-master' of git://github.com/cescobedo/moodle 2020-05-29 11:48:46 +08:00
Víctor Déniz Falcón
37f2c91a8c Merge branch 'MDL-68209-master-2' of git://github.com/bmbrands/moodle 2020-05-28 16:37:21 +01:00
cescobedo
ec853bef8d MDL-68855 mod_h5pactivity: Add itemid to the package URL 2020-05-28 15:54:30 +02:00
Eloy Lafuente (stronk7)
6f56e743ed Merge branch 'MDL-68753-master-enfix' of git://github.com/mudrd8mz/moodle 2020-05-28 13:01:39 +02:00
Adrian Greeve
9e1ace3fb5 Merge branch 'MDL-68822-master' of git://github.com/ferranrecio/moodle 2020-05-28 11:49:37 +08:00
Andrew Nicols
2ffc3bd5a2 Merge branch 'MDL-68846' of https://github.com/stronk7/moodle 2020-05-28 07:35:10 +08:00
Eloy Lafuente (stronk7)
a0e38e4371 MDL-68846 behat: Avoid asserting AM/PM strings. They are not cross-os
The exists/contains steps of behat are case-sensitive, in the other
side, depending of the OS and locales, time functions are not 100%
consistent. See https://bugs.php.net/bug.php?id=76378 for example.

So only solutions are:

1) Create a specific new step performing the checks case insensitively.
2) Avoid making AM / PM part of the checks.

Here we have opted by the 2nd approach, it's not critical part to check.
2020-05-27 17:55:32 +02:00
Bas Brands
5fe7bcdb30 MDL-68209 core_course: improve activity chooser styling 2020-05-27 16:49:23 +02:00
David Mudrák
2615e429f4 MDL-68753 lang: Remove a redundant okay string and use "OK" everywhere
The "Ok" (with lower-case "k") string was added in MDL-68409 to keep
backwards compatibility with YUI alerts that had it hard-coded. But we
should not need to explain to translators why we have two OK strings
like this and why they use different wording.

Additionally, there would be inconsistency in Behat tests and everywhere
depending on which "OK" or "Ok" string is used for buttons.

So instead, this patch changes the hard-coded 'Ok' string in the YUI and
we should stick to "OK" from now on everywhere.
2020-05-27 09:59:44 +02:00
David Mudrák
c47b174d44 MDL-68753 lang: Use the updated strings in the tests 2020-05-27 09:59:35 +02:00
Helen Foster
026a12ec51 MDL-68753 lang: Import fixed English strings (en_fix) 2020-05-26 19:18:23 +02:00
Ferran Recio
5567c5e833 MDL-68822 mod_h5pactivity: add description to view.php 2020-05-26 17:29:40 +02:00
Bas Brands
91de0ed823 MDL-67874 theme_boost: make focus outline accessible 2020-05-26 09:54:12 +02:00
Andrew Nicols
7d02452504 Merge branch 'MDL-67547' of https://github.com/paulholden/moodle 2020-05-26 08:06:39 +08:00
Paul Holden
f8f5a2f6da MDL-67547 mod_forum: convert pluginfile URLs prior to export. 2020-05-26 00:54:51 +01:00
Sara Arjona
0a7c9b9d63 MDL-68448 h5pactivity: remove illegal whitespaces 2020-05-25 11:35:15 +02:00
Sara Arjona
51b3feb2e9 Merge branch 'MDL-68448-master' of git://github.com/cescobedo/moodle 2020-05-25 10:56:18 +02:00
Adrian Greeve
e1f4258906 Merge branch 'MDL-68629_master' of https://github.com/t-schroeder/moodle 2020-05-25 16:14:54 +08:00
cescobedo
9fa0e253ae MDL-68448 mod_h5pactivity: Add new ws get_h5pactivities_by_courses
This WS is required by the Moodle app in order to fetch
the activity information for displaying it to app users.
2020-05-25 09:12:20 +02:00
Sara Arjona
4955d9279f Merge branch 'MDL-68619-master' of git://github.com/ferranrecio/moodle 2020-05-22 17:49:32 +02:00
Jake Dallimore
3f99406350 Merge branch 'MDL-68143-master' of https://github.com/HuongNV13/moodle 2020-05-22 11:52:31 +08:00
Andrew Nicols
4e9641c2d1 Merge branch 'MDL-57240' of https://github.com/timhunt/moodle 2020-05-22 11:37:38 +08:00
Eloy Lafuente (stronk7)
7a92c63663 Merge branch 'MDL-65306-resourceid-onecommit' of https://github.com/cengage/moodle 2020-05-22 02:15:03 +02:00
David Mudrák
59641dd5a6 MDL-68738 wiki: Prevent URLs inside links from turning into another link
There was a problem with wiki pages in the HTML markup syntax. If they
contain a link and the link text has a URL in it, that URL was converted
into another link. But it was not correctly nested and it caused
additional troubles with filters (particularly the multimedia filter if
the URL was a video such as on youtube).

The solution here is similar to what we do in filters. We protect the
whole explicit link so that its content is not further parsed. That
prevents the inner URL to be converted into another link and the
explicit link has the full control.
2020-05-21 21:12:02 +02:00
Ferran Recio
f3ae94a41d MDL-68619 mod_h5pactivity: add results report webservice 2020-05-21 18:37:54 +02:00
Ferran Recio
42c48b6660 MDL-68619 mod_h5pactivity: add activity check to get_attempt method 2020-05-21 18:37:54 +02:00
Sara Arjona
cca063e229 Merge branch 'MDL-67126_master' of https://github.com/ffhs/moodle 2020-05-21 13:34:59 +02:00
Ferran Recio
87eb65ab44 MDL-68619 mod_h5pactivity: correcting content generator 2020-05-21 12:49:30 +02:00
Sara Arjona
5cc1d953bf Merge branch 'MDL-68451-master' of git://github.com/cescobedo/moodle 2020-05-21 08:30:31 +02:00
Adrian Greeve
aa1dcabf4c Merge branch 'MDL-68733' of https://github.com/timhunt/moodle 2020-05-21 08:37:52 +08:00
cescobedo
887644a1d5 MDL-68451 mod_h5pactivity: Add info attempts in check_updates_since
Add updates information related to attempts in check_updates_since
because they may affect the user or the information displayed
in the app.
2020-05-20 18:50:21 +02:00
Víctor Déniz Falcón
7380c31afe Merge branch 'MDL-67183' of git://github.com/timhunt/moodle 2020-05-20 15:54:14 +01:00
Ferran Recio
c09bc8d897 MDL-68617 mod_h5pactivity: add attempts report webservice 2020-05-20 16:28:45 +02:00
Ferran Recio
2f2cdd2a48 MDL-68617 mod_h5pactivity: add attempt info to generator 2020-05-20 12:09:28 +02:00
Tim Hunt
64207dab65 MDL-67183 questions: get_question & get_behaviour only init if required
This reviews all the code code, and sets $requirequestioninitialised
whenever possible in these calls, which should improve performance.
2020-05-19 20:52:07 +01:00
Víctor Déniz Falcón
676b8b8217 Merge branch 'MDL-68299-master' of git://github.com/bmbrands/moodle 2020-05-19 20:43:46 +01:00
Bas Brands
92bc86e429 MDL-68299 theme_boost: theme updates for accessible zoom
The Moodle UI should be functional in a viewport of 320px by 256px to
meet WCAG 1.4.10

this patch contains improvements to:
-prevent horizontal scrolling
-better wrapping of page header
-message drawer funtional on tiny screens
-remove indenting on courses
-prevent elements overlapping on quiz editing
-better navigation tabs
-fix colour picker
-quiz editing
2020-05-19 10:13:20 +02:00
Eloy Lafuente (stronk7)
4c6a9740f7 Merge branch 'MDL-68656-master' of https://github.com/catalyst/moodle 2020-05-19 01:13:22 +02:00
Tim Hunt
89c8a076b2 MDL-68733 quiz editing: behat test for altering random question tags 2020-05-18 23:20:10 +01:00
Bence Molnar
9024289626 MDL-68733 quiz editing: be more careful deleting random question tags 2020-05-18 22:56:33 +01:00
Tim Hunt
c689726d3f MDL-68733 question behat: question tag generator and use in quiz test 2020-05-18 22:56:33 +01:00
Sara Arjona
149b60f242 Merge branch 'MDL-68450-master' of git://github.com/cescobedo/moodle 2020-05-18 16:16:23 +02:00
Sara Arjona
3f6d31f979 Merge branch 'MDL-68449-master' of git://github.com/cescobedo/moodle 2020-05-18 14:39:10 +02:00
cescobedo
a9ed34a944 MDL-68450 mod_h5pactivity: Add WS view_h5pactivity
This is the external method for triggering the course module viewed event
and update the module completion status. Affects mobile app.
2020-05-18 14:17:46 +02:00
cescobedo
feae09652e MDL-68449 mod_h5pactivity: Add a WS for get access information
This WS should return access information required by an external client to check if and how to display the activity module.
Require for Mobile App
2020-05-18 14:07:59 +02:00
Sara Arjona
20a1852593 Merge branch 'MDL-68253-master' of git://github.com/lucaboesch/moodle 2020-05-18 13:54:34 +02:00
Adrian Perez
c1bce8b4c7 MDL-67126 assign: set completion state for all group members 2020-05-18 12:29:01 +02:00
Andrew Nicols
1feb2a5e2e Merge branch 'MDL-62487' of https://github.com/timhunt/moodle 2020-05-18 12:10:02 +08:00
Adrian Greeve
410cec0d40 Merge branch 'MDL-67791-master' of git://github.com/ferranrecio/moodle 2020-05-18 11:55:36 +08:00
Tim Hunt
89ee18c0e1 MDL-62487 quiz manual grading: implement suggestions from int review
Add privacy provider bits, and tidy code.
2020-05-15 13:48:21 +01:00