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

8235 Commits

Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
6a7146fc71 Merge branch 'MDL-68314-master' of git://github.com/aanabit/moodle 2020-05-13 13:15:17 +02:00
David Mudrák
87f9e88ddd MDL-68563 filters: Fix unit test regressions 
Also incrementing the plugin versions to make sure the unit test
environment is reinitialised and the tests are reliable.

Minor correction of phpdocs @package tags included.
 2020-05-13 16:28:24 +08:00
Amaia Anabitarte
3449e22683 MDL-68314 core_contentbank: Course content bank backup and restore 2020-05-13 09:35:58 +02:00
Jun Pataleta
51939f6feb Merge branch 'MDL-68261-cli-config-log' of https://github.com/brendanheywood/moodle 2020-05-13 10:36:54 +08:00
Jun Pataleta
6165110f0a Merge branch 'MDL-66109-master' of git://github.com/andrewnicols/moodle 2020-05-12 00:03:19 +08:00
Sara Arjona
36a3a259de Merge branch 'MDL-68571-master' of git://github.com/cescobedo/moodle 2020-05-11 16:52:48 +02:00
cescobedo
444b2282f1 MDL-68571 core_h5p: Return default handler if no it has been defined 2020-05-11 16:46:27 +02:00
Jun Pataleta
d1735204c0 Merge branch 'MDL-63580-master' of git://github.com/cescobedo/moodle 2020-05-11 22:32:34 +08:00
cescobedo
db15746c2d MDL-63580 core_task: Deprecation cron_run_single_task and run_from_cli 
Also we have move the functions in \tool_task\run_from_cli to \core\task\manager
and we have deprecated that class.
 2020-05-11 10:53:23 +02:00
cescobedo
079736ccb3 MDL-63580 core_task: Deprecation CLI scripts from admin/tool/task/cli 
Copy the CLI scripts from admin/tool/task/cli to admin/cli (schedule_task.php and adhoc_task.php)
and rename to scheduled_task.php and to improve in order to use cron_run_inner_scheduled_task.
 2020-05-11 10:53:17 +02: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
Andrew Nicols
29c5fafff5 MDL-66109 js: Fix Shifter linting issues 2020-05-11 11:07:49 +08:00
Andrew Nicols
7afd16ad84 MDL-66109 behat: Require newline at EOF 
This change enables the gherkinlint rule to require a new line at the
end of the file. This change is in keeping with existing Moodle coding
style guidelines.
 2020-05-11 11:07:49 +08:00
Andrew Nicols
1152df3ec4 MDL-66109 css: Drop use of filter:alpha(opacity) 
This CSS statement was an MS-only rule which was never accepted, and
which was abonded some time before IE 10. It has no effect in supported
browsers and can be safely replace with `opacity: [0.0-1.0]`.
 2020-05-11 10:55:57 +08:00
Andrew Nicols
f879cc518e MDL-66109 js: Build changes for NodeJS upgrade 
This change includes a build to fix all minified file changes in Moodle
as a result of upgrades to our build process.
 2020-05-11 10:55:54 +08:00
Juan Leyva
af59fe585a MDL-65547 tool_mobile: Allow to generate site QR codes only 2020-05-08 16:51:36 +02:00
Juan Leyva
118852a710 MDL-65547 tool_mobile: New WS for generating tokens with qr login keys 2020-05-08 10:26:45 +02:00
Juan Leyva
9df5151013 MDL-65547 tool_mobile: Display QR in user profile 2020-05-08 10:26:45 +02:00
Eloy Lafuente (stronk7)
9a4a8bd3cb Merge branch 'MDL-68443-xmldb-path-validation' of https://github.com/brendanheywood/moodle 2020-05-07 19:16:37 +02:00
Eloy Lafuente (stronk7)
7bf6fd4528 Merge branch 'MDL-67753-master' of git://github.com/jleyva/moodle 2020-05-07 18:44:45 +02:00
Andrew Nicols
ac53825ff2 Merge branch 'MDL-68556-master-pluginscheckcss' of git://github.com/mudrd8mz/moodle 2020-05-07 09:13:20 +08:00