moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
97803 commits 37 branches 540 tags 1.3 GiB
Commit graph

97803 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Hawkins
4157e2d4f3 MDL-68348 lib: Added create_user_course_lastaccess generator 
This creates a last access record for a user within a course.
It is requires for testing accesssince participants filtering.
 2020-05-25 18:10:53 +08:00
Michael Hawkins
25d5be444f MDL-68348 user: User filter match types support - filterset and roles 2020-05-25 18:10:53 +08:00
Michael Hawkins
3f069a2c48 MDL-68348 lib: Default filters to match ALL for backwards compatibility 
Temporarily defaulting filtersets and their filters to join type ALL
for backwards compatibility, so the existing participants unified
filter continues to function consistently. This will be reverted once
the new participants filter UI replaces the existing unified filter.
 2020-05-25 18:10:53 +08:00
Sara Arjona
71dbe42c64 Merge branch 'MDL-68248-master' of https://github.com/DinhHien0307/moodle 2020-05-25 11:59:24 +02:00
Nick Phillips
7a2baafc96 MDL-68103 theme_classic: hidden-print => d-print-none for BS4. 2020-05-25 11:40:14 +02:00
Sara Arjona
9073ed9355 Merge branch 'MDL-68448-master-fix' of github.com:sarjona/moodle 2020-05-25 11:37:41 +02: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
Jake Dallimore
33294da864 Merge branch 'MDL-62853' of https://github.com/paulholden/moodle 2020-05-25 16:11:55 +08:00
Andrew Nicols
d3503c76b4 Merge branch 'MDL-68658' of https://github.com/stronk7/moodle 2020-05-25 15:23:37 +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
cescobedo
14b463c92a MDL-68448 core_h5p: Add get export information to helper 
Create a new method in the helper to use in the player,
in the external WS and in the API. Also, add a
new method in API to help to get export information
by other WS.
 2020-05-25 09:12:06 +02:00
Adrian Greeve
d602189874 Merge branch 'MDL-63812' of https://github.com/timhunt/moodle 2020-05-25 14:40:14 +08:00
Jake Dallimore
4404ced7f7 Merge branch 'MDL-68567-master' of git://github.com/sarjona/moodle 2020-05-25 11:36:48 +08:00
Luca Bösch
937c7e5f0c MDL-68819 core_contentbank: "Upload" button is not localized. 2020-05-24 21:52:43 +02:00
Sara Arjona
968016a38d Merge branch 'MDL-68592-master' of https://github.com/kabalin/moodle 2020-05-22 17:55:23 +02:00
Sara Arjona
4955d9279f Merge branch 'MDL-68619-master' of git://github.com/ferranrecio/moodle 2020-05-22 17:49:32 +02:00
Eloy Lafuente (stronk7)
200570558d MDL-68658 phpunit: Ensure that the configured proxy is applied always 
Previously, if the RSS feed (extests) was being served locally,
CFG->proxybypass was applied and causing the test to fail (proxy
ignored).

In that exact test we need the configured proxy to be applied
always, because the test is exaclty about detecting the problem
when a wrong proxy is used.
 2020-05-22 17:07:05 +02:00
Pau Ferrer Ocaña
9afc6b78c3 MDL-68789 behat: Adapt login step to new app version 2020-05-22 16:17:29 +02:00
Victor Deniz Falcon
71965a8572 weekly release 3.9dev+ 2020-05-22 14:21:37 +01:00
Victor Deniz Falcon
bbd1b742ef Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2020-05-22 14:21:32 +01:00
Jake Dallimore
0facda5eaa Merge branch 'MDL-68367-master-fix' of git://github.com/junpataleta/moodle 2020-05-22 15:10:04 +08:00
Sara Arjona
a80541ea90 MDL-68567 badges: add/remove site backpacks 2020-05-22 09:01:59 +02:00
Jun Pataleta
20a660f864 MDL-68367 qtype_multichoice: Decrease minimum expected export file size 
* Exporting via Oracle trims trailing zeroes in floating numbers which
results to a smaller file size for the exported file. Better to reduce
the minimum expected export file size from 4000 bytes to 3900 bytes.
 2020-05-22 14:45:05 +08:00
Andrew Nicols
cc29e04f27 Merge branch '68137-master-prevent-removing-all-dots-in-filename' of https://github.com/DSI-Universite-Rennes2/moodle 2020-05-22 11:53:22 +08:00
Jake Dallimore
3f99406350 Merge branch 'MDL-68143-master' of https://github.com/HuongNV13/moodle 2020-05-22 11:52:31 +08:00
Jun Pataleta
87decf6e00 Merge branch 'MDL-65796' of https://github.com/paulholden/moodle 2020-05-22 11:50:53 +08:00
Andrew Nicols
4e9641c2d1 Merge branch 'MDL-57240' of https://github.com/timhunt/moodle 2020-05-22 11:37:38 +08:00
Andrew Nicols
a15175eab4 Merge branch 'MDL-68446' of https://github.com/timhunt/moodle 2020-05-22 11:32:01 +08:00
Andrew Nicols
6c0ffdd7ff Merge branch 'MDL-68783-master' of git://github.com/junpataleta/moodle 2020-05-22 11:21:47 +08:00
Andrew Nicols
e1657e3c07 Merge branch 'MDL-68661-rebase' of https://github.com/Chocolate-lightning/moodle 2020-05-22 11:12:46 +08:00
Jun Pataleta
929bb27c21 Merge branch 'MDL-68508-master' of git://github.com/andrewnicols/moodle 2020-05-22 11:06:16 +08:00
Andrew Nicols
c225a42c19 Merge branch 'MDL-67700-master' of git://github.com/ferranrecio/moodle 2020-05-22 10:51:31 +08:00
Andrew Nicols
a31a2b6d54 MDL-68508 core_table: Improve sorting to support sorting by multiple columns 2020-05-22 10:42:30 +08:00
Jake Dallimore
77dddebdb9 Merge branch 'MDL-58645-master' of https://github.com/HuongNV13/moodle 2020-05-22 10:35:27 +08:00
Mathew May
7f86455237 MDL-68661 core_lang: Roll back addresourceoractivity 2020-05-22 10:02:57 +08:00
Andrew Nicols
cd08d856c6 MDL-68493 contentbank: Whitespace fixes 2020-05-22 09:21:21 +08:00
Andrew Nicols
ae2e417a19 Merge branch 'MDL-68493-master' of git://github.com/bmbrands/moodle 2020-05-22 09:04:57 +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
Victor Deniz Falcon
57c40bd964 Merge branch 'MDL-39571-Master' of git://github.com/tuanngocnguyen/moodle 2020-05-21 22:28:32 +01: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
Sara Arjona
e50e6d39ce Merge branch 'master_MDL-67497' of https://github.com/danmarsden/moodle 2020-05-21 19:00:26 +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
Ferran Recio
778846987a MDL-67700 message: prevent async loading conversation message mix 2020-05-21 18:02:42 +02:00
Sara Arjona
48127bfec6 Merge branch 'MDL-66471' of https://github.com/paulholden/moodle 2020-05-21 17:33:12 +02:00
Andrew Nicols
f2d33fcc11 Merge branch 'MDL-68439-master' of https://github.com/HuongNV13/moodle 2020-05-21 20:30:13 +08: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