moodle.git
3 years agoMerge branch 'MDL-55808_master' of git://github.com/juancs/moodle
Jun Pataleta [Sun, 19 Nov 2017 21:34:55 +0000 (10:34 +1300)]
Merge branch 'MDL-55808_master' of git://github.com/juancs/moodle

3 years agoMerge branch 'MDL-60773-master' of https://github.com/snake/moodle
Damyon Wiese [Fri, 17 Nov 2017 06:11:12 +0000 (14:11 +0800)]
Merge branch 'MDL-60773-master' of https://github.com/snake/moodle

3 years agoMDL-60773 core: Add pendingJS checks for autocomplete interactions
Andrew Nicols [Fri, 10 Nov 2017 06:18:51 +0000 (14:18 +0800)]
MDL-60773 core: Add pendingJS checks for autocomplete interactions

3 years agoweekly on-sync release 3.5dev
Jake Dallimore [Thu, 16 Nov 2017 03:13:29 +0000 (11:13 +0800)]
weekly on-sync release 3.5dev

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Jake Dallimore [Thu, 16 Nov 2017 03:13:28 +0000 (11:13 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMerge branch 'MDL-60789-master' of git://github.com/sarjona/moodle
David Monllao [Wed, 15 Nov 2017 09:20:57 +0000 (10:20 +0100)]
Merge branch 'MDL-60789-master' of git://github.com/sarjona/moodle

3 years agoMerge branch 'wip-MDL-59876-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 15 Nov 2017 03:59:16 +0000 (11:59 +0800)]
Merge branch 'wip-MDL-59876-master' of git://github.com/abgreeve/moodle

3 years agoMDL-59876 core_user: Add required library for function.
Adrian Greeve [Wed, 15 Nov 2017 03:43:19 +0000 (11:43 +0800)]
MDL-59876 core_user: Add required library for function.

The external service create_users has a function call to
useredit_update_user_preference() that requires editlib.php

3 years agoAutomatically generated installer lang files
AMOS bot [Wed, 15 Nov 2017 00:05:16 +0000 (00:05 +0000)]
Automatically generated installer lang files

3 years agoMerge branch 'MDL-60675-master' of git://github.com/mihailges/moodle
Damyon Wiese [Tue, 14 Nov 2017 08:40:59 +0000 (16:40 +0800)]
Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle

3 years agoMDL-60675 analytics: Apply strict comparison check
Mihail Geshoski [Tue, 14 Nov 2017 08:22:36 +0000 (16:22 +0800)]
MDL-60675 analytics: Apply strict comparison check

3 years agoMDL-60789 workshop: Check title submission maxlength
Sara Arjona [Tue, 14 Nov 2017 07:46:46 +0000 (08:46 +0100)]
MDL-60789 workshop: Check title submission maxlength

3 years agoMerge branch 'MDL-60741' of git://github.com/timhunt/moodle
Jake Dallimore [Tue, 14 Nov 2017 07:28:06 +0000 (15:28 +0800)]
Merge branch 'MDL-60741' of git://github.com/timhunt/moodle

3 years agoMerge branch 'm34_MDL-59099_MySQL8_InnoDB_Params_Removed' of https://github.com/scara...
Jun Pataleta [Mon, 13 Nov 2017 23:22:29 +0000 (12:22 +1300)]
Merge branch 'm34_MDL-59099_MySQL8_InnoDB_Params_Removed' of https://github.com/scara/moodle

3 years agoMerge branch 'MDL-60693-backup-multilang-activities' of https://github.com/lucaboesch...
Damyon Wiese [Mon, 13 Nov 2017 06:33:57 +0000 (14:33 +0800)]
Merge branch 'MDL-60693-backup-multilang-activities' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'MDL-60675-master' of git://github.com/mihailges/moodle
Damyon Wiese [Mon, 13 Nov 2017 06:11:50 +0000 (14:11 +0800)]
Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle

3 years agoMerge branch 'MDL-60707' of git://github.com/aolley/moodle
Jake Dallimore [Mon, 13 Nov 2017 05:26:00 +0000 (13:26 +0800)]
Merge branch 'MDL-60707' of git://github.com/aolley/moodle

3 years agoMerge branch 'MDL-60783' of git://github.com/stronk7/moodle
Jake Dallimore [Mon, 13 Nov 2017 03:26:30 +0000 (11:26 +0800)]
Merge branch 'MDL-60783' of git://github.com/stronk7/moodle

3 years agoMerge branch 'MDL-59876-master' of git://github.com/jleyva/moodle
Damyon Wiese [Mon, 13 Nov 2017 02:47:49 +0000 (10:47 +0800)]
Merge branch 'MDL-59876-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-60784' of git://github.com/stronk7/moodle
Damyon Wiese [Mon, 13 Nov 2017 02:37:37 +0000 (10:37 +0800)]
Merge branch 'MDL-60784' of git://github.com/stronk7/moodle

3 years agoMDL-60784 upgrade: add 3.4.0 separation line to all upgrade scripts
Eloy Lafuente (stronk7) [Sun, 12 Nov 2017 17:43:30 +0000 (18:43 +0100)]
MDL-60784 upgrade: add 3.4.0 separation line to all upgrade scripts

3 years agoMDL-60783 backup: Bump release to 3.5
Eloy Lafuente (stronk7) [Sun, 12 Nov 2017 16:56:17 +0000 (17:56 +0100)]
MDL-60783 backup: Bump release to 3.5

3 years agoMDL-60693 backup: Use multilang with course activities
Luca Bösch [Thu, 11 May 2017 21:46:18 +0000 (23:46 +0200)]
MDL-60693 backup: Use multilang with course activities

On backup and restore, activities are shown after passing format_string,
supporting multilang.

3 years agoweekly back-to-dev release 3.5dev
Eloy Lafuente (stronk7) [Sat, 11 Nov 2017 18:41:57 +0000 (19:41 +0100)]
weekly back-to-dev release 3.5dev

3 years agoNOBUG: Change travis.yml back to master
Eloy Lafuente (stronk7) [Sat, 11 Nov 2017 18:31:19 +0000 (19:31 +0100)]
NOBUG: Change travis.yml back to master

3 years agoMoodle release 3.4 v3.4.0
Eloy Lafuente (stronk7) [Sat, 11 Nov 2017 18:31:18 +0000 (19:31 +0100)]
Moodle release 3.4

3 years agoNOBUG: Change travis.yml to MOODLE_34_STABLE
Eloy Lafuente (stronk7) [Sat, 11 Nov 2017 18:31:18 +0000 (19:31 +0100)]
NOBUG: Change travis.yml to MOODLE_34_STABLE

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Sat, 11 Nov 2017 18:31:14 +0000 (19:31 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMerge branch 'MDL-60779-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Sat, 11 Nov 2017 12:03:54 +0000 (13:03 +0100)]
Merge branch 'MDL-60779-master' of git://github.com/junpataleta/moodle

3 years agoMDL-60779 calendar: Pass correct parameters for get_calendar_X_view()
Jun Pataleta [Sat, 11 Nov 2017 09:21:55 +0000 (22:21 +1300)]
MDL-60779 calendar: Pass correct parameters for get_calendar_X_view()

3 years agoAutomatically generated installer lang files
AMOS bot [Sat, 11 Nov 2017 00:05:36 +0000 (00:05 +0000)]
Automatically generated installer lang files

3 years agoMoodle release 3.4rc3 v3.4.0-rc3
David Monllao [Fri, 10 Nov 2017 14:15:37 +0000 (15:15 +0100)]
Moodle release 3.4rc3

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Fri, 10 Nov 2017 14:15:35 +0000 (15:15 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMerge branch 'MDL-60764' of git://github.com/stronk7/moodle
David Monllao [Fri, 10 Nov 2017 09:20:25 +0000 (10:20 +0100)]
Merge branch 'MDL-60764' of git://github.com/stronk7/moodle

3 years agoMDL-60764 versions: remove some outdated releases in requires
Eloy Lafuente (stronk7) [Fri, 10 Nov 2017 08:45:56 +0000 (09:45 +0100)]
MDL-60764 versions: remove some outdated releases in requires

3 years agoMerge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Fri, 10 Nov 2017 05:57:04 +0000 (13:57 +0800)]
Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60763 calendar: Use PHP concat, not JS
Andrew Nicols [Fri, 10 Nov 2017 05:56:21 +0000 (13:56 +0800)]
MDL-60763 calendar: Use PHP concat, not JS

3 years agoMerge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Fri, 10 Nov 2017 05:47:05 +0000 (13:47 +0800)]
Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60763 core_calendar: Deprecate calendar_get_upcoming
Andrew Nicols [Fri, 10 Nov 2017 00:15:08 +0000 (08:15 +0800)]
MDL-60763 core_calendar: Deprecate calendar_get_upcoming

3 years agoMerge branch 'MDL-60771-master' of git://github.com/lameze/moodle
Jun Pataleta [Fri, 10 Nov 2017 05:03:49 +0000 (18:03 +1300)]
Merge branch 'MDL-60771-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-60758_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Fri, 10 Nov 2017 04:21:15 +0000 (17:21 +1300)]
Merge branch 'MDL-60758_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-60749-master' of git://github.com/sarjona/moodle
Damyon Wiese [Fri, 10 Nov 2017 04:05:46 +0000 (12:05 +0800)]
Merge branch 'MDL-60749-master' of git://github.com/sarjona/moodle

3 years agoMerge branch 'MDL-60766-master' of git://github.com/ryanwyllie/moodle
Jun Pataleta [Fri, 10 Nov 2017 04:02:41 +0000 (17:02 +1300)]
Merge branch 'MDL-60766-master' of git://github.com/ryanwyllie/moodle

3 years agoMDL-60771 mod_scorm: typecast score to integer
Simey Lameze [Fri, 10 Nov 2017 04:00:17 +0000 (12:00 +0800)]
MDL-60771 mod_scorm: typecast score to integer

3 years agoMerge branch 'MDL-52838-master' of git://github.com/damyon/moodle
Andrew Nicols [Fri, 10 Nov 2017 03:38:13 +0000 (11:38 +0800)]
Merge branch 'MDL-52838-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-60765-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Fri, 10 Nov 2017 02:55:09 +0000 (10:55 +0800)]
Merge branch 'MDL-60765-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60675 analytics: Error when selecting invalid insight
Mihail Geshoski [Fri, 10 Nov 2017 02:43:51 +0000 (10:43 +0800)]
MDL-60675 analytics: Error when selecting invalid insight

3 years agoMDL-60765 theme: Make inplace-autocomplete rule more specific
Andrew Nicols [Fri, 10 Nov 2017 02:26:04 +0000 (10:26 +0800)]
MDL-60765 theme: Make inplace-autocomplete rule more specific

This change was intended to fix an issue with the autocomplete in RTL,
but was applied to all inplace-editables.

3 years agoMDL-52838 workshop: Each criterion > 0 levels
Damyon Wiese [Fri, 10 Nov 2017 02:20:00 +0000 (10:20 +0800)]
MDL-52838 workshop: Each criterion > 0 levels

Add validation to the edit assessment form so each criterion in a rubric requires at least one level.

3 years agoMDL-60766 block_calendar_upcoming: stop summary modal not logged in
Ryan Wyllie [Fri, 10 Nov 2017 02:20:32 +0000 (02:20 +0000)]
MDL-60766 block_calendar_upcoming: stop summary modal not logged in

Stopped the JS from running on the block when the user is not logged in
because it attempts to load a summary modal when an event is clicked on
which results in a failed call to a webservice.

3 years agoMDL-60763 core_calendar: Revert removal of calendar_get_upcoming
Andrew Nicols [Fri, 10 Nov 2017 02:10:53 +0000 (10:10 +0800)]
MDL-60763 core_calendar: Revert removal of calendar_get_upcoming

This reverts part of commit 522b84be04a7551fa7de64a0db460268dc5c4a2a.

3 years agoMDL-60766 block_calendar_month: hide nav when not logged in
Ryan Wyllie [Fri, 10 Nov 2017 02:07:50 +0000 (02:07 +0000)]
MDL-60766 block_calendar_month: hide nav when not logged in

3 years ago MDL-60764 versions: main version bump
Eloy Lafuente (stronk7) [Fri, 10 Nov 2017 01:56:14 +0000 (02:56 +0100)]
 MDL-60764 versions: main version bump

3 years agoMDL-60764 versions: bump all versions and requires near release
Eloy Lafuente (stronk7) [Fri, 10 Nov 2017 01:52:53 +0000 (02:52 +0100)]
MDL-60764 versions: bump all versions and requires near release

version = 2017111300 release version
requires= 2017110800 current rc2 version

3 years agoMerge branch 'MDL-60760_master' of git://github.com/dmonllao/moodle
Jake Dallimore [Fri, 10 Nov 2017 01:31:17 +0000 (09:31 +0800)]
Merge branch 'MDL-60760_master' of git://github.com/dmonllao/moodle

3 years agoMDL-60763 core_calendar: Revert removal of calendar_get_upcoming
Andrew Nicols [Fri, 10 Nov 2017 00:11:36 +0000 (08:11 +0800)]
MDL-60763 core_calendar: Revert removal of calendar_get_upcoming

Revert "MDL-60092 core_calendar: remove unused calendar_get_upcoming method"

This reverts commit 4259387ebb7ce04d3adafc61f0c7d70525eeddf3.

3 years agoMDL-60758 tool_analytics: Skip guess start if higher than guess end
David Monllao [Thu, 9 Nov 2017 12:21:11 +0000 (13:21 +0100)]
MDL-60758 tool_analytics: Skip guess start if higher than guess end

3 years agoMDL-60760 tool_analytics: No onlycli link for managers
David Monllao [Thu, 9 Nov 2017 16:00:33 +0000 (17:00 +0100)]
MDL-60760 tool_analytics: No onlycli link for managers

3 years agoMDL-60749 scorm: Remove   from files when downloading
Sara Arjona [Thu, 9 Nov 2017 09:14:54 +0000 (10:14 +0100)]
MDL-60749 scorm: Remove   from files when downloading

3 years agoMDL-60550 user: Add more restrictions in keyword searches
Sara Arjona [Mon, 30 Oct 2017 07:43:01 +0000 (08:43 +0100)]
MDL-60550 user: Add more restrictions in keyword searches

Original patch provided by Tim Schroeder.

3 years agoMerge branch 'MDL-60718-master' of git://github.com/sarjona/moodle
David Monllao [Thu, 9 Nov 2017 08:27:01 +0000 (09:27 +0100)]
Merge branch 'MDL-60718-master' of git://github.com/sarjona/moodle

3 years agoMerge branch 'MDL-60615-master' of git://github.com/damyon/moodle
David Monllao [Thu, 9 Nov 2017 07:48:48 +0000 (08:48 +0100)]
Merge branch 'MDL-60615-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-60752-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Thu, 9 Nov 2017 07:08:11 +0000 (15:08 +0800)]
Merge branch 'MDL-60752-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60615 imscc: string to array fix
Damyon Wiese [Tue, 7 Nov 2017 07:49:01 +0000 (15:49 +0800)]
MDL-60615 imscc: string to array fix

Sloppy typing in the imscc converter is causing errors on php7.1

Variable is initialised as a string and then used as an array.

3 years agoMerge branch 'MDL-60753_master' of git://github.com/markn86/moodle
Jake Dallimore [Thu, 9 Nov 2017 06:47:23 +0000 (14:47 +0800)]
Merge branch 'MDL-60753_master' of git://github.com/markn86/moodle

3 years agoMDL-60752 lti: Compare text in types_config properly
Andrew Nicols [Thu, 9 Nov 2017 04:53:07 +0000 (12:53 +0800)]
MDL-60752 lti: Compare text in types_config properly

3 years agoMDL-60753 report_competency: fixed dialogue failing to show
Mark Nelson [Thu, 9 Nov 2017 06:08:24 +0000 (14:08 +0800)]
MDL-60753 report_competency: fixed dialogue failing to show

3 years agoMerge branch 'MDL-60628-master' of git://github.com/lameze/moodle
Jun Pataleta [Thu, 9 Nov 2017 04:08:46 +0000 (17:08 +1300)]
Merge branch 'MDL-60628-master' of git://github.com/lameze/moodle

3 years agoMDL-60628 calendar: amend web service unit test
Simey Lameze [Tue, 7 Nov 2017 00:39:47 +0000 (08:39 +0800)]
MDL-60628 calendar: amend web service unit test

3 years agoMDL-60628 calendar: support category events on get_calendar_events ws
Simey Lameze [Tue, 7 Nov 2017 00:39:03 +0000 (08:39 +0800)]
MDL-60628 calendar: support category events on get_calendar_events ws

3 years agoMerge branch 'MDL-60579-master-fix2' of https://github.com/damyon/moodle
Andrew Nicols [Thu, 9 Nov 2017 03:18:14 +0000 (11:18 +0800)]
Merge branch 'MDL-60579-master-fix2' of https://github.com/damyon/moodle

3 years agoMDL-60579 user: Don't lose text filters
Damyon Wiese [Thu, 9 Nov 2017 03:04:32 +0000 (11:04 +0800)]
MDL-60579 user: Don't lose text filters

When replacing a group filter with a different group filter - don't forget all the current text filters that have
been applied.

3 years agoMDL-60579 user: Move defines into library
Damyon Wiese [Thu, 9 Nov 2017 03:02:14 +0000 (11:02 +0800)]
MDL-60579 user: Move defines into library

Entry page user/index.php was defining constants that were used by the renderer.
This means the renderer was tied to user/index.php.

3 years agoMDL-60579 user: Correct PARAM type for filters
Andrew Nicols [Thu, 9 Nov 2017 02:07:10 +0000 (10:07 +0800)]
MDL-60579 user: Correct PARAM type for filters

Damyon pointed out during the integration of this fixset, that the
PARAM type is incorrect.

3 years agoMDL-60579 user: Add missing case breaks
Andrew Nicols [Thu, 9 Nov 2017 01:07:34 +0000 (09:07 +0800)]
MDL-60579 user: Add missing case breaks

3 years agoMDL-60579 user: Correct search for strings
Andrew Nicols [Thu, 9 Nov 2017 01:07:21 +0000 (09:07 +0800)]
MDL-60579 user: Correct search for strings

3 years agoMDL-60579 user: Check filter strings have correct part count
Andrew Nicols [Thu, 9 Nov 2017 01:07:02 +0000 (09:07 +0800)]
MDL-60579 user: Check filter strings have correct part count

3 years agoMDL-60579 user: Prevent behat from interacting til setup complete
Andrew Nicols [Thu, 9 Nov 2017 01:05:22 +0000 (09:05 +0800)]
MDL-60579 user: Prevent behat from interacting til setup complete

3 years agoMDL-60707 core_search: In tests, use faked time for indexing length
Adam Olley [Mon, 6 Nov 2017 13:54:51 +0000 (00:24 +1030)]
MDL-60707 core_search: In tests, use faked time for indexing length

Without this change its possible that the unit tests will fail at any time.
Before this change the indexing time is measured by real-time, not fake time,
making all index timings 0.

This happens as PHP offers no guarantee around the sort-order of an array for
any given two members that equate as equal. It just happens to pass for the
current array of search areas in vanilla Moodle.

3 years agoAutomatically generated installer lang files
AMOS bot [Thu, 9 Nov 2017 00:05:00 +0000 (00:05 +0000)]
Automatically generated installer lang files

3 years agoMDL-60718 analytics: Avoid duplicates for users with 2 enrolments
Sara Arjona [Wed, 8 Nov 2017 08:55:06 +0000 (09:55 +0100)]
MDL-60718 analytics: Avoid duplicates for users with 2 enrolments

3 years agoMerge branch 'MDL-60732-master' of git://github.com/damyon/moodle
David Monllao [Wed, 8 Nov 2017 16:48:07 +0000 (17:48 +0100)]
Merge branch 'MDL-60732-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-60720-master' of https://github.com/sammarshallou/moodle
David Monllao [Wed, 8 Nov 2017 16:27:15 +0000 (17:27 +0100)]
Merge branch 'MDL-60720-master' of https://github.com/sammarshallou/moodle

3 years agoMerge branch 'MDL-58699-master' of git://github.com/damyon/moodle
David Monllao [Wed, 8 Nov 2017 14:56:25 +0000 (15:56 +0100)]
Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle

3 years agoMDL-60741 purgecaches: did not correctly setup the admin page
Tim Hunt [Wed, 8 Nov 2017 14:30:27 +0000 (14:30 +0000)]
MDL-60741 purgecaches: did not correctly setup the admin page

Note that, admin_externalpage_setup does the right capability check.

3 years agoMerge branch 'MDL-60579-master' of https://github.com/mihailges/moodle
David Monllao [Wed, 8 Nov 2017 11:16:20 +0000 (12:16 +0100)]
Merge branch 'MDL-60579-master' of https://github.com/mihailges/moodle

3 years agoMDL-60733 oauth: Remove outdated comment
David Monllao [Wed, 8 Nov 2017 11:04:31 +0000 (12:04 +0100)]
MDL-60733 oauth: Remove outdated comment

3 years agoMerge branch 'MDL-60733-master' of git://github.com/damyon/moodle
David Monllao [Wed, 8 Nov 2017 11:03:43 +0000 (12:03 +0100)]
Merge branch 'MDL-60733-master' of git://github.com/damyon/moodle

3 years agoMoodle release 3.4rc2 v3.4.0-rc2
David Monllao [Wed, 8 Nov 2017 08:47:39 +0000 (09:47 +0100)]
Moodle release 3.4rc2

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Wed, 8 Nov 2017 08:47:38 +0000 (09:47 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMDL-60732 core_user: Show group filters
Damyon Wiese [Wed, 8 Nov 2017 05:41:49 +0000 (13:41 +0800)]
MDL-60732 core_user: Show group filters

Always show the group filters, even if the course is in NO_GROUPS mode.

3 years agoMerge branch 'MDL-60590-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 8 Nov 2017 07:46:44 +0000 (15:46 +0800)]
Merge branch 'MDL-60590-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60733 core: B/C for google_oauth
Damyon Wiese [Wed, 8 Nov 2017 07:14:22 +0000 (15:14 +0800)]
MDL-60733 core: B/C for google_oauth

The google_oauth class extends oauth2client which was modified to send "Accept" headers.

The "Accept" headers break picasa and could break any other plugin that was using google_oauth.

3 years agoMDL-60590 enrol_manual: Fix for race condition in button calculation
Andrew Nicols [Wed, 8 Nov 2017 07:15:17 +0000 (15:15 +0800)]
MDL-60590 enrol_manual: Fix for race condition in button calculation

3 years agoMerge branch 'MDL-60700-master-fix' of git://github.com/andrewnicols/moodle
Jun Pataleta [Wed, 8 Nov 2017 02:17:25 +0000 (15:17 +1300)]
Merge branch 'MDL-60700-master-fix' of git://github.com/andrewnicols/moodle

3 years agoMDL-60700 calendar: Update behat test or new normal
Andrew Nicols [Wed, 8 Nov 2017 02:10:29 +0000 (10:10 +0800)]
MDL-60700 calendar: Update behat test or new normal

3 years agoMerge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle
Jun Pataleta [Wed, 8 Nov 2017 01:43:15 +0000 (14:43 +1300)]
Merge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle

3 years agoAutomatically generated installer lang files
AMOS bot [Wed, 8 Nov 2017 00:05:03 +0000 (00:05 +0000)]
Automatically generated installer lang files

3 years agoMDL-60717 lang: Reflect the string change in behat scenario file
David Mudrák [Tue, 7 Nov 2017 20:49:18 +0000 (21:49 +0100)]
MDL-60717 lang: Reflect the string change in behat scenario file

3 years agoMDL-60717 lang: Merge English strings from the en_fix language pack
Helen Foster [Tue, 7 Nov 2017 20:29:50 +0000 (21:29 +0100)]
MDL-60717 lang: Merge English strings from the en_fix language pack

Significant string changes:

- needbcmath,auth_ldap - 'grace logins' changed to 'expired password
  checking'