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
82,708 Commits 36 Branches 519 Tags
Commit Graph

6543 Commits

Author SHA1 Message Date
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 Mudrák
abcd53444b MDL-56726 admin: Fix some hard-coded paths to the admin directory 2016-11-03 09:54:28 +01:00
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
Jun Pataleta
3c7387722d MDL-56720 tool_lp: Do not push empty values to IDs array 2016-11-03 14:09:40 +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
Andrew Nicols
41c1314fbd MDL-56509 tool_usertours: Fetch all role shortnames 2016-11-01 10:14:48 +08:00
Simey Lameze
0051b08560 MDL-56651 core_role: add styling to submit buttons 2016-11-01 09:40:53 +08:00
Eloy Lafuente (stronk7)
a1f6a27c80 Merge branch 'MDL-47162' of git://github.com/merrill-oakland/moodle 2016-10-31 22:45:37 +01:00
Eloy Lafuente (stronk7)
5165c9f460 MDL-56297 forms: Normalize uses of 'url' fields to use size=60 
While this is not related to this issue, when reviewing it was
detected that the size of those url fields was really small and
looking decided to add this bit of normalization over existing uses.
 2016-10-31 19:47:41 +01:00
Eric Merrill
880fc15bf0 MDL-47162 core_message: Updating all uses of messaging to add courseid 2016-10-31 14:13:13 -04:00
Dan Poltawski
f2263f7c06 Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle 2016-10-31 15:15:09 +00:00
Dan Poltawski
b7f3b1365d Merge branch 'MDL-56509-master' of git://github.com/andrewnicols/moodle 2016-10-31 09:35:21 +00:00
Dan Poltawski
75de2e6199 Merge branch 'MDL-56631-master' of git://github.com/damyon/moodle 2016-10-31 09:10:06 +00:00
Damyon Wiese
a2d9a89f5a MDL-56149 permissions: Alignment of icons should not wrap 
/admin/roles/permissions.php?contextid=2 the icons should not wrap.
 2016-10-31 16:24:11 +08:00
Damyon Wiese
ad785e699e MDL-56631 passwordunmask: Admin setting for password unmask not working 
Andrew refactored the way it rendered the element, but did not update all the
templates (there is mforms element AND admin settings element).

See 3778a9226f05a6c0203b291a95378dd8a56c6516 for Andrews original change.
 2016-10-31 14:45:07 +08:00
Simey Lameze
343ba16c31 MDL-56501 message: introduce new manageallmessaging capability 2016-10-31 14:09:03 +08:00
Adrian Greeve
9715f61a26 MDL-44467 lib: Fix return path to noreply. 
Added code to show emails from users on controlled domains.
Moved admin settings from message_email to admin.
 2016-10-28 13:27:00 +08:00
Simey Lameze
253ae23058 MDL-44467 core: always send email from noreplyaddress 2016-10-28 13:04:09 +08:00
Simey Lameze
ff2abc4b7d MDL-44467 core: mail settings and navigation improvements 
This commit groups all mail settings under Server node, splitting into
two categories: Outgoing mail configuration and Incoming mail configuration.
Also, it make maildomain setting available on the Email settings page.
 2016-10-28 13:04:09 +08:00
Dan Marsden
97223bb356 MDL-56358 tool_lp tool_cohortroles: allow null idnumber 2016-10-28 12:00:44 +13:00
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
Frédéric Massart
4b021492d6 MDL-55732 theme_boost: Bulk user actions form adjustments 
- The 'add' and 'remove' buttons consistently wrap on two lines
- Multiple select fields use the size attribute to set the options seen
 2016-10-27 10:54:02 +08:00
Eloy Lafuente (stronk7)
6f01090159 Merge branch 'MDL-56448-master' of git://github.com/danpoltawski/moodle 2016-10-26 16:11:44 +02:00
Dan Poltawski
f07cb88c57 MDL-56448 mustache: fix json errors in example context 2016-10-26 12:35:45 +01:00
Andrew Nicols
71c47e774f Merge branch 'wip-mdl-56532-fix' of https://github.com/rajeshtaneja/moodle 2016-10-26 10:12:25 +08:00
Rajesh Taneja
0c4c697dac
MDL-56532 behat: Fixed language string 2016-10-26 10:11:17 +08:00
Rajesh Taneja
a4da15d472
MDL-56532 behat: Fixed language string 2016-10-26 08:14:58 +08:00
Helen Foster
c9636ddd51 MDL-56542 lang: Merge English strings from the en_fix language pack 2016-10-25 20:12:52 +02:00