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

98142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
2eba6e42a5 Merge branch 'MDL-68825-master' of git://github.com/ferranrecio/moodle 2020-06-04 08:40:18 +08:00
Adrian Greeve
1d7663a341 Merge branch 'MDL-68203-decode-url-quiz-restore-master' of https://github.com/ilya-catalyst/moodle 2020-06-04 08:29:58 +08:00
Sara Arjona
cbe0bb91fd MDL-68905 core_badges: remove issuer details from edit page 
In MDL-68746 issuer details fields were removed from the badges
form, because they are filled from the site settings.
This is a regression because these fields should be removed also
from the edit page.
 2020-06-03 19:38:09 +02:00
Sara Arjona
688ba22d6b Merge branch 'MDL-68871-master' of git://github.com/ferranrecio/moodle 2020-06-03 18:48:01 +02:00
Víctor Déniz Falcón
0e6d73245b Merge branch 'MDL-68904-master' of git://github.com/sarjona/moodle 2020-06-03 16:59:43 +01:00
Sara Arjona
fa1a173302 Merge branch 'MDL-68833-master' of git://github.com/andrewnicols/moodle 2020-06-03 17:57:57 +02:00
Sara Arjona
4106d26354 Merge branch 'MDL-68796-master' of git://github.com/bmbrands/moodle 2020-06-03 14:26:53 +02:00
Sara Arjona
7e05ece1b3 Merge branch 'MDL-68772-master' of https://github.com/Clyxz/moodle 2020-06-03 13:17:32 +02:00
Sara Arjona
881dca064d MDL-68904 core_h5p: order libraries by title 2020-06-03 12:01:59 +02:00
Bas Brands
40d1487bf5 MDL-68761 question_multichoice: show question content inline 2020-06-03 11:02:59 +02:00
Andrew Nicols
84eb0a3e14 MDL-68894 user: Wrap bottom enrol buttons like top 
The div wrapping the enrolment buttons has been updated in MDL-67743 to
use a flexbox grid. It was also updated to add a data- attribute
relating to the participants table id.

The bottom enrol button line should have been updated in the same way.
 2020-06-03 16:53:00 +08:00
Andrew Nicols
0e606192ef MDL-68833 theme_boost: Add missing js tags 2020-06-03 16:33:43 +08:00
Shamim Rezaie
1a4c8e0275 MDL-68076 core: webservice to record feedback actions users take 2020-06-03 17:43:52 +10:00
Shamim Rezaie
3fecf7b547 MDL-68076 core: Introduced \core\notification::cta() 2020-06-03 17:43:52 +10:00
Shamim Rezaie
d21ae8c297 MDL-68076 core: Added bullhorn icon to the core icon map 2020-06-03 17:43:52 +10:00
Shamim Rezaie
2cbe9eaf42 MDL-68076 core: new admin settings related to user feedback 2020-06-03 17:43:52 +10:00
Jun Pataleta
7fcdd9d983 Merge branch 'MDL-68612-master-integration' of git://github.com/mickhawkins/moodle 2020-06-03 15:39:36 +08:00
Sara Arjona
ba2d0b679a Merge branch 'MDL-68320-master' of git://github.com/lameze/moodle 2020-06-03 09:29:00 +02:00
Simey Lameze
ed7cd552f8 MDL-68320 core: add campaign content to notifications page 2020-06-03 14:49:01 +08:00
Andrew Nicols
084c955e49 MDL-68612 user: Set the initial filter on page load 2020-06-03 14:29:22 +08:00
Michael Hawkins
5187e7c515 MDL-68612 core: Behat tests updated to support new participants filter 
Existing tests have been updated, rewritten and/or expanded to support
the new participants filter.
 2020-06-03 14:29:22 +08:00
Michael Hawkins
67bf30a549 MDL-68612 user: Created behat step to set user course lastaccess data 2020-06-03 14:29:22 +08:00
Jun Pataleta
3a2363c063 Merge branch 'MDL-68840-master' of git://github.com/bmbrands/moodle 2020-06-03 14:09:03 +08:00
Jake Dallimore
b556159541 Merge branch 'MDL-68875' of https://github.com/stronk7/moodle 2020-06-03 12:28:51 +08:00
Jake Dallimore
e714288d90 Merge branch 'MDL-68898-master' of git://github.com/bmbrands/moodle 2020-06-03 12:10:38 +08:00
Jake Dallimore
aa52fde8f5 Merge branch 'MDL-68163-master' of https://github.com/syxton/moodle 2020-06-03 12:06:06 +08:00
Bas Brands
355af8f84d MDL-68833 theme_boost: prevent having to call init on the loader 
This was added in a previous master-only issue and breaks backwards compatability with child themes.

There is no need to have the init function here.
 2020-06-03 09:21:48 +08:00
Andrew Nicols
23c60c18ef MDL-68833 theme_boost: Stop overriding popover triggers 
The trigger specified in JS overrides any `data-trigger` in the DOM,
which changed the behaviour of Popovers.
 2020-06-03 09:21:07 +08:00
Andrew Nicols
721c29ff2d MDL-68833 theme_boost: Add ./pending event checks back 2020-06-03 09:17:37 +08:00
Adrian Greeve
6a7a264e01 Merge branch 'MDL-68891-master' of git://github.com/mihailges/moodle 2020-06-03 09:10:32 +08:00
Adrian Greeve
311d28c71b Merge branch 'MDL-68883-master' of git://github.com/andrewnicols/moodle 2020-06-03 08:38:33 +08:00
Andrew Nicols
9777b0fa19 Merge branch 'MDL-68312-master-2' of git://github.com/rezaies/moodle 2020-06-03 08:00:57 +08:00
Victor Deniz Falcon
7e7b329afc Merge branch 'MDL-68578-master' of git://github.com/aanabit/moodle 2020-06-03 00:35:10 +01:00
Ferran Recio
3af22ad962 MDL-68871 mod_h5pactivity: fix webservice get_results return types 2020-06-02 17:23:56 +02:00
Martin Hanusch
398f0ae110 MDL-68772 mod_quiz: Navigation overlay fix 2020-06-02 16:50:02 +02:00
Bas Brands
f31d33c2de MDL-68898 core_contentbank: add link attribute to contentbank items 
- this will reveil the fullname of the item which is useful when
the name is truncated
 2020-06-02 16:20:48 +02:00
Amaia Anabitarte
45bff7f9d6 MDL-68578 contenttype_h5p: Behat test for H5P editor changes 2020-06-02 16:17:22 +02:00
Amaia Anabitarte
6219740b8e MDL-68578 contenttype_h5p: Add name attribute to editor iframe 
The switch_to_class_iframe step needs a name attribute for the iframe.
H5P third party library does not add that name attribute, so we add it.
 2020-06-02 16:17:22 +02:00
Amaia Anabitarte
3149defec1 MDL-68578 contenttype_h5p: Save content title from uploaded H5P file 2020-06-02 16:17:22 +02:00
Eloy Lafuente (stronk7)
de245163e3 MDL-68875 privacy: Keep moodle_content_writer->get_path() the same 
In MDL-62853 a new clean_param(PARAM_PATH) was added to the
moodle_content_writer->get_path() method. And this caused some
Windows tests to start failing.

The problem is that clean_param(PARAM_PATH) does normalise directory
separators to be always forward backslashes and that's normally ok
but the get_path() method has some DIRECTORY_SEPARATOR dependent code
that stopped working under windows.

After analysing various solutions, and trying to keep the behavior
EXACTLY like it was before MDL-62853, but with the cleaning included
we have applied 2 changes:

b) Move the clean_param() to later within the array_map() function,
that way the code there, that uses DIRECTORY_SEPARATOR will continue
working the same.

b) As far as there are more DIRECTORY_SEPARATOR dependent code later
in the function, also perform a str_replace() to convert back to the
OS directory separator.

Those 2 points together (a and b) make the behavior to be 100% the
original one, with separators being kept and the paths being cleaned.

This solution corresponds 100% with the proposed fixes named 3) and
4) in the issue.

Final note... all that DIRECTORY_SEPARATOR maybe needs a review because
it really shouldn't be used unless strictly needed. But that falls out
from this issue which goal was to keep things safely working like they
were before the regression (but with the cleaning applied).
 2020-06-02 15:53:40 +02:00
Matt Davidson
887679e510 MDL-68163 gradebook: add grade item duplication 2020-06-02 09:28:29 -04:00
Sara Arjona
111b293f61 weekly release 3.9dev+ 2020-06-02 13:03:08 +02:00
Sara Arjona
a7f6a60ae4 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2020-06-02 13:03:05 +02:00
Ferran Recio
3db7a65e15 MDL-68825 theme_boost: fixing recently accessed items block icons 2020-06-02 12:22:15 +02:00
Ferran Recio
90d8fe1532 MDL-68825 mod_h5pactivity: fixing svg icon size 2020-06-02 12:22:15 +02:00
Bas Brands
94fd778dbf MDL-68840 mod_quiz: random question in question list css fix 2020-06-02 10:54:54 +02:00
Mihail Geshoski
5c9c1534a1 MDL-68891 theme_boost: Fix go to top link position on horizontal scroll 2020-06-02 16:45:46 +08:00
Andrew Nicols
2ba031f0d6 MDL-68793 core_table: Version bump for renamed WS 2020-06-02 11:57:40 +08:00
Andrew Nicols
b2caa508b0 Merge branch 'MDL-68793-master' of git://github.com/lameze/moodle 2020-06-02 11:56:31 +08:00
Simey Lameze
1179f07d3c MDL-68793 core_table: fix WS name to comply with guidelines 2020-06-02 11:49:04 +08:00