ca5a9de8c5
MDL-61022 recyclebin: Verify groups are restored
2017-12-18 10:22:12 +01: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
2e55209603
MDL-60965 behat: Correct strlen use
2017-12-05 11:19:42 +08:00
8c3d8a68f7
MDL-58200 competencies: Student can view linked courses
2017-11-29 16:07:42 +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
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
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
526d354991
Merge branch 'MDL-60572-master' of git://github.com/jleyva/moodle
2017-10-30 10:10:34 +13: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
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
ab94608ffb
Merge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle
2017-10-23 14:28:51 +08:00
672f483670
MDL-42834 admin: Removal of httpswwwroot
2017-10-23 12:25:36 +08:00
4b501ec96b
MDL-42834 admin: Deprecate https_required and verify_https_required
2017-10-23 12:25:35 +08:00
d743dd70cc
MDL-60537 tool_httpsreplace: Fix behat following langstring
2017-10-23 08:25:55 +08:00
ecb4a05cc2
Merge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle
2017-10-19 22:20:01 +02:00
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
a0d3a28abb
Merge branch 'wip-MDL-60211-master' of https://github.com/Beedell/moodle
2017-10-19 14:22:30 +08:00
96f1440b7a
Merge branch 'MDL-58388-master' of https://github.com/abias/moodle
2017-10-19 12:47:18 +08:00
ff7081150b
Merge branch 'MDL-59063_master' of git://github.com/dmonllao/moodle
2017-10-19 09:01:58 +08:00
91f015171f
MDL-46269 tool_httpsreplace: Fix incorrect sorting
2017-10-18 19:46:26 +02:00
f150071901
Merge branch 'MDL-60022_master' of git://github.com/dmonllao/moodle
2017-10-18 12:36:00 +08:00
71339af8c6
MDL-59063 analytics: No need to load timesplitting method
2017-10-17 14:05:40 +02:00
019ad9c7a8
MDL-59063 tool_analytics: New invalid analysables report
2017-10-17 14:05:38 +02:00
8816022df7
MDL-60022 analytics: Clear model predictions in UI
2017-10-17 09:10:08 +02:00
0d3bdbe4af
Merge branch 'wip-MDL-46269-master' of git://github.com/marinaglancy/moodle
2017-10-17 14:27:31 +08:00
d355cb54ab
Merge branch 'MDL-60365-master' of git://github.com/jleyva/moodle
2017-10-17 00:23:38 +02:00
84a9f58b67
MDL-46269 tool_httpsreplace: minor fixes
...
- don't call curl() from unittests
- make sure we don't replace links to http:// urls when the embedded contents from the same domain is present
- convert only text or long varchar columns
- improve searching performance, use case-insensitive regex/like instead of LOWER
- add unittests for the above and also for international domains
2017-10-16 16:53:49 +08:00
16d5ec55c9
MDL-46269 tool_httpsreplace: Combine CLI scripts
2017-10-16 16:11:15 +08:00
55b1d231ed
MDL-46269 tool_httpsreplace: Add multiple steps
2017-10-16 16:11:15 +08:00
4b86dd7ba6
MDL-46269 tool_httpsreplace: Make param search case insensitive
2017-10-16 16:11:15 +08:00
6163651e76
MDL-46269 tool_httpsreplace: Support DBs with no regex (oracle & mssql)
2017-10-16 16:11:15 +08:00
Damyon Wiese