6730 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
9ee6de4389 Merge branch 'wip-MDL-59263-master' of git://github.com/marinaglancy/moodle 2017-06-20 18:02:09 +02:00
Eloy Lafuente (stronk7)
42a78077c6 Merge branch 'MDL-59269-master-languninstall' of git://github.com/mudrd8mz/moodle 2017-06-20 17:56:44 +02:00
Dan Poltawski
3fb9ca78c7 Merge branch 'MDL-58952' of https://github.com/scyrma/moodle 2017-06-20 11:31:30 +01:00
Jun Pataleta
d938d1b6e2 Merge branch 'MDL-57770-master' of git://github.com/lameze/moodle 2017-06-20 16:27:48 +08:00
Jake Dallimore
6f2950cf59 Merge branch 'wip-MDL-58729-master' of git://github.com/abgreeve/moodle 2017-06-20 15:18:16 +08:00
Jun Pataleta
8cc4e1c0cd Merge branch 'MDL-44961-master' of git://github.com/ankitagarwal/moodle 2017-06-19 16:24:51 +08:00
David Mudrák
64b6651cfa MDL-59269 lang: Fix ability to uninstall certain language packs
In the issue MDL-39319 (6ddf92c77), the ability to uninstall multiple
language packs at once was added. By a mistake, the PARAM_ALPHAEXT was
used as paramater type for the dash-separated list of language packs to
be uninstalled. Language packs with a number in the name (such as
en_us_k12) do not pass the ALPHAEXT cleaning.

This patch changes the parameter cleaning to PARAM_SAFEPATH which is
more appropriate for the given scenario as language code themselves must
be SAFEDIRs.
2017-06-16 14:15:25 +02:00
Jean-Roch Meurisse - University of Namur - Belgium
509679e203 MDL-59263 roles: Wrong order of parameters in calls to pix_icon function 2017-06-16 10:02:52 +08:00
Simey Lameze
7af8b56ab4 MDL-57770 tool_lp: style fixes for the competency rule dialog 2017-06-15 15:02:42 +08:00
Mark Nelson
c0a9edbd18 MDL-59140 core: changes to the 'navcourselimit' setting
Changed the default and description.
2017-06-14 12:32:04 +01:00
Ankit Agarwal
a4beef4e31 MDL-44961 logs: Keep log dates constant during restore 2017-06-14 15:20:58 +05:30
Adrian Greeve
c05dc071b0 MDL-58729 database: Improve performance of CLI tool.
Imporve the speed with which mysql_collation converts to
a different collation.
2017-06-12 14:03:36 +08:00
Luca Bösch
ad2cba8ec5 MDL-59056 admin: allowstealth yes/no checkbox instead of on/off 2017-06-08 19:13:05 +02:00
Eloy Lafuente (stronk7)
e747059693 Merge branch 'MDL-58694-master' of git://github.com/jleyva/moodle 2017-06-06 19:34:16 +02:00
Jake Dallimore
58a4dacf87 Merge branch 'MDL-57304_template_comments_fix' of https://github.com/gthomas2/moodle 2017-06-06 15:54:33 +08:00
Jun Pataleta
4b64128f5b Merge branch 'MDL-57139-master' of git://github.com/danpoltawski/moodle 2017-06-06 14:47:52 +08:00
Dan Poltawski
50c277a5d8 MDL-57139 js: built 2017-06-01 14:54:40 +01:00
Dan Poltawski
08c2360e4a MDL-57139 competencies: ensure promise best practices 2017-06-01 10:27:59 +01:00
Dan Poltawski
7efdac5fc3 MDL-57139 tool_usertours: return in promises 2017-06-01 10:27:59 +01:00
David Mudrák
8cf36e9c81 MDL-53240 filetypes: Introduce admin_setting_filetypes class
This new type of admin settings makes use of the filetypes browser but
for the admin settings.
2017-06-01 09:48:45 +02:00
gthomas2
bd87693fd6 MDL-57304 templates: Do not include comments via ajax 2017-05-31 09:09:53 +01:00
Eloy Lafuente (stronk7)
5e27228335 MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts 2017-05-19 19:22:07 +02:00
Mathieu Petit-Clair
c14e697ee6 MDL-58952 admin: use valid default for language selection dropdown. 2017-05-16 15:28:25 +08:00
Ankit Agarwal
b5eff76621 MDL-58929 converters: Make link title consistent 2017-05-15 09:45:09 +05:30
David Monllao
cb04995b30 Merge branch 'MDL-58833-master' of git://github.com/andrewnicols/moodle 2017-05-10 14:07:46 +08:00
David Monllao
265a1eafc5 Merge branch 'MDL-58857-master' of git://github.com/andrewnicols/moodle 2017-05-10 13:50:10 +08:00
Andrew Nicols
a011effb49 MDL-58857 admin: Terminate the session if a major upgrade is required 2017-05-09 15:00:00 +08:00
Eloy Lafuente (stronk7)
d989ee1e03 MDL-58853 versions: bump all versions and requires near release
version = 2017051500 release version
requires= 2017050500 current rc1 version
2017-05-09 02:58:28 +02:00
Andrew Nicols
89ab16414a MDL-58833 tool_templatelibrary: Skip if directory empty 2017-05-08 15:01:52 +08:00
Jake Dallimore
7a37f761bc Merge branch 'MDL-56251_master' of git://github.com/markn86/moodle 2017-05-05 12:29:44 +08:00
Mark Nelson
a526c706f4 MDL-56251 core: fixed failing unit tests 2017-05-05 12:14:56 +08:00
Dan Poltawski
ad587bee83 Merge branch 'MDL-58709-master' of git://github.com/jleyva/moodle 2017-05-04 15:13:05 +01:00
Helen Foster
06d0aa4432 MDL-58749 lang: Merge English strings from the en_fix language pack
Significant string changes:

* errorinvalidbyhour,core_calendar - correcting number from 59 to 23
* cron_help,core_admin - updated recommendation to run cron every minute
* tour1_content_end, tour1_content_welcome, tour2_content_end,
  tour2_content_welcome all in tool_usertours - removing reference to
  3.2
* invalidsesskey,core_error and invalidsesskey,mod_wiki - more
  understandable error message
* pluginname_help and pluginnamesummary in qtype_essay - explaining that
  the question type can be used for file uploads
* formatnoinline, mustattach and mustrequire in qtype_essay - changing
  the word 'inline' to 'online'
2017-05-03 22:05:51 +02:00
Andrew Nicols
d98d245ba0 MDL-58746 core: Simplify environment check 2017-05-03 08:32:24 +08:00
Dan Poltawski
f0572ad21f Merge branch 'MDL-58760-master-pixescape' of git://github.com/mudrd8mz/moodle 2017-05-01 11:25:39 +01:00
Andrew Nicols
9a2854cc65 MDL-58746 core: Add environment check for finfo 2017-05-01 09:01:21 +08:00
David Mudrák
a84d351e3d MDL-58760 templates: Fix the template context documentation
This change was missed in the commit 663640f5 and I spotted it while
working on this issue.
2017-04-28 23:08:13 +02:00
Juan Leyva
b44e4748d6 MDL-58709 registration: Fix incorrect setType 2017-04-27 16:57:45 +02:00
David Monllao
0b90afb59e Merge branch 'MDL-58727-master' of git://github.com/jleyva/moodle 2017-04-27 12:11:29 +08:00
Juan Leyva
b103797868 MDL-58727 tool_mobile: Return always launcher in get_public_config WS
Recently we added support to the new OAuth SSO methods (Google,
Facebook, Microsoft) and identity providers, that will require
launchurl to be returned always by tool_mobile_get_public_config

It is safe to return always the launchurl, the main reason to not
return it was to reduce data returned by Web Services when was not
required.
2017-04-26 09:26:13 +02:00
Juan Leyva
bf1babe5ff MDL-58694 admin: Add mobile related data to site registration 2017-04-25 10:30:24 +02:00
Eloy Lafuente (stronk7)
641d75bde6 MDL-58681 behat: Split checkbox and advcheckbox tests
MDL-58267 converted "Display description on course page" to advcheckbox
(see 7f53e8aa22d555ba5f94530b7fc04a4e95f35c98).

Advanced checkboxes cannot be tested without real browser because Goutte
does not support the hidden+checkbox duality (MDL-55386).

So this patch does:

- Convert the NON-JS checks to use the "Force format" field (normal checkbox).
- Move the "Display description on course page" (adv. checkbox) to the JS scenario.
- Complete the 2 groups of checks above so the two ways to tick and untick are covered:
    - I set the field "xxxx" to "yyyy"
    - I set the following fields to these values:
- Complete the 2 groups of checks above so the two ways to verify the values are covered:
    - the field "xxxx" [matches|does not match] value "yyyy"
    - the following fields [match|do not match] these values:

That's all! The scenario is a bit spaghetti but it's way off the scope
of the issue to fix that.
2017-04-23 18:13:02 +02:00
David Monllao
8e96553708 Merge branch 'MDL-58590' of https://github.com/sk-unikent/moodle 2017-04-21 10:03:59 +08:00
Skylar Kelty
30fccfcd82
MDL-58590 mobile: Cache mobile-supporting plugins 2017-04-20 09:36:20 +01:00
Jake Dallimore
fedb00d4bb Merge branch 'MDL-58520-master' of git://github.com/ryanwyllie/moodle 2017-04-19 15:50:48 +08:00
Ryan Wyllie
4671ae6374 MDL-58520 block_myoverview: change display name to Course overview
Change the display name of the my overview block to Course overview to
match the block it is replacing (and the UX prototype).

The use of "My" is no longer recommended when naming things in Moodle.
2017-04-19 05:47:40 +00:00
David Monllao
ac0553aa64 Merge branch 'MDL-54901' of git://github.com/stronk7/moodle 2017-04-19 11:30:03 +08:00
David Monllao
2b4bafc6c2 Merge branch 'MDL-58625-master' of git://github.com/danpoltawski/moodle 2017-04-19 03:50:44 +08:00
Dan Poltawski
34702e22e6 MDL-58625 behat: update tool_lp data generator 2017-04-18 12:51:13 +01:00
Eloy Lafuente (stronk7)
55946a892a MDL-54901 phpunit: Change phpunit wwwroot to HTTPS and fix tests
This includes:

- Changing PHPUnit's bootstrap to use https://www...
- Modify all existing expectations to the new wwwroot.
- Amend some tests now with different defaults because of is_https()
- Added a note to main upgrade.php about the change.
2017-04-18 03:40:17 +02:00