mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity
97,632 Commits 36 Branches 519 Tags
Commit Graph

97632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
c225a42c19 Merge branch 'MDL-67700-master' of git://github.com/ferranrecio/moodle 2020-05-22 10:51:31 +08:00
Jake Dallimore
77dddebdb9 Merge branch 'MDL-58645-master' of https://github.com/HuongNV13/moodle 2020-05-22 10:35:27 +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
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
Huong Nguyen
51de017235 MDL-68439 qtype_ddwtos: UI issues 
- Fixed cursor for dropped ddwtos
 - Fixed the animation of "flying back to the home position" starts off at the right end of the previous line"
 2020-05-21 17:19:40 +07:00
Jun Pataleta
7750dd55e8 Merge branch 'MDL-68367' of https://github.com/mkassaei/moodle 2020-05-21 17:10:16 +08:00
Mahmoud Kassaei
00055ef6ab MDL-68367 Question: Multi-choice Option to hide systemtext 2020-05-21 09:47:15 +01:00
Sara Arjona
5cc1d953bf Merge branch 'MDL-68451-master' of git://github.com/cescobedo/moodle 2020-05-21 08:30:31 +02:00
Jun Pataleta
7b66f81b90 Merge branch 'MDL-68568-master' of git://github.com/junpataleta/moodle 2020-05-21 14:26:54 +08:00
Sara Arjona
e4426b3aff Merge branch 'MDL-68782-master' of git://github.com/aanabit/moodle 2020-05-21 08:23:46 +02:00
Adrian Greeve
aa1dcabf4c Merge branch 'MDL-68733' of https://github.com/timhunt/moodle 2020-05-21 08:37:52 +08:00
Eloy Lafuente (stronk7)
a5a8ca5e62 Merge branch 'MDL-52578-master' of git://github.com/junpataleta/moodle 2020-05-21 00:51:10 +02:00
Eloy Lafuente (stronk7)
7ce7d21503 Merge branch 'MDL-66992-master' of https://github.com/tungthai/moodle 2020-05-21 00:48:30 +02:00
Amaia Anabitarte
8675e8ae6a MDL-68782 core_contentbank: Improving event unit tests 2020-05-20 22:37:30 +02: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
Jun Pataleta
01c8c667fc MDL-68568 editor_atto: Upgrade step for the new toolbar default layout 
* emojipicker added to files
* indent moved to list
 2020-05-21 00:39:00 +08:00
Mike Churchward
b677d33d62 MDL-68568 editor-atto: Move 'indent' next to 'lists' by default. 2020-05-21 00:10:37 +08: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
Sara Arjona
3cc0bab8ab Merge branch 'MDL-68617-master' of git://github.com/ferranrecio/moodle 2020-05-20 16:32:36 +02:00
Ferran Recio
c09bc8d897 MDL-68617 mod_h5pactivity: add attempts report webservice 2020-05-20 16:28:45 +02:00
Bas Brands
e695d9d0b6 MDL-68493 core_contentbank: implement list view 2020-05-20 16:27:58 +02:00
Sara Arjona
041afbeab5 Merge branch 'MDL-68780' of https://github.com/stronk7/moodle 2020-05-20 12:58:37 +02:00
Amaia Anabitarte
7a460fd5d5 MDL-68782 core_contentbank: Fixing undefined variable error 2020-05-20 12:42:44 +02:00
Ferran Recio
2f2cdd2a48 MDL-68617 mod_h5pactivity: add attempt info to generator 2020-05-20 12:09:28 +02:00
Sara Arjona
69d5a63b97 Merge branch 'MDL-68778-master' of git://github.com/andrewnicols/moodle 2020-05-20 11:47:27 +02:00
Jun Pataleta
a7431ec3f1 Merge branch 'MDL-58866-master-2' of git://github.com/marinaglancy/moodle 2020-05-20 17:35:08 +08:00
Eloy Lafuente (stronk7)
5b188629c7 MDL-68780 unit tests: Add missing ->destroy() calls to controllers 
Every backup and restore controller always need to call
to their ->destroy() method in charge of finalizing loggers,
closing file handlers and destroy some circular references.

This is specially important within unit tests, because
open resources cannot be reset between tests, causing problems,
specially within Windows that locks all those files.
 2020-05-20 11:02:00 +02:00
Adrian Greeve
56287073d5 Merge branch 'MDL-68662' of https://github.com/Chocolate-lightning/moodle 2020-05-20 16:52:17 +08:00
Andrew Nicols
a6adce6b9b Merge branch 'MDL-68577-redis-lock-tuning' of https://github.com/brendanheywood/moodle 2020-05-20 16:50:37 +08:00
Marina Glancy
185a00c874 MDL-58866 core_calendar: deprecation warning in upgrade.txt 2020-05-20 10:38:12 +02:00
Mathew May
e146a2ca74 MDL-68662 core_course: Add new tabs to the chooser 
We now have two more tabs in the chooser.
Activities & Resources aer now offered in different tabs.
 2020-05-20 15:53:06 +08:00
Andrew Nicols
fb4f19af80 MDL-68778 user: Add bulk action pendingjs checks 2020-05-20 15:45:24 +08:00
Brendan Heywood
8eab4f77cc MDL-68577 session: Fine tune the redis lock polling 2020-05-20 15:54:10 +10:00
Adrian Greeve
1c1fd15b18 Merge branch 'MDL-68333-master' of git://github.com/marinaglancy/moodle 2020-05-20 13:17:58 +08:00
Andrew Nicols
db5be3a31c MDL-68778 user: Fetch select from selected option 
It seems that the HTMLSelectElement behaves slightly different on Linux
vs MacOS.

On Linux with Firefox 47 when selecting an option the
HTMLOptionElement is returned, whereas on MavOS the HTMLSelectElement
that the Option belongs to is returned.

We need to normalise the value here before resetting the currently
selected item.
 2020-05-20 13:17:50 +08:00
Nathan Nguyen
a9c139c8d4 MDL-39571 repository_recent: query improvement 2020-05-20 13:11:51 +10:00
Nathan Nguyen
1529fc7954 MDL-39571 repository_recent: add unit test 2020-05-20 12:48:17 +10:00
Jun Pataleta
3728866a5f MDL-52578 core_course: Peer review fixes 
* Fetch parent category only when necessary.
* Fix outdated variable names in original patch.
* Fix variable scope for $outcomeexists.
 2020-05-20 10:29:46 +08:00
Adrian Greeve
59d0090fda Merge branch 'MDL-67548-master' of https://github.com/kabalin/moodle 2020-05-20 08:35:18 +08:00
Andrew Nicols
6754ceae3a MDL-68464 user: Remove legacy selectall 2020-05-20 07:38:26 +08:00
Eloy Lafuente (stronk7)
31ffacb020 Merge branch 'MDL-68464-master-final' of git://github.com/andrewnicols/moodle 2020-05-20 00:17:53 +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