mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
81,589 Commits 36 Branches 519 Tags
Commit Graph

6415 Commits

Author SHA1 Message Date
David Monllao
4e2ae9caee Merge branch 'MDL-56596-master-fix' of git://github.com/andrewnicols/moodle 2016-11-09 14:35:41 +08:00
David Monllao
33788800ec Merge branch 'MDL-56133' of https://github.com/NeillM/moodle 2016-11-09 14:23:50 +08:00
Andrew Nicols
f2dab83445 MDL-56596 tool_usertours: Update to tours v0.9.9 2016-11-09 14:10:31 +08:00
Andrew Nicols
43bdbbf682 Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle 2016-11-09 09:39:48 +08:00
David Monllao
0cbfb7ff2a Merge branch 'MDL-56409-master' of git://github.com/ankitagarwal/moodle 2016-11-09 08:36:36 +08:00
Dan Poltawski
231e2ec99a Merge branch 'MDL-56555-master' of git://github.com/andrewnicols/moodle 2016-11-08 17:56:12 +00:00
Dan Poltawski
e20c8ddc80 Merge branch 'MDL-48498-master-iv6' of https://github.com/snake/moodle 2016-11-08 17:51:17 +00:00
Dan Poltawski
674c4f6891 Merge branch 'MDL-56596-master' of git://github.com/andrewnicols/moodle 2016-11-08 13:43:54 +00:00
Neill Magill
6a6f2e1ca6 MDL-56133 tool_langimport: Changes should be visible after import 
Before this change if a language pack was updated by the
\tool_langimport\task\update_langpacks_task scheduled task, changes
would not be available to users until an admin manually cleared the
strings cache.

This change causes the cache to purged when a language pack it update,
this will cause it to rebuild so users will start seeing updates
automatically.
 2016-11-08 10:56:56 +00:00
Ankit Agarwal
20ab51fdbc MDL-56409 messages: Save one db query per page load 2016-11-08 12:50:30 +05:30
Jake Dallimore
067268942c MDL-48498 admin: new setting types for curl host/port restrictions 
Two new classes in lib/adminlib. One providing validation for a
newline-delimited textarea supporting domain names, domain wildcards,
IPv4/IPv6 addresses and IPv4/IPv6 ranges. The second providing
validation for a newline-delimited textarea of port numbers.
 2016-11-08 15:10:35 +08:00
David Monllao
d72c9774ae Merge branch 'wip-mdl-56630' of git://github.com/rajeshtaneja/moodle 2016-11-08 14:47:25 +08:00
Rajesh Taneja
dc90838aaa
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 14:45:43 +08:00
Andrew Nicols
592c691c8f MDL-56555 tool_usertours: Update tool sharing link 2016-11-08 13:51:11 +08:00
Andrew Nicols
3e85e02a98 Merge branch 'MDL-55992-master' of git://github.com/jleyva/moodle 2016-11-08 13:41:22 +08:00
Juan Leyva
0c6c86643e MDL-56607 settings: Move mobile settings to top-level 
AMOS BEGIN
 MOV [mobilecssurl,core_admin],[mobilecssurl,tool_mobile]
 MOV [configmobilecssurl,core_admin],[configmobilecssurl,tool_mobile]
AMOS END

From Plugins / Web Services / Mobile to Appearance / Mobile
 2016-11-07 09:53:29 +00:00
Dan Poltawski
912d854dc8 Merge branch 'MDL-56684-master-fix1' of http://github.com/damyon/moodle 2016-11-07 08:19:16 +00:00
Damyon Wiese
c81a34774e MDL-56684 boost: Fix for competency behat tests with boost theme 2016-11-07 16:02:44 +08:00
Andrew Nicols
a2c0528802 Merge branch 'MDL-56737-master' of git://github.com/jleyva/moodle 2016-11-07 13:25:41 +08:00
David Monllao
cf36f123d5 Merge branch 'MDL-55203' of https://github.com/mr-russ/moodle 2016-11-07 09:49:33 +08:00
David Monllao
90abff01b3 Merge branch 'MDL-54751-master-v5' of https://github.com/snake/moodle 2016-11-07 08:55:44 +08:00
Russell Smith
57a5974a10 MDL-55203 forms: Use correct admin folder name. 
When the admin folder if renamed, the system must replace that when
adding the competencies form elements to the QuickForm Library.
 2016-11-07 11:15:34 +11:00
David Monllao
1370e6ca52 Merge branch 'MDL-56149-master' of git://github.com/damyon/moodle 2016-11-07 07:47:27 +08:00
Jake Dallimore
ff4230d88e MDL-54751 behat: Support for adhoc module and section deletion in behat 
Introduced new behat step for running all pending adhoc tasks and
modified the relavant behat tests.
 2016-11-07 07:41:59 +08:00
Jake Dallimore
3704ff8cde MDL-54751 phpunit: Support adhoc module and section deletion in phpunit 
Created a new phpunit util function run_all_adhoc_tasks which runs any
pending tasks, for use in unit tests. Added new recyclebin and course
unit tests covering the new functionality.
 2016-11-07 07:41:59 +08:00
Jake Dallimore
3869d77411 MDL-54751 core_course: Edit course libs to support deletion flag 
Changed the course libs such that module and section deletion is now
handed off to relevant functions in the util class and exempted
modules scheduled for deletion from the course backups.
 2016-11-07 07:41:59 +08:00
Eloy Lafuente (stronk7)
6e29346609 Merge branch 'wip-MDL-38158-master' of https://github.com/marinaglancy/moodle 2016-11-06 02:11:19 +01:00
Juan Leyva
a947ecd634 MDL-56737 tool_mobile: Support private tokens in launch.php 2016-11-04 15:37:42 +00:00
Dan Poltawski
f0049415af MDL-56684 competencies: fix eslint probs in templates 2016-11-04 14:59:57 +00:00
Damyon Wiese
207136f279 MDL-56684 competencies: Boost for competency templates 
Add BS4 markup to all competencies templates. Also tweaked the template library to make it
easier in future when modifying templates and reloading.
 2016-11-04 14:45:58 +00:00
Dan Poltawski
808005ddf9 Merge branch 'MDL-53945' of git://github.com/aolley/moodle 2016-11-04 14:07:26 +00:00
Dan Poltawski
6d368fc2f6 MDL-56673 tool_templatelibrary: fix externallib backwards compat 
The function now matches the VALUE_DEFAULT option of the service.
 2016-11-04 10:38:15 +00:00
Marina Glancy
fab11235d8 MDL-38158 core_media: Convert media players to new plugin type 
AMOS BEGIN
  MOV [siteyoutube,core_media],[pluginname,media_youtube]
  MOV [siteyoutube_desc,core_media],[pluginname_help,media_youtube]
  MOV [sitevimeo,core_media],[pluginname,media_vimeo]
  MOV [sitevimeo_desc,core_media],[pluginname_help,media_vimeo]
  MOV [html5audio,core_media],[pluginname,media_html5audio]
  MOV [html5audio_desc,core_media],[pluginname_help,media_html5audio]
  MOV [html5video,core_media],[pluginname,media_html5video]
  MOV [html5video_desc,core_media],[pluginname_help,media_html5video]
  MOV [flashanimation,core_media],[pluginname,media_swf]
  MOV [flashanimation_desc,core_media],[pluginname_help,media_swf]
AMOS END
 2016-11-04 17:30:40 +08:00
Damyon Wiese
a11c74d186 MDL-56673 tool_templatelibrary: Don't show templates from other themes 2016-11-04 12:52:38 +08:00
Adam Olley
4bd8e65273 MDL-53945 mnet: Use moodle_url to provide string with url 
Using moodle_url where possible is preferable to hardcoding uri's as
moodle_url is able to take care of alot of the formatting for us.

In this instance, it handles the $CFG->admin url path for us.
 2016-11-04 09:10:31 +10:30
David Monllao
8b0064d5e7 Merge branch 'MDL-56576-master' of git://github.com/damyon/moodle 2016-11-03 15:14:41 +08:00
Andrew Nicols
11bafc2b21 Merge branch 'MDL-56641-master' of git://github.com/damyon/moodle 2016-11-03 15:07:01 +08:00
David Monllao
34ef8fa13a Merge branch 'MDL-56481-master' of git://github.com/junpataleta/moodle 2016-11-03 14:51:51 +08:00
Tim Lock
6e10972bec MDL-56481 tool_lpmigrate: Fix notice when cancelling framework migration 2016-11-03 14:16:36 +08:00
Andrew Nicols
bc378b50ec Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle 2016-11-03 14:08:21 +08:00
Damyon Wiese
057e1a1f6d MDL-56576 admin: Cannot edit blocks on search page 
Admin search page was processing the blocks delete request before the blocks
could process it.

Added a hidden field to the search results form so it can be sure the form submission
was for saving admin settings.
 2016-11-03 09:40:53 +08:00
Damyon Wiese
2a7c540c48 MDL-56641 admin: Managers can access search page 2016-11-03 09:36:33 +08:00
Adam Olley
20ec56504f MDL-53945 mnet: replace hardcoded admin dir with cfg 
Several places in admin/mnet pull in required files using a hardcoded
admin dir string, as this is configurable it needs to use $CFG->admin
instead.

Places where the url is passed through moodle_url don't need to be
updated as that already automatically translates the urls for us.
 2016-11-03 11:12:32 +10:30
Andrew Nicols
328628544b Merge branch 'MDL-56673-master' of git://github.com/danpoltawski/moodle 2016-11-02 12:07:18 +08:00
Andrew Nicols
8385163bab MDL-56596 tool_usertours: Update to latest version of tours and popper 
The updated release of the popper library addresses some issues where
boundaries were not resepected correctly.
 2016-11-02 11:37:31 +08:00
Juan Leyva
56c8413712 MDL-55992 webservice: Fix debugging notice when creating token 
This patch also avoid to propagate to logs the private token as is done
in login/token.php
 2016-11-01 21:26:40 +00:00
Dan Poltawski
f99e7ef116 Merge branch 'mdl55456-master' of https://github.com/tlock/moodle 2016-11-01 21:26:05 +00:00
Dan Poltawski
840ba76c0c MDL-56673 templatelibrary: return false when core template doesn't exist 2016-11-01 10:18:17 +00:00
Dan Poltawski
9bf205fb73 Merge branch 'MDL-55732-master' of git://github.com/damyon/moodle 2016-11-01 09:47:11 +00:00
Dan Poltawski
e0d5d8caed Merge branch 'MDL-56651-master' of git://github.com/lameze/moodle 2016-11-01 09:10:08 +00:00