6950 Commits

Author SHA1 Message Date
Marina Glancy
12a67a4266 MDL-60887 registration: allow plugins to register on custom hubs 2017-11-28 11:21:25 +08:00
yair.spielmann
b323508554
MDL-59512 tool_oauth2: add option for basic authentication 2017-11-17 10:15:29 +01:00
Jake Dallimore
55b2742724 Merge branch 'MDL-60741' of git://github.com/timhunt/moodle 2017-11-14 15:28:06 +08:00
Eloy Lafuente (stronk7)
6499085f36 MDL-60784 upgrade: add 3.4.0 separation line to all upgrade scripts 2017-11-12 18:43:30 +01:00
David Monllao
08641175b3 Merge branch 'MDL-60764' of git://github.com/stronk7/moodle 2017-11-10 10:20:25 +01:00
Jun Pataleta
c3925187ed Merge branch 'MDL-60758_master' of git://github.com/dmonllao/moodle 2017-11-10 17:21:15 +13:00
Eloy Lafuente (stronk7)
ba854606e6 MDL-60764 versions: bump all versions and requires near release
version = 2017111300 release version
requires= 2017110800 current rc2 version
2017-11-10 02:52:53 +01:00
Jake Dallimore
f5b63fc829 Merge branch 'MDL-60760_master' of git://github.com/dmonllao/moodle 2017-11-10 09:32:17 +08:00
David Monllao
20305a8a8f MDL-60758 tool_analytics: Skip guess start if higher than guess end 2017-11-09 17:11:34 +01:00
David Monllao
5da020169e MDL-60760 tool_analytics: No onlycli link for managers 2017-11-09 17:05:08 +01:00
Tim Hunt
d00007bc45 MDL-60741 purgecaches: did not correctly setup the admin page
Note that, admin_externalpage_setup does the right capability check.
2017-11-08 14:30:27 +00:00
Jake Dallimore
5243e93661 Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle 2017-11-07 16:03:43 +08:00
David Monllao
76f98c3bd5 MDL-59256 analytics: Move get_activities method to CoI scope
CoI = community of inquiry model
2017-11-07 08:14:49 +01:00
Jun Pataleta
a56833d49d Merge branch 'MDL-60611' of git://github.com/stronk7/moodle 2017-11-07 10:14:24 +13:00
Eloy Lafuente (stronk7)
801a372dad MDL-60611 phpunit: switch to namespaced phunit classes 2017-11-02 23:45:34 +01:00
David Monllao
59aff5f949 Merge branch 'MDL-60634-master' of git://github.com/jleyva/moodle 2017-11-02 13:24:58 +01:00
Jun Pataleta
e8da33d86e MDL-60655 tool_httpsreplace: Use \core_text string functions 2017-11-02 10:42:33 +13:00
Jun Pataleta
02331dcd48 MDL-60655 tool_httpsreplace: Use appropriate classes for PHPDocs params 2017-11-02 10:42:33 +13:00
Juan Leyva
098b16fb13 MDL-60634 tool_mobile: Change page used for https test
We need to do the HTTPS check using a page that:
- Does not redirect (login/index.php may redirect because of auth
plugins)
- Does not return moodle exceptions (some custom exceptions handlers
may launch custom HTTP errors)
2017-10-31 11:57:25 +01:00
Andrew Nicols
065a754111 Merge branch 'MDL-60575-master' of https://github.com/snake/moodle 2017-10-31 10:05:38 +08:00
Jake Dallimore
ed44df22a8 MDL-60575 lang: Change registration string to html from markdown 2017-10-31 07:30:33 +08:00
Jun Pataleta
526d354991 Merge branch 'MDL-60572-master' of git://github.com/jleyva/moodle 2017-10-30 10:10:34 +13:00
Juan Leyva
6078d420bf MDL-60572 admin: Enforce URLs in forgottenpasswordurl setting
Also display warnings for admins.
2017-10-27 11:15:01 +02:00
Juan Leyva
2479a7c446 MDL-60572 admin: Fix forgottenpasswordurl for WS
We should expect URLs in that field.
The tool_mobile change is to not break the WS response if
forgottenpasswordurl does not contain a URL.
2017-10-27 11:12:32 +02:00
Andrew Nicols
4d03dbf13d Merge branch 'wip-MDL-60543-master' of git://github.com/marinaglancy/moodle 2017-10-26 14:19:43 +08:00
Damyon Wiese
7dfc9ea6b3 Merge branch 'wip-MDL-60390-fix' of https://github.com/marinaglancy/moodle 2017-10-26 12:52:11 +08:00
Marina Glancy
69e89f4a82 MDL-60390 tool_messageinboud: not strict index comparision
This is something that changed in the upgraded Horde library. structure->findBody() returns string but structure->contentTypeMap is indexed with ints
2017-10-26 12:44:51 +08:00
Marina Glancy
786d9cd3a1 MDL-60543 env: Moodle 3.2 and 3.3 do no support PHP7.2 2017-10-25 09:02:22 +08:00
Jake Dallimore
ab94608ffb Merge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle 2017-10-23 14:28:51 +08:00
John Okely
7eb50b3290 MDL-42834 admin: Remove wwwroot if used with moodle_url 2017-10-23 12:25:36 +08:00
John Okely
672f483670 MDL-42834 admin: Removal of httpswwwroot 2017-10-23 12:25:36 +08:00
John Okely
cd1eb7ce9c MDL-42834 admin: Upgrade script and warning for loginhttps sites 2017-10-23 12:25:36 +08:00
John Okely
4b501ec96b MDL-42834 admin: Deprecate https_required and verify_https_required 2017-10-23 12:25:35 +08:00
John Okely
b58764ff99 MDL-42834 admin: Remove loginhttps 2017-10-23 12:25:35 +08:00
Andrew Nicols
d743dd70cc MDL-60537 tool_httpsreplace: Fix behat following langstring 2017-10-23 08:25:55 +08:00
Eloy Lafuente (stronk7)
ecb4a05cc2 Merge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle 2017-10-19 22:20:01 +02:00
Helen Foster
89db57ca6d MDL-60449 lang: Merge English strings from the en_fix language pack
Significant string changes:

* multiple strings in core_hub - 'Publish' changed to 'Share' plus other
  wording improvements to avoid misunderstandings
* errorretrievingkey in message_airnotifier - improved wording and
  removing reference to Moodle.org
* enddate_help and courseduration_desc in core - clearer wording
  explaining what the date actually does
* restore:viewautomatedfilearea in core_role - changing wording to match
  the behaviour
* dropzones_help in qtype_ddmarker - improved wording
* autologinkeygenerationlockout in tool_mobile - updated error message
* configallowemailaddresses in core_admin - clearer description
* subscriptionmode_helpin mod_forum - removing misleading sentence about
  subscription mode changes not affecting existing users
2017-10-19 17:19:08 +02:00
David Monllao
b6b299ddae Merge branch 'wip-MDL-60108-master' of git://github.com/marinaglancy/moodle 2017-10-19 09:12:34 +02:00
Andrew Nicols
a0d3a28abb Merge branch 'wip-MDL-60211-master' of https://github.com/Beedell/moodle 2017-10-19 14:22:30 +08:00
Damyon Wiese
96f1440b7a Merge branch 'MDL-58388-master' of https://github.com/abias/moodle 2017-10-19 12:47:18 +08:00
Andrew Nicols
ff7081150b Merge branch 'MDL-59063_master' of git://github.com/dmonllao/moodle 2017-10-19 09:01:58 +08:00
David Mudrák
91f015171f MDL-46269 tool_httpsreplace: Fix incorrect sorting 2017-10-18 19:46:26 +02:00
Andrew Nicols
f150071901 Merge branch 'MDL-60022_master' of git://github.com/dmonllao/moodle 2017-10-18 12:36:00 +08:00
David Monllao
71339af8c6 MDL-59063 analytics: No need to load timesplitting method 2017-10-17 14:05:40 +02:00
David Monllao
019ad9c7a8 MDL-59063 tool_analytics: New invalid analysables report 2017-10-17 14:05:38 +02:00
David Monllao
8816022df7 MDL-60022 analytics: Clear model predictions in UI 2017-10-17 09:10:08 +02:00
Marina Glancy
1095afa4f7 MDL-60108 registration: Redirect to registration form
- when first installed
- when manual update of registration information is required
2017-10-17 15:00:17 +08:00
Marina Glancy
af925a541d MDL-60108 registration: Simplify, add commnews and separate emails 2017-10-17 15:00:14 +08:00
Jake Dallimore
0d3bdbe4af Merge branch 'wip-MDL-46269-master' of git://github.com/marinaglancy/moodle 2017-10-17 14:27:31 +08:00
Eloy Lafuente (stronk7)
d355cb54ab Merge branch 'MDL-60365-master' of git://github.com/jleyva/moodle 2017-10-17 00:23:38 +02:00