13822 Commits

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
Jun Pataleta
0a1b55ce36 Merge branch 'MDL-67810-master' of git://github.com/vmdef/moodle 2020-05-28 12:19:25 +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
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
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
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
Sara Arjona
3d0541c03a Merge branch 'MDL-68758-master' of git://github.com/peterRd/moodle 2020-05-27 09:46:47 +02:00
Peter Dias
31788c8cf2 MDL-68758 core_repository: Allow ability to download files on all views. 2020-05-27 14:20:15 +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
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
77ba77f10a MDL-67917 user: Add skeleton for new participants filter
Part of MDL-67743

AMOS BEGIN
  CPY [select,core],[selectfiltertype,core_user]
AMOS END
2020-05-27 10:49:43 +08:00
Tom Dickman
2228ca31a2 MDL-66911 core files: Add license help to file selector
This improvement adds a help icon to the 'Choose license' option
providing links to further information on each license.
Utilise templates for license links to avoid code reuse.
2020-05-27 08:36:48 +10:00
Helen Foster
026a12ec51 MDL-68753 lang: Import fixed English strings (en_fix) 2020-05-26 19:18:23 +02:00
Jun Pataleta
8aa0f2c4d8 Merge branch 'MDL-45184-master' of git://github.com/junpataleta/moodle 2020-05-26 12:39:24 +08:00
Andrew Nicols
a7aaf91855 Merge branch 'MDL-68388' of https://github.com/marcusboon/moodle 2020-05-26 10:11:08 +08:00
Tom Dickman
4399e4759a MDL-45184 tool_licenses: Add custom licenses
This feature adds an admin tool for creating custom licenses.
Now custom licenses can be added and amended in Moodle, and the site
default can be set to a custom license.

Core licenses remain hard-coded and are uneditable, so they will always
require update within Moodle core updates, and maintain their
internationalisation through core language strings.

This also includes fundamental changes to the license API including
the addition of license caching and deprecation of no longer required
admin settings for license management.
2020-05-26 12:08:05 +10:00
Marcus Boon
f1f5ba36ad MDL-68388 core_grades: Use MUC for grade letters
In the get_grade_letters there is a static variable that is used
to cache grade letters, we should use MUC for this so that it is
reset properly between unit tests.
2020-05-26 09:06:50 +10:00
Jake Dallimore
4404ced7f7 Merge branch 'MDL-68567-master' of git://github.com/sarjona/moodle 2020-05-25 11:36:48 +08:00
Sara Arjona
a80541ea90 MDL-68567 badges: add/remove site backpacks 2020-05-22 09:01:59 +02:00
Jun Pataleta
87decf6e00 Merge branch 'MDL-65796' of https://github.com/paulholden/moodle 2020-05-22 11:50:53 +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
Mathew May
7f86455237 MDL-68661 core_lang: Roll back addresourceoractivity 2020-05-22 10:02:57 +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)
7ce7d21503 Merge branch 'MDL-66992-master' of https://github.com/tungthai/moodle 2020-05-21 00:48:30 +02:00
Bas Brands
e695d9d0b6 MDL-68493 core_contentbank: implement list view 2020-05-20 16:27:58 +02:00
Jun Pataleta
a7431ec3f1 Merge branch 'MDL-58866-master-2' of git://github.com/marinaglancy/moodle 2020-05-20 17:35:08 +08:00
Adrian Greeve
56287073d5 Merge branch 'MDL-68662' of https://github.com/Chocolate-lightning/moodle 2020-05-20 16:52:17 +08:00
Mathew May
e146a2ca74 MDL-68662 core_course: Add new tabs to the chooser
We now have two more tabs in the chooser.
Activities & Resources aer now offered in different tabs.
2020-05-20 15:53:06 +08:00
Adrian Greeve
59d0090fda Merge branch 'MDL-67548-master' of https://github.com/kabalin/moodle 2020-05-20 08:35:18 +08:00
Marina Glancy
d268c5bac3 MDL-58866 core_calendar: separate color for other events, icons 2020-05-19 19:04:15 +02:00
Jun Pataleta
f46b5f5f28 Merge branch 'MDL-68463-master-3' of git://github.com/andrewnicols/moodle 2020-05-19 12:24:14 +08:00
Sara Arjona
2418c12c60 Merge branch 'MDL-68760' of https://github.com/timhunt/moodle 2020-05-18 20:33:05 +02:00
Tim Hunt
c3dd5ccc40 MDL-68760 timezones: add string for new timezone America/Nuuk 2020-05-18 17:31:43 +01:00
Eloy Lafuente (stronk7)
6462724e4f Merge branch 'MDL-68526-master' of git://github.com/aanabit/moodle 2020-05-18 17:14:12 +02:00
Amaia Anabitarte
f2a9bb6edb MDL-68526 core_contentbank: Delete content when a course is deleted
Or when a course category is moved/deleted
2020-05-18 16:05:04 +02:00
Andrew Nicols
ed23725bc6 MDL-68463 user: Update select/show [count] links dynamically 2020-05-18 20:03:38 +08:00
Adrian Greeve
5ec37d28a6 Merge branch 'master_MDL-64843_course_copy_ui' of https://github.com/catalyst/moodle 2020-05-18 10:35:44 +08:00
Tung Thai
15a00bead1 MDL-66992 core_badges: Add support to Open Badges 2.1 2020-05-17 20:01:55 +07:00
Matt Porritt
01436f7539 MDL-64843 Backup: Course copy user interface
This patch adds better core support for copying courses.
There is now a simplified and dedicated UI for copying
courses. This can be accessed from the course context
menu or course management screens.

All backups are done asynchronously and there can be multiple
copies of a course in flight at once.
2020-05-15 06:02:02 +00:00
Andrew Nicols
bef1d08531 Merge branch 'MDL-66917' of https://github.com/paulholden/moodle 2020-05-15 10:54:15 +08:00
Paul Holden
9965b654f8 MDL-65796 message: improve content of contact request notifications. 2020-05-13 15:40:17 +01:00
Jun Pataleta
9c09ec41d6 Merge branch 'MDL-68483-master' of git://github.com/sarjona/moodle 2020-05-13 19:33:37 +08:00
Sara Arjona
f9b6849b85 MDL-68483 contentbank: filter contents by name
Credits to Bas and Rafa for helping us to improve the UX.
Also to Amaia with her help with Behat tests.
2020-05-13 13:31:29 +02:00
Amaia Anabitarte
3449e22683 MDL-68314 core_contentbank: Course content bank backup and restore 2020-05-13 09:35:58 +02:00
Ruslan Kabalin
72316a9f4e MDL-67548 core_course: Add more category deletion hooks.
Introduce new hooks for plugin developers:

  - <component>_can_course_category_delete($category)
  - <component>_can_course_category_delete_move($category, $newcategory)
These hooks allow plugin developers greater control over category deletion. Plugin can return false in those
functions if category deletion or deletion with content move to the new parent category is not permitted.

  - <component>_pre_course_category_delete_move($category, $newcategory)
This hook is expanding functionality of existing <component>_pre_course_category_delete hook and allow plugin developers
to execute code prior to category deletion when its content is moved to another category.

 - <component>_get_course_category_contents($category)
This hook allow plugin developers to add information that is displayed on category deletion form. Function should
return string, which will be added to the list of category contents shown on the form.
2020-05-12 14:30:14 +01:00
Jun Pataleta
c314ec6770 Merge branch 'MDL-68041-master-rev2' of https://github.com/nhoobin/moodle 2020-05-11 16:27:48 +08:00
Nicholas Hoobin
119a83f148 MDL-68041 core_theme: New admin settings in secure page layout
This adds two new admin settings to the theme appearance options.

Shows the lang menu in secure layout, langmenuinsecurelayout.
Shows the user's name in secure layout, logininfoinsecurelayout.

When the page layout is set to secure, these options will be in effect.
2020-05-11 17:23:17 +10:00
Sara Arjona
f635915137 MDL-68271 core_h5p: implement localization methods for editor
The following methods have been implemented for supporting
content-type translations:
- H5PEditorAjaxInterface.getTranslations. This method is used for
loading the "Text overrides and translations" section.
- H5peditorStorage.getLanguage. This method is used for displaying
the specific fields and messages for each content-type library.
- H5peditorStorage.getAvailableLanguages. This method is used to
get the language list displayed into the "Text overrides and
translations" section.
2020-05-08 18:18:24 +02:00