mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-28 19:42:56 +01:00
Code Issues Projects Releases Wiki Activity
98,315 Commits 36 Branches 527 Tags
Commit Graph

22056 Commits

Author SHA1 Message Date
cescobedo
00ae91688d MDL-68930 mod_h5pactivity: Check submit cap when tracking is enabled 2020-06-05 17:08:47 +02:00
Ferran Recio
2bdd6b120c MDL-68918 mod_h5pactivity: add context to get_h5pactivities_by_courses 2020-06-05 14:27:38 +02:00
Sara Arjona
d85980fd85 NOBUG: Fixed SVG browser compatibility 2020-06-05 13:24:10 +02:00
Adrian Greeve
be812a064b Merge branch 'MDL-68826-master' of git://github.com/ferranrecio/moodle 2020-06-05 15:24:26 +08:00
Helen Foster
98c882132d MDL-68888 lang: Import fixed English strings (en_fix) 
Significant string changes: userdata, userdata_help, keptroles,
keptroles_help in core_backup - Clearer wording about how the settings
work.
 2020-06-05 08:33:55 +02:00
Ferran Recio
dd75c98889 MDL-68826 mod_h5pactivity: fix content bank link 2020-06-05 08:31:00 +02:00
Adrian Greeve
ac69c0eb96 Merge branch 'MDL-68826-master' of git://github.com/ferranrecio/moodle 2020-06-05 13:35:03 +08:00
Jun Pataleta
618b13e1f5 Merge branch 'MDL-67883-squash' of https://github.com/Chocolate-lightning/moodle 2020-06-05 11:52:36 +08:00
Mathew May
16d77f1884 MDL-67883 core: Make core ready for MoodleNet. 2020-06-05 11:47:42 +08:00
Ferran Recio
7f6026323d MDL-68826 mod_h5pactivity: content bank message in form 2020-06-04 18:41:05 +02:00
Jake Dallimore
aa40de942a Merge branch 'MDL-68800-lti-gbs-patch-fixes' of https://github.com/cengage/moodle 2020-06-04 14:55:58 +08:00
Andrew Nicols
2eba6e42a5 Merge branch 'MDL-68825-master' of git://github.com/ferranrecio/moodle 2020-06-04 08:40:18 +08:00
Sara Arjona
688ba22d6b Merge branch 'MDL-68871-master' of git://github.com/ferranrecio/moodle 2020-06-03 18:48:01 +02:00
Sara Arjona
7e05ece1b3 Merge branch 'MDL-68772-master' of https://github.com/Clyxz/moodle 2020-06-03 13:17:32 +02:00
Ferran Recio
3af22ad962 MDL-68871 mod_h5pactivity: fix webservice get_results return types 2020-06-02 17:23:56 +02:00
Martin Hanusch
398f0ae110 MDL-68772 mod_quiz: Navigation overlay fix 2020-06-02 16:50:02 +02:00
Ferran Recio
90d8fe1532 MDL-68825 mod_h5pactivity: fixing svg icon size 2020-06-02 12:22:15 +02:00
Bas Brands
94fd778dbf MDL-68840 mod_quiz: random question in question list css fix 2020-06-02 10:54:54 +02:00
Claude Vervoort
c93c711ab0 MDL-68800 mod_lti: create gbs only for restored activity 2020-05-29 17:46:07 -04:00
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
Claude Vervoort
4801550180 MDL-68800 mod_lti: fix domain matching launches for 1.3 2020-05-26 16:35:16 -04: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
Claude Vervoort
6f85c23d7f MDL-68800 mod_lti: apply format fixes per guidelines 2020-05-26 10:49:50 -04: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