moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81587 commits 37 branches 544 tags 1.3 GiB
Commit graph

1814 commits

Author SHA1 Message Date
David Monllao
33788800ec Merge branch 'MDL-56133' of https://github.com/NeillM/moodle 2016-11-09 14:23:50 +08:00
Andrew Nicols
43bdbbf682 Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle 2016-11-09 09:39:48 +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
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
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
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
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
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
Damyon Wiese
a11c74d186 MDL-56673 tool_templatelibrary: Don't show templates from other themes 2016-11-04 12:52:38 +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
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
840ba76c0c MDL-56673 templatelibrary: return false when core template doesn't exist 2016-11-01 10:18:17 +00:00
Andrew Nicols
41c1314fbd MDL-56509 tool_usertours: Fetch all role shortnames 2016-11-01 10:14:48 +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
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
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02: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
Eloy Lafuente (stronk7)
bab82353f6 Merge branch 'MDL-56444' of https://github.com/mr-russ/moodle 2016-10-25 18:56:00 +02:00
Dan Poltawski
274c5837e7 Merge branch 'MDL-56536-master' of git://github.com/jleyva/moodle 2016-10-25 10:12:54 +01:00
Dan Poltawski
737e3c3b67 Merge branch 'MDL-56487-master' of git://github.com/andrewnicols/moodle 2016-10-25 08:42:58 +01:00