mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 15:32:43 +02:00
Code Issues Projects Releases Wiki Activity
88,126 Commits 36 Branches 528 Tags
Commit Graph

88126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dinhloc
f4695ec722 MDL-61033 quiz: Editing a quiz while a preview is open 
Editing a quiz while a preview is open in another browser tab can leads to a cryptic error that is hard to recover from
 2018-03-27 10:47:32 +07:00
Eloy Lafuente (stronk7)
a15c745936 weekly release 3.5dev 2018-03-22 16:57:05 +01:00
Eloy Lafuente (stronk7)
eae3d88bc9 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-03-22 16:57:02 +01:00
Jun Pataleta
fa54a1a7e2 Merge branch 'MDL-61678' of git://github.com/stronk7/moodle 2018-03-22 12:33:24 +08:00
Jake Dallimore
a44987a081 Merge branch 'MDL-58179-master-fix' of https://github.com/andrewnicols/moodle 2018-03-22 12:05:29 +08:00
Andrew Nicols
195480e9d7 MDL-58179 mod_lesson: Add missing : in labels 2018-03-22 11:59:52 +08:00
Andrew Nicols
532ecef010 Merge branch 'MDL-61530-master' of git://github.com/andrewnicols/moodle 2018-03-22 11:49:09 +08:00
Renaat Debleu
e44e67d725 MDL-61530 mod_glossary: import_entries.feature needs @_file_upload tag 2018-03-22 11:44:36 +08:00
Jun Pataleta
a9d98d5029 Merge branch 'MDL-52989-master' of git://github.com/junpataleta/moodle 2018-03-22 11:29:56 +08:00
Jun Pataleta
9ce10f2f2f MDL-52989 mod_lesson: Fix typo in feature description 2018-03-22 11:27:24 +08:00
Jun Pataleta
edf88a3bb3 Merge branch 'MDL-61514-master' of git://github.com/rezaies/moodle 2018-03-22 10:52:53 +08:00
Shamim Rezaie
3b5ae9777d MDL-61514 Quiz: Fix restore error 
Include mod/quiz/locallib.php to fix the restore error.
 2018-03-22 09:57:35 +11:00
Eloy Lafuente (stronk7)
820a91def3 Merge branch 'MDL-61658-master-allcountrycodes' of git://github.com/mudrd8mz/moodle 2018-03-21 19:36:36 +01:00
David Mudrák
0c98acefc1 MDL-61658 user: Fix displaying of user's country name 
In these cases we want to use the method get_list_of_countries() to
obtain translated names of all potential country codes. The country code
is already there in the database. So it does not matter if the country
is among those whitelisted in $CFG->allcountrycodes - we want to see its
name anyway.
 2018-03-21 18:17:47 +01:00
David Mudrák
60e213470d MDL-61658 user: Fix parsing of the agedigitalconsentmap setting 
When parsing and validating the value of the Digital age of consent
(agedigitalconsentmap) field, we want to load all country codes. Not
just the ones whitelisted for drop down menus that users can choose
from.
 2018-03-21 18:17:47 +01:00
Eloy Lafuente (stronk7)
f6bafa922c MDL-61410 question: Check we have tags to set to avoid notices 2018-03-21 14:55:39 +01:00
Jake Dallimore
9a2bf09d19 Merge branch 'MDL-59434-master' of https://github.com/sammarshallou/moodle 2018-03-21 10:00:47 +08:00
Andrew Nicols
618b223302 Merge branch 'MDL-61519-master' of https://github.com/andrewnicols/moodle 2018-03-21 09:09:03 +08:00
Andrew Nicols
b30b66c57e MDL-61519 coursecat: Reset the coursecat cache on enrolment 2018-03-21 09:06:51 +08:00
Andrew Nicols
c06c1a4428 Merge branch 'MDL-61519-master' of https://github.com/MartinGauk/moodle 2018-03-21 08:14:41 +08:00
AMOS bot
fd6078b7eb Automatically generated installer lang files 2018-03-21 00:05:59 +00:00
Eloy Lafuente (stronk7)
bb0ca2c4a3 Merge branch 'MDL-61605' of https://github.com/timhunt/moodle 2018-03-21 00:24:46 +01:00
Eloy Lafuente (stronk7)
4dca6ab54d Merge branch 'MDL-61589-master' of git://github.com/rezaies/moodle 2018-03-21 00:21:24 +01:00
Eloy Lafuente (stronk7)
9a79102a4c Merge branch 'MDL-61410-master' of git://github.com/lameze/moodle 2018-03-20 23:53:28 +01:00
Martin Gauk
ef780a0051 MDL-61519 coursecat: do not cache get_all_children_ids 2018-03-20 13:20:04 +00:00
sam marshall
fc440796e9 MDL-59434 core_search: Alternate result orders including by context 
Implements a mechanism by which search engines can provide different
result orderings, and implements a 'by location' ordering within the
Solr search engine (available whenever the user starts their search
from within a course or activity).
 2018-03-20 12:15:25 +00:00
Eloy Lafuente (stronk7)
f61c5f8a95 Merge branch 'MDL-61615-master' of git://github.com/rezaies/moodle 2018-03-20 10:20:11 +01:00
Shamim Rezaie
ae9f5a04b1 MDL-61615 Questions: Only move question categories if there is any 2018-03-20 17:30:21 +11:00
Andrew Nicols
2624bb10e2 Merge branch 'master_MDL-58080' of https://github.com/danmarsden/moodle 2018-03-20 14:08:16 +08:00
Andrew Nicols
3f6ede91aa Merge branch 'MDL-61519-master' of https://github.com/MartinGauk/moodle 2018-03-20 13:53:36 +08:00
Andrew Nicols
f78a8a52a5 Merge branch 'MDL-58179-master' of https://github.com/lucaboesch/moodle 2018-03-20 13:38:59 +08:00
Eloy Lafuente (stronk7)
b7614ab114 Merge branch 'MDL-61597-master' of git://github.com/andrewnicols/moodle 2018-03-20 02:25:11 +01:00
AMOS bot
4f7bacba82 Automatically generated installer lang files 2018-03-20 00:05:59 +00:00
AMOS bot
bef37b42dc Automatically generated installer lang files 2018-03-20 00:05:58 +00:00
Eloy Lafuente (stronk7)
b2d941c16f Merge branch 'MDL-61529-master' of https://github.com/bmbrands/moodle 2018-03-20 00:27:48 +01:00
Luca Bösch
d6076942e3 MDL-58179 lesson: Avoid using span with class "label" 2018-03-19 21:13:11 +01:00
Eloy Lafuente (stronk7)
0fe1ed29d9 Merge branch 'MDL-61615-master' of git://github.com/rezaies/moodle 2018-03-19 11:21:48 +01:00
Simey Lameze
bbd655b4a8 MDL-61410 question: merge course and question tags 2018-03-19 11:45:55 +08:00
Simey Lameze
1796eb181b MDL-61410 question: fix unit tests failures 2018-03-19 11:45:55 +08:00
Simey Lameze
13596866e7 MDL-61410 question: support course tags on import 2018-03-19 11:45:55 +08:00
Simey Lameze
2ee6e02e21 MDL-61410 question: unit tests for question_sort_tags 2018-03-19 11:45:55 +08:00
Simey Lameze
3bf5fcf277 MDL-61410 question: change logic on xml format 2018-03-19 11:45:55 +08:00
Simey Lameze
6307622b28 MDL-61410 question: move tag sorting logic to a new function 2018-03-19 11:45:55 +08:00
Simey Lameze
3a7005c964 MDL-61410 question: support course tags on export 2018-03-19 11:45:55 +08:00
Andrew Nicols
24f5828309 Merge branch 'MDL-61265-master' of git://github.com/sarjona/moodle 2018-03-19 10:51:27 +08:00
Andrew Nicols
89b8efb09b Merge branch 'MDL-58179-master' of https://github.com/lucaboesch/moodle 2018-03-19 10:22:14 +08:00
Andrew Nicols
db98868d22 Merge branch 'MDL-61154_master' of git://github.com/dmonllao/moodle 2018-03-19 10:09:29 +08:00
Andrew Nicols
d7a6e531ee Merge branch 'MDL-61514-master' of git://github.com/rezaies/moodle 2018-03-19 09:01:19 +08:00
Eloy Lafuente (stronk7)
20f808165b MDL-61678 phpunit: Bump to current / latest 6.5.x before major release 2018-03-18 23:40:02 +01:00
Tim Hunt
d9b80a5e69 MDL-61605 quiz report: add missing index/key 
Thanks to Patryk Szuta for the suggestion
 2018-03-18 20:40:43 +00:00