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

97811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
6f56e743ed Merge branch 'MDL-68753-master-enfix' of git://github.com/mudrd8mz/moodle 2020-05-28 13:01:39 +02:00
Víctor Déniz Falcón
a987c54539 Merge branch 'MDL-68746-master-fix' of git://github.com/sarjona/moodle 2020-05-28 11:46:39 +01:00
Sara Arjona
87fd36a696 Merge branch 'MDL-68244' of https://github.com/Chocolate-lightning/moodle 2020-05-28 12:42:39 +02:00
Sara Arjona
e757f9c598 Merge branch 'MDL-68565' of https://github.com/paulholden/moodle 2020-05-28 12:00:21 +02:00
Paul Holden
3bd9e1e8d2 MDL-68565 tool_usertours: account for optional config in WS response. 2020-05-28 10:51:50 +01:00
Sara Arjona
dcbc830cfa MDL-68746 core_badges: fix behat error with issuername 2020-05-28 11:20:46 +02:00
Eloy Lafuente (stronk7)
f2e6b797b9 Merge branch 'MDL-68789-master' of git://github.com/crazyserver/moodle 2020-05-28 10:46:25 +02:00
Adrian Greeve
521b524368 Merge branch 'MDL-66911-master-fix' of git://github.com/junpataleta/moodle 2020-05-28 16:23:13 +08:00
Jun Pataleta
a996318c9d MDL-66911 files: Update $CFG->licenses when adding/deleting licenses 
* When creating custom licenses, the list of active licenses
  ($CFG->licenses) also needs to be updated. Same when a custom license
  is being deleted.
 2020-05-28 16:15:15 +08:00
Jun Pataleta
1389465c29 MDL-66911 files: Use proper function for fetching enabled licenses 2020-05-28 15:23:38 +08:00
Jun Pataleta
4eaa7269a6 MDL-66911 files: Format full name of custom licenses 2020-05-28 15:20:14 +08:00
Pau Ferrer Ocaña
aafe220a7b MDL-68789 behat: Rename the app from Moodle Mobile to Moodle app 2020-05-28 08:38:08 +02:00
Jake Dallimore
30604f81a8 Merge branch 'MDL-67903-master' of git://github.com/bmbrands/moodle 2020-05-28 13:58:50 +08:00
Jun Pataleta
0a1b55ce36 Merge branch 'MDL-67810-master' of git://github.com/vmdef/moodle 2020-05-28 12:19:25 +08:00
Jake Dallimore
b08e4b5cd6 Merge branch 'MDL-68746-master' of git://github.com/sarjona/moodle 2020-05-28 11:56:23 +08:00
Adrian Greeve
9e1ace3fb5 Merge branch 'MDL-68822-master' of git://github.com/ferranrecio/moodle 2020-05-28 11:49:37 +08:00
deraadt
5143106813 MDL-68425 user: Add capability check for messaging 2020-05-28 11:23:42 +08:00
Bas Brands
457e61cd7b MDL-67874 core_filepicker: fix focus styles for filepicker folders 2020-05-28 10:34:02 +08:00
Adrian Greeve
4231b83668 Merge branch 'MDL-66911-38_core_file_add_license_help_to_fileselect' of https://github.com/tomdickman/moodle 2020-05-28 09:09:27 +08:00
Andrew Nicols
2ffc3bd5a2 Merge branch 'MDL-68846' of https://github.com/stronk7/moodle 2020-05-28 07:35:10 +08:00
Michael Hawkins
a4bd55725b MDL-68829 user: Update participants SQL for Oracle/MSSQL compatibility 
This refactors the SQL to join on a distinct list of users, removing
the need for GROUP BY statements, and fixing the related errors in
Oracle/MSSQL
 2020-05-28 00:28:34 +02:00
Eloy Lafuente (stronk7)
a0e38e4371 MDL-68846 behat: Avoid asserting AM/PM strings. They are not cross-os 
The exists/contains steps of behat are case-sensitive, in the other
side, depending of the OS and locales, time functions are not 100%
consistent. See https://bugs.php.net/bug.php?id=76378 for example.

So only solutions are:

1) Create a specific new step performing the checks case insensitively.
2) Avoid making AM / PM part of the checks.

Here we have opted by the 2nd approach, it's not critical part to check.
 2020-05-27 17:55:32 +02:00
Thomas.Ludwig
9bdd83c9fd MDL-67903 core_grades: remove outdated CSS for grade import form 2020-05-27 15:58:53 +02:00
Sara Arjona
8e1b43f0d5 Merge branch 'MDL-68343-master' of git://github.com/rezaies/moodle 2020-05-27 15:09:39 +02:00
Sara Arjona
20bbb473cf Merge branch 'MDL-68667-master' of git://github.com/aanabit/moodle 2020-05-27 12:26:46 +02:00
Víctor Déniz Falcón
c49d8663ad MDL-67810 core_contentbank: contenttype_h5p editor integrated 2020-05-27 10:27:55 +01:00
Victor Deniz Falcon
613281cd25 MDL-67810 core_contentbank: placed the edit action in the view page 2020-05-27 10:27:13 +01:00
Victor Deniz Falcon
a99dab944f MDL-67810 core_contentbank: contentype_h5p modified to support add menu 2020-05-27 10:27:13 +01:00
Víctor Déniz Falcón
75f58cbfa2 MDL-67810 core_contentbank: added dropdown menu to create content 2020-05-27 10:27:13 +01:00
Jun Pataleta
7fb2f4d1a5 Merge branch 'MDL-67828-master' of git://github.com/rezaies/moodle 2020-05-27 16:48:03 +08:00
David Mudrák
2615e429f4 MDL-68753 lang: Remove a redundant okay string and use "OK" everywhere 
The "Ok" (with lower-case "k") string was added in MDL-68409 to keep
backwards compatibility with YUI alerts that had it hard-coded. But we
should not need to explain to translators why we have two OK strings
like this and why they use different wording.

Additionally, there would be inconsistency in Behat tests and everywhere
depending on which "OK" or "Ok" string is used for buttons.

So instead, this patch changes the hard-coded 'Ok' string in the YUI and
we should stick to "OK" from now on everywhere.
 2020-05-27 09:59:44 +02:00
David Mudrák
c47b174d44 MDL-68753 lang: Use the updated strings in the tests 2020-05-27 09:59:35 +02:00
Sara Arjona
3d0541c03a Merge branch 'MDL-68758-master' of git://github.com/peterRd/moodle 2020-05-27 09:46:47 +02:00
Jun Pataleta
d5eec2a2fd Merge branch 'MDL-67743-master-final' of git://github.com/andrewnicols/moodle 2020-05-27 14:51:25 +08:00
Jake Dallimore
5a0d8a7eaf Merge branch 'MDL-52138-master-take4' of git://github.com/lucaboesch/moodle 2020-05-27 14:24:51 +08:00
Peter Dias
31788c8cf2 MDL-68758 core_repository: Allow ability to download files on all views. 2020-05-27 14:20:15 +08:00
Jake Dallimore
0fbc2c11f5 Merge branch 'MDL-67874-master' of git://github.com/bmbrands/moodle 2020-05-27 13:54:51 +08:00
Andrew Nicols
04ce665a98 Merge branch 'MDL-68765-master' of https://github.com/ised-isde-canada/moodle 2020-05-27 12:49:39 +08:00
Andrew Nicols
28bff4cff4 Merge branch 'master_MDL-68054' of https://github.com/danmarsden/moodle 2020-05-27 12:12:27 +08:00
Andrew Nicols
6cb3444f22 MDL-67743 user: Remove incorrect ARIA role on autocomplete 
The autocomplete is not a listbox so cannot be multiselectable.
 2020-05-27 11:52:01 +08:00
Andrew Nicols
c4bd1858db MDL-67743 table: Sort direction is an integer 2020-05-27 11:16:24 +08:00
Jun Pataleta
039fc86902 Merge branch 'MDL-68750-master' of git://github.com/andrewnicols/moodle 2020-05-27 11:03:54 +08:00
Adrian Greeve
6f17ec9181 Merge branch 'MDL-68788' of https://github.com/Chocolate-lightning/moodle 2020-05-27 10:55:20 +08:00
Michael Hawkins
f637640f01 MDL-68678 user: Made filterset match text clearer 
Part of MDL-67743
 2020-05-27 10:49:44 +08:00
Bas Brands
6881ca38d7 MDL-68259 user: add styling to participant filters 
Part of MDL-67743
 2020-05-27 10:49:44 +08:00
Andrew Nicols
110f3ebf54 MDL-68169 user: Limit the number of filter conditions 
Part of MDL-67743
 2020-05-27 10:49:44 +08:00
Andrew Nicols
028ec17c94 MDL-68169 user: Add keyword filter 
Part of MDL-67743
 2020-05-27 10:49:44 +08:00
Andrew Nicols
fbcc657713 MDL-68169 user: Add accesssince filter 
Part of MDL-67743
 2020-05-27 10:49:43 +08:00
Andrew Nicols
fa3d57fe7e MDL-68169 user: Add enrolment instance filter 
Part of MDL-67743
 2020-05-27 10:49:43 +08:00
Andrew Nicols
de83d4357f MDL-68169 user: Add groups filter 
Part of MDL-67743
 2020-05-27 10:49:43 +08:00