2f4feacac7
Merge branch 'MDL-60767-34-3' of https://github.com/snake/moodle into MOODLE_34_STABLE
2017-12-19 11:26:12 +08:00
ca5a9de8c5
MDL-61022 recyclebin: Verify groups are restored
2017-12-18 10:22:12 +01:00
0c75121648
MDL-60767 admin: fix usage of admin_write_settings
...
Make sure we always checks for failed validation, before redirecting.
A positive return value does not signal that all settings were able
to be written, only that at least one was - errors still need to be
checked!
2017-12-18 09:23:30 +08:00
2337078a30
Merge branch 'MDL-58200-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE
2017-12-12 19:13:25 +13:00
45c42e01a3
Merge branch 'MDL-60861-34' of git://github.com/ankitagarwal/moodle into MOODLE_34_STABLE
2017-12-12 12:38:39 +08:00
511c9addfa
Merge branch 'MDL-60965-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
2017-12-12 11:15:36 +08:00
f9e09bd963
MDL-60861 analytics: Remove enable menu, if no timesplitting method
2017-12-11 10:47:44 +05:30
68e670d8ea
MDL-60948 tool_httpsreplace: Correct use of test URLs
2017-12-11 12:06:22 +08:00
32b4b57b26
Merge branch 'MDL-59159_34' of git://github.com/stronk7/moodle into MOODLE_34_STABLE
2017-12-06 10:04:42 +08:00
fd7e75a8a5
Merge branch 'MDL-32350-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE
2017-12-06 11:30:52 +13:00
abd7d4394b
MDL-32350 admin: Sort users by country ASC and DESC
2017-12-05 07:22:56 +01:00
e4256cd769
Merge branch 'wip-MDL-60926-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE
2017-12-05 19:03:36 +13:00
0e199a5aec
Merge branch 'MDL-60801_34' of https://github.com/andrewhancox/moodle into MOODLE_34_STABLE
2017-12-05 12:52:25 +08:00
2e55209603
MDL-60965 behat: Correct strlen use
2017-12-05 11:19:42 +08:00
972142a9af
MDL-59159 environment: 3.1 (LTS) required
2017-12-04 02:03:34 +01:00
b25f3693bb
MDL-59159 environment: 3.5 base information
...
This is a direct copy of the 3.4 branch to
have changes under control easier in next commits.
2017-12-04 02:03:17 +01:00
605b0547de
MDL-60926 auth: do not map very long profile fields
2017-12-01 17:51:54 +08:00
8c3d8a68f7
MDL-58200 competencies: Student can view linked courses
2017-11-29 16:07:42 +08:00
ffba0168b1
MDL-60887 registration: allow plugins to register on custom hubs
2017-11-28 11:21:46 +08:00
c29edc7551
MDL-60801 tool_uploaduser: Fix issue with defaults being ignored
2017-11-25 11:40:56 +00:00
afcb4cd69a
MDL-59512 tool_oauth2: add option for basic authentication
2017-11-17 10:22:01 +01:00
244af9a0da
Merge branch 'MDL-60741' of git://github.com/timhunt/moodle into MOODLE_34_STABLE
2017-11-14 15:28:38 +08:00
dbeee32b59
MDL-60784 upgrade: add 3.4.0 separation line to all upgrade scripts
2017-11-12 18:46:00 +01:00
08641175b3
Merge branch 'MDL-60764' of git://github.com/stronk7/moodle
2017-11-10 10:20:25 +01:00
c3925187ed
Merge branch 'MDL-60758_master' of git://github.com/dmonllao/moodle
2017-11-10 17:21:15 +13:00
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
f5b63fc829
Merge branch 'MDL-60760_master' of git://github.com/dmonllao/moodle
2017-11-10 09:32:17 +08:00
20305a8a8f
MDL-60758 tool_analytics: Skip guess start if higher than guess end
2017-11-09 17:11:34 +01:00
5da020169e
MDL-60760 tool_analytics: No onlycli link for managers
2017-11-09 17:05:08 +01:00
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
5243e93661
Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle
2017-11-07 16:03:43 +08:00
76f98c3bd5
MDL-59256 analytics: Move get_activities method to CoI scope
...
CoI = community of inquiry model
2017-11-07 08:14:49 +01:00
a56833d49d
Merge branch 'MDL-60611' of git://github.com/stronk7/moodle
2017-11-07 10:14:24 +13:00
801a372dad
MDL-60611 phpunit: switch to namespaced phunit classes
2017-11-02 23:45:34 +01:00
59aff5f949
Merge branch 'MDL-60634-master' of git://github.com/jleyva/moodle
2017-11-02 13:24:58 +01:00
e8da33d86e
MDL-60655 tool_httpsreplace: Use \core_text string functions
2017-11-02 10:42:33 +13:00
02331dcd48
MDL-60655 tool_httpsreplace: Use appropriate classes for PHPDocs params
2017-11-02 10:42:33 +13:00
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
065a754111
Merge branch 'MDL-60575-master' of https://github.com/snake/moodle
2017-10-31 10:05:38 +08:00
ed44df22a8
MDL-60575 lang: Change registration string to html from markdown
2017-10-31 07:30:33 +08:00
526d354991
Merge branch 'MDL-60572-master' of git://github.com/jleyva/moodle
2017-10-30 10:10:34 +13:00
6078d420bf
MDL-60572 admin: Enforce URLs in forgottenpasswordurl setting
...
Also display warnings for admins.
2017-10-27 11:15:01 +02:00
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
4d03dbf13d
Merge branch 'wip-MDL-60543-master' of git://github.com/marinaglancy/moodle
2017-10-26 14:19:43 +08:00
7dfc9ea6b3
Merge branch 'wip-MDL-60390-fix' of https://github.com/marinaglancy/moodle
2017-10-26 12:52:11 +08:00
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
786d9cd3a1
MDL-60543 env: Moodle 3.2 and 3.3 do no support PHP7.2
2017-10-25 09:02:22 +08:00
ab94608ffb
Merge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle
2017-10-23 14:28:51 +08:00
7eb50b3290
MDL-42834 admin: Remove wwwroot if used with moodle_url
2017-10-23 12:25:36 +08:00
672f483670
MDL-42834 admin: Removal of httpswwwroot
2017-10-23 12:25:36 +08:00
Damyon Wiese