mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
97,660 Commits 36 Branches 519 Tags
Commit Graph

97660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
AMOS bot
7984b52ae9 Automatically generated installer lang files 2020-05-21 00:07:15 +00: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