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

8257 Commits

Author SHA1 Message Date
Jun Pataleta
f2dc6313f0 Merge branch 'MDL-67070-master' of git://github.com/andrewnicols/moodle 2020-06-11 14:22:48 +08:00
Jake Dallimore
8aa901e7c3 Merge branch 'MDL-69010' of https://github.com/Chocolate-lightning/moodle 2020-06-11 12:01:22 +08:00
Andrew Nicols
4dae4b1429 Merge branch 'MDL-69002-master' of git://github.com/sarjona/moodle 2020-06-11 11:08:14 +08:00
Andrew Nicols
fc99ffa1aa MDL-67070 tool_usertours: Fix assumption that tours exist 2020-06-11 11:05:27 +08:00
Mathew May
e5daf9c7fc MDL-69010 tool_moodlenet: Migrate default MoodleNet instance setting 2020-06-11 10:32:27 +08:00
Andrew Nicols
f938dfcae8 MDL-67070 tool_usertours: Remove old tour JSON files 2020-06-11 09:32:31 +08:00
Andrew Nicols
b9310489ab MDL-67070 tool_usertours: Disable old tours 2020-06-11 09:32:31 +08:00
Peter Dias
5c0d795bce MDL-69002 core_badges: performance update to set default sitebackpack 2020-06-10 13:02:44 +02:00
Sara Arjona
15db4a762a MDL-69002 core_badges: remove site backpack verification from settings 
This site backpack verification is not required so, instead of
running it always here, it will be moved to a separate page to let
admins decide when to check it.
 2020-06-10 12:06:59 +02:00
Jake Dallimore
337e2e2b23 Merge branch 'MDL-68973' of https://github.com/stronk7/moodle 2020-06-10 16:13:57 +08:00
Jake Dallimore
233a526c95 Merge branch 'MDL-68972-master-enfix' of git://github.com/mudrd8mz/moodle 2020-06-10 09:14:46 +08:00
David Mudrák
2223261586 MDL-68999 moodlenet: Make the default instance name translatable 
Admins can change the value as they want / need. Still, it will be nice
if the default value (the name of the default MoodleNet instance) is
controlled by the language pack.

Beside that, it will allow us to more easily change the value should we
need it in the future (via the en_fix process).
 2020-06-09 22:16:00 +02:00
Helen Foster
1ab405f4a2 MDL-68972 lang: Import fixed English strings (en_fix) 2020-06-09 20:56:34 +02:00
Eloy Lafuente (stronk7)
e69ab798dd MDL-68973 versions: Fix other small details 
Thanks to Luca Bösch and Matteo Scaramuccia that detected
these 2 minor, but ugly details in core version files:

1) Adding comments pointed to versions (3.x, 20190801...) is not
   recommended, they easily come outdated.
2) Using plugin->release in core is no sense. Core plugins belong
   to the core release.

This commit just gets rid of them. That's all.
 2020-06-09 20:27:30 +02:00
Eloy Lafuente (stronk7)
115cc0214f MDL-68973 versions: bump all versions and requires near release 
version = 2020061500 release version
requires= 2020060900 current rc1 (week7roll1) version
 2020-06-09 16:23:09 +02:00
Andrew Nicols
c8c1bccf08 Merge branch 'MDL-68946' of https://github.com/Chocolate-lightning/moodle 2020-06-09 11:48:00 +08:00
Mathew May
329d3a8de5 MDL-68946 tool_task: Make clionly string handling more consistent 2020-06-08 17:11:57 +08:00
Mihail Geshoski
c2327a2679 MDL-68952 tool_moodlenet: Modify enablemoodlenet_desc string 2020-06-08 09:31:11 +08:00
Eloy Lafuente (stronk7)
f6128f3919 Merge branch 'MDL-68888-master-enfix' of git://github.com/mudrd8mz/moodle 2020-06-05 19:21:43 +02:00
Sara Arjona
d85980fd85 NOBUG: Fixed SVG browser compatibility 2020-06-05 13:24:10 +02:00
David Mudrák
6918ca6a4e MDL-68888 lang: Use the fixed spelling in the Behat tests, too 2020-06-05 09:33:29 +02:00
Helen Foster
98c882132d MDL-68888 lang: Import fixed English strings (en_fix) 
Significant string changes: userdata, userdata_help, keptroles,
keptroles_help in core_backup - Clearer wording about how the settings
work.
 2020-06-05 08:33:55 +02:00
Jun Pataleta
618b13e1f5 Merge branch 'MDL-67883-squash' of https://github.com/Chocolate-lightning/moodle 2020-06-05 11:52:36 +08:00
Jake Dallimore
b1e6d8b86f MDL-67883 tool_moodlenet: Add MoodleNet to core 2020-06-05 11:47:42 +08:00
Mathew May
16d77f1884 MDL-67883 core: Make core ready for MoodleNet. 2020-06-05 11:47:42 +08:00
Andrew Nicols
2edcba39a2 Merge branch 'MDL-68076-master-4' of git://github.com/rezaies/moodle 2020-06-04 10:04:58 +08:00
Shamim Rezaie
2cbe9eaf42 MDL-68076 core: new admin settings related to user feedback 2020-06-03 17:43:52 +10: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
Jun Pataleta
96dc92f099 Merge branch 'MDL-68353-master' of git://github.com/rezaies/moodle 2020-05-29 22:26:03 +08:00
Shamim Rezaie
4ceff26fdf MDL-68353 admin: Not use label tag in admin setting elements when needed 2020-05-29 14:37:05 +10: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
Eloy Lafuente (stronk7)
f2e6b797b9 Merge branch 'MDL-68789-master' of git://github.com/crazyserver/moodle 2020-05-28 10:46:25 +02: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
Jun Pataleta
039fc86902 Merge branch 'MDL-68750-master' of git://github.com/andrewnicols/moodle 2020-05-27 11:03:54 +08:00
Andrew Nicols
ddf6e48156 MDL-68750 tool_dataprivacy: Correct behat test modal checks 2020-05-27 10:40:30 +08:00
Jun Pataleta
8aa0f2c4d8 Merge branch 'MDL-45184-master' of git://github.com/junpataleta/moodle 2020-05-26 12:39:24 +08:00
Jun Pataleta
86c0f3cfd0 MDL-45184 tool_licensemanager: Behat fixes 
* Fix license manager test
* Remove unnecessary @javascript tags
* Remove unnecessary "I log out" steps
* Fix structure so each scenario will have a single Given-When-Then
 2020-05-26 12:29:09 +08:00
Jun Pataleta
cd4ec9b33b MDL-45184 tool_licensemanager: Move $deletelicense for proper scope 2020-05-26 12:11:07 +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
Sara Arjona
71dbe42c64 Merge branch 'MDL-68248-master' of https://github.com/DinhHien0307/moodle 2020-05-25 11:59:24 +02: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
Juan Leyva
82d5547b8f MDL-68294 tool_mobile: Fix custom strings and limits calculation 2020-05-19 12:19:37 +02:00
Juan Leyva
509a4c5865 MDL-68294 tool_mobile: Fix key and default apps values 2020-05-19 09:24:26 +02:00
Sara Arjona
84ab8a51e2 Merge branch 'MDL-68294-master' of git://github.com/jleyva/moodle 2020-05-18 12:49:32 +02:00
Adrian Greeve
a1bd5d556d Merge branch 'MDL-68563-master' of git://github.com/lameze/moodle 2020-05-18 11:34:38 +08:00
Juan Leyva
df2aa3480e MDL-68294 tool_mobile: WebService for validating subscription key 2020-05-15 20:49:34 +02:00
Juan Leyva
33dbc582e4 MDL-68294 tool_mobile: New subscription page 2020-05-15 20:49:34 +02:00
Andrew Nicols
4877ee9ca5 Merge branch 'MDL-68537-master' of git://github.com/jleyva/moodle 2020-05-15 10:36:54 +08:00