Commit Graph

6720 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) 5be425cf9e Merge branch 'wip-MDL-59263-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE 2017-06-20 18:04:08 +02:00
Eloy Lafuente (stronk7) 0f0b45fd59 Merge branch 'MDL-59269-33-languninstall' of git://github.com/mudrd8mz/moodle into MOODLE_33_STABLE 2017-06-20 17:56:59 +02:00
Mathieu Petit-Clair f05e2e6690 MDL-58952 admin: use valid default for language selection dropdown. 2017-06-20 11:31:49 +01:00
Jun Pataleta 82b3050e72 Merge branch 'MDL-57770-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE 2017-06-20 16:28:20 +08:00
Jake Dallimore 8b017ea78c Merge branch 'wip-MDL-58729-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE 2017-06-20 15:18:37 +08:00
Jun Pataleta a5efab81c9 Merge branch 'MDL-44961-33' of git://github.com/ankitagarwal/moodle into MOODLE_33_STABLE 2017-06-19 16:25:03 +08:00
David Mudrák a27fa5b50e 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:05:31 +02:00
Jean-Roch Meurisse - University of Namur - Belgium 94925c38d0 MDL-59263 roles: Wrong order of parameters in calls to pix_icon function 2017-06-16 10:07:22 +08:00
Simey Lameze 49e5b8438c MDL-57770 tool_lp: style fixes for the competency rule dialog 2017-06-15 15:38:23 +08:00
Ankit Agarwal 63bfa5afdb MDL-44961 logs: Keep log dates constant during restore 2017-06-14 15:21:54 +05:30
Mark Nelson 76b6407cb8 MDL-59140 core: changes to the 'navcourselimit' setting
Changed the default and description.
2017-06-13 18:21:18 +08:00
Adrian Greeve 7255306cc8 MDL-58729 database: Improve performance of CLI tool.
Imporve the speed with which mysql_collation converts to
a different collation.
2017-06-12 14:14:35 +08:00
Luca Bösch 571e862135 MDL-59056 admin: allowstealth yes/no checkbox instead of on/off 2017-06-08 21:09:54 +02:00
Eloy Lafuente (stronk7) 906b385784 MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts 2017-05-19 19:23:55 +02:00
Ankit Agarwal 5ff898804f MDL-58929 converters: Make link title consistent 2017-05-15 12:07:43 +01:00
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
Eloy Lafuente (stronk7) 641d75bde6 MDL-58681 behat: Split checkbox and advcheckbox tests
MDL-58267 converted "Display description on course page" to advcheckbox
(see 7f53e8aa22).

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
Eloy Lafuente (stronk7) 9d2112e88d MDL-54901 environment: pg93, openssl, https & utf8mb4 2017-04-18 02:12:45 +02:00
Eloy Lafuente (stronk7) 71318407ef MDL-54901 environment: 3.3 base information
This is a direct copy of the 3.2 branch to
have changes under control easier in next commits.
2017-04-17 12:22:10 +02:00
Dan Poltawski 0c290ad191 Merge branch 'MDL-32596_master' of https://github.com/rezaies/moodle 2017-04-13 15:58:00 +01:00
David Monllao c94e64fad1 Merge branch 'MDL57475-master' of https://github.com/mmafrar/moodle 2017-04-12 16:18:53 +02:00
Jun Pataleta f59c43a0fa Merge branch 'MDL-58400-master' of git://github.com/junpataleta/moodle 2017-04-11 09:14:12 +08:00
David Monllao 9f22961d93 Merge branch 'mdl-58485' of https://github.com/Dagefoerde/moodle 2017-04-10 16:31:58 +02:00
David Monllao f0ad40d13c Merge branch 'MDL-57553-master' of git://github.com/andrewnicols/moodle 2017-04-10 11:44:14 +02:00
Juan Leyva e352f30699 MDL-58400 tool_mobile: Support direct launch of OAuth SSO process 2017-04-10 11:12:29 +08:00
Juan Leyva a67e3bda2e MDL-58400 tool_mobile: Return enabled identity providers
Via this public Ajax Web Service we return the list of identity
providers in a site.
2017-04-10 11:12:28 +08:00
Jan Dageförde 6abce1e19a MDL-58485 admin: Show all SVG plugin icons 2017-04-07 10:10:22 +02:00