mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 01:20:27 +01:00
Code Issues Projects Releases Wiki Activity
94,266 Commits 36 Branches 527 Tags
Commit Graph

94266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Dallimore
400eb6af80 Merge branch 'MDL-60405-master' of git://github.com/peterRd/moodle 2019-07-17 13:11:43 +08:00
Andrew Nicols
8958115663 Merge branch 'MDL-65538-master' of git://github.com/sarjona/moodle 2019-07-17 10:55:43 +08:00
Andrew Nicols
4f320d1d7f Merge branch 'MDL-65762-master' of git://github.com/abgreeve/moodle 2019-07-17 10:34:20 +08:00
Andrew Nicols
e68e7280c4 Merge branch 'MDL-65928-master-2' of git://github.com/junpataleta/moodle 2019-07-17 10:21:37 +08:00
Andrew Nicols
bd056d1e4b Merge branch 'MDL-65750-master' of git://github.com/lameze/moodle 2019-07-17 10:10:52 +08:00
Jun Pataleta
ea382408ce MDL-65928 mod_choice: Use correct options attribute 
* Should be 'classes', not 'class'.
 2019-07-17 09:54:03 +08:00
Andrew Nicols
e8136fe3ca Merge branch 'MDL-65357-master' of git://github.com/bmbrands/moodle 2019-07-17 09:39:58 +08:00
Andrew Nicols
4165860739 Merge branch 'MDL-65769-master' of git://github.com/lameze/moodle 2019-07-17 09:30:43 +08:00
Andrew Nicols
4de3b06d4b Merge branch 'MDL-65763-master' of git://github.com/mihailges/moodle 2019-07-17 09:21:33 +08:00
Jake Dallimore
fa2d9e57dc Merge branch 'MDL-60013-master-fix' of git://github.com/andrewnicols/moodle 2019-07-17 09:12:57 +08:00
Andrew Nicols
8f3f25e21a MDL-60013 report_progress: Stop using deprecated modal type 2019-07-17 08:26:27 +08:00
Eloy Lafuente (stronk7)
c010001b90 Merge branch 'MDL-66032-master_awarded_badges_criteria' of https://github.com/andrewmadden/moodle 2019-07-17 01:31:46 +02:00
Eloy Lafuente (stronk7)
23e357f1a0 Merge branch 'MDL-65908-master' of git://github.com/peterRd/moodle 2019-07-17 01:04:33 +02:00
Eloy Lafuente (stronk7)
d764acc2cf Merge branch 'MDL-65555-Master' of https://github.com/tuanngocnguyen/moodle 2019-07-16 12:34:23 +02:00
Eloy Lafuente (stronk7)
62f4e8b60b Merge branch 'MDL-65761' of git://github.com/Chocolate-lightning/moodle 2019-07-16 12:27:43 +02:00
Eloy Lafuente (stronk7)
415ce83bcb Merge branch 'MDL-65744' of git://github.com/Chocolate-lightning/moodle 2019-07-16 11:20:58 +02:00
Mathew May
f305ffc933 MDL-65744 lib: Modify minify test to check properly 2019-07-16 17:06:06 +08:00
Mathew May
ad4d9cf745 MDL-65744 lib: Modify minify test to check properly 2019-07-16 17:05:33 +08:00
Mathew May
b4e39ff24e MDL-65744 lib: Update minify pathconverter lib 2019-07-16 17:05:33 +08:00
Mathew May
0918e156a0 MDL-65744 lib: Update minify minify lib 2019-07-16 17:05:33 +08:00
Andrew Nicols
e752e12971 Merge branch 'MDL-65954-master' of git://github.com/junpataleta/moodle 2019-07-16 15:13:41 +08:00
Andrew Nicols
c8898e74a1 Merge branch 'MDL-65794_master' of git://github.com/markn86/moodle 2019-07-16 14:26:55 +08:00
Mark Nelson
e81107fa25 MDL-65794 core: use themerev as the cache key when getting font icons 2019-07-16 14:23:34 +08:00
Mark Nelson
76669f0f51 MDL-65794 core: use langrev as the cache key when getting strings 2019-07-16 14:23:34 +08:00
Mark Nelson
f88e607429 MDL-65794 core: make langrev available in JS 2019-07-16 14:23:34 +08:00
Mark Nelson
3f7360f07d MDL-65794 core: use themerev as the cache key when getting templates 2019-07-16 14:23:34 +08:00
Mark Nelson
6a1ad7c677 MDL-65794 core: allow ajax calls to specify a cache key 
This allows for better caching capabilities on servers. If a
cache key is passed and the web service call does not require
the user to be logged in we will attempt to use GET for the
request. This allows for things like proxy caching on URLs.
The cache key must be changed if we do not want to retrieve
what has been cached and want to perform the request again.
 2019-07-16 14:23:34 +08:00
Andrew Nicols
ce4e052209 Merge branch 'MDL-60013-master' of git://github.com/junpataleta/moodle 2019-07-16 14:21:18 +08:00
Andrew Nicols
94d9aeade7 Merge branch 'MDL-65744' of git://github.com/Chocolate-lightning/moodle 2019-07-16 12:57:24 +08:00
Andrew Nicols
d42df9f5a7 Merge branch 'master_MDL-65517' of https://github.com/yao9394/moodle 2019-07-16 11:50:58 +08:00
Andrew Nicols
417e334b91 Merge branch 'MDL-65409-master' of git://github.com/mihailges/moodle 2019-07-16 11:35:23 +08:00
Jake Dallimore
e83765bcf1 Merge branch 'MDL-66158-master' of git://github.com/andrewnicols/moodle 2019-07-16 10:30:52 +08:00
Andrew Nicols
444f85aaa9 MDL-66158 calendar: Events should be space separated not an array 2019-07-16 09:46:02 +08:00
Mathew May
d7b43fd9cf MDL-65761 lib: Update scssphp to 1.0.2 2019-07-16 09:29:37 +08:00
Mathew May
f619e305a0 MDL-65761 lib: Update scssphp to 1.0.0 2019-07-16 09:16:44 +08:00
Nathan Nguyen
a81f5d0b1a MDL-65555 mod_lesson: fix group override backup and restore 2019-07-16 11:16:03 +10:00
Nathan Nguyen
4d3bc85866 MDL-65555 mod_quiz: fix group override backup and restore 2019-07-16 11:16:03 +10:00
Mathew May
358d571156 MDL-65761 lib: Update scssphp to 0.8.3 2019-07-16 09:15:21 +08:00
Andrew Madden
7599223a1c MDL-66032 badges: Prevent empty awarded badges criteria being created. 
When creating or editing the awarded badges criteria, the select element should be
required to prevent empty criteria from being created. In addition, if there are
already badges created with the empty criteria, there should be not be an exception
thrown when assessing whether the criteria has been completed.
 2019-07-16 09:31:25 +10:00
Andrew Nicols
a21f471e12 Merge branch 'MDL-65928-master-2' of git://github.com/junpataleta/moodle 2019-07-16 07:18:17 +08:00
Eloy Lafuente (stronk7)
c4e14e535e Merge branch 'MDL-62836-master' of git://github.com/sarjona/moodle 2019-07-15 23:56:39 +02:00
Sara Arjona
3e8f9b2869 MDL-65538 competency: fix behat errors with firefox 
There is a random behat error when executing the "Go to the competency
course competencies page." scenario: "Moodle exception: A required parameter
(courseid) was missing More information about this error".
It happens because sometimes the form is sent before the JS and it hasn't
the needed parameters defined. So they have been added as hidden to the
form to avoid the error (which I couldn't reproduce manually).
 2019-07-15 13:48:56 +02:00
Eloy Lafuente (stronk7)
e9514b4df9 Merge branch 'MDL-58026-master' of https://github.com/MartinGauk/moodle 2019-07-15 13:38:44 +02:00
David Monllaó
2ffdcd78d3 MDL-66026 analytics: No notification if not necessary 2019-07-15 14:24:21 +08:00
Jun Pataleta
c5681f7ff1 MDL-60013 amd: Final removal of core/modal_confirm 2019-07-15 13:37:01 +08:00
Jun Pataleta
b3f4d77e00 MDL-65954 dataformat_pdf: Convert object records to array 
* count() doesn't work quite as expected when the record being written
to the PDF is an object. So make sure to convert the record to an array.
* In addition, instead of comparing the total vs the current cell
counter, it would be more reliable to determine whether we're at the
last element of the array by getting the key for the last element and
comparing it with the key for the element that's currently being
processed.
 2019-07-15 10:29:59 +08:00
Peter
e35cc9fea9 MDL-65908 mod_assign: Remove scroll repositioning. 
Absolute positioned elements do not require repositioning on scroll as long as
their immediate parent is relatively positioned.
 2019-07-15 08:35:58 +08:00
Silvia Pinheiro
ae1556ad93 MDL-62836 badges: Add behat test for the new group selector 2019-07-12 18:13:37 +02:00
Silvia Pinheiro
b1e63fc7e2 MDL-62836 badges: Potential badge recipients by group 
This affects the case when a badge is setup with the criteria "manual issue by role".
The non-editing teacher can see all participants of the course, when awarding a badge, even with SEPARATE GROUPS mode enabled.
With this change, when the non-editing teacher chooses a group, and searches for a user, the results are filtered for that group.
The same happens for "Existing badge recipients by group" when revoking a badge.
 2019-07-12 18:13:37 +02:00
Jun Pataleta
622d83d7bc MDL-65928 mod_choice: Use proper string for 'select/deselect all' labels 
* Because string concatenation is bad!
 2019-07-12 16:33:35 +08:00