moodle.git
3 years agoMerge branch 'MDL-19667-master-viewuserreport' of https://github.com/dmitriim/moodle
Andrew Nicols [Tue, 19 Dec 2017 03:49:33 +0000 (11:49 +0800)]
Merge branch 'MDL-19667-master-viewuserreport' of https://github.com/dmitriim/moodle

3 years agoMerge branch 'MDL-60767-master-3' of https://github.com/snake/moodle
Damyon Wiese [Tue, 19 Dec 2017 03:12:47 +0000 (11:12 +0800)]
Merge branch 'MDL-60767-master-3' of https://github.com/snake/moodle

3 years agoMerge branch 'MDL-59999-master' of git://github.com/mihailges/moodle
Damyon Wiese [Tue, 19 Dec 2017 02:49:36 +0000 (10:49 +0800)]
Merge branch 'MDL-59999-master' of git://github.com/mihailges/moodle

3 years agoMerge branch 'MDL-59709_master' of https://github.com/marcusfabriczy/moodle
Jun Pataleta [Tue, 19 Dec 2017 00:21:35 +0000 (13:21 +1300)]
Merge branch 'MDL-59709_master' of https://github.com/marcusfabriczy/moodle

3 years agoMerge branch 'MDL-59200-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 19 Dec 2017 00:08:15 +0000 (01:08 +0100)]
Merge branch 'MDL-59200-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-58888-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 19 Dec 2017 00:04:54 +0000 (01:04 +0100)]
Merge branch 'MDL-58888-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-60750-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 18 Dec 2017 23:56:14 +0000 (00:56 +0100)]
Merge branch 'MDL-60750-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'wip-MDL-60594-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 18 Dec 2017 23:36:28 +0000 (00:36 +0100)]
Merge branch 'wip-MDL-60594-master' of git://github.com/marinaglancy/moodle

3 years agoMerge branch 'MDL-60036-fix-string-online_user_block' of https://github.com/DSI-Unive...
Eloy Lafuente (stronk7) [Mon, 18 Dec 2017 23:26:31 +0000 (00:26 +0100)]
Merge branch 'MDL-60036-fix-string-online_user_block' of https://github.com/DSI-Universite-Rennes2/moodle

3 years agoMerge branch 'm35_MDL-60793_Mod_Chat_Reserved_Words_In_MySQL8p0p3_And_Above' of https...
Jun Pataleta [Mon, 18 Dec 2017 23:23:18 +0000 (12:23 +1300)]
Merge branch 'm35_MDL-60793_Mod_Chat_Reserved_Words_In_MySQL8p0p3_And_Above' of https://github.com/scara/moodle

3 years agoMDL-43466 mod_assign: fix corresponding behat tests
Eloy Lafuente (stronk7) [Mon, 18 Dec 2017 23:10:13 +0000 (00:10 +0100)]
MDL-43466 mod_assign: fix corresponding behat tests

3 years agoMerge branch 'MDL-43466_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 18 Dec 2017 22:57:27 +0000 (23:57 +0100)]
Merge branch 'MDL-43466_master' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-60653-master' of git://github.com/rezaies/moodle
David Monllao [Mon, 18 Dec 2017 16:59:32 +0000 (17:59 +0100)]
Merge branch 'MDL-60653-master' of git://github.com/rezaies/moodle

3 years agoMerge branch 'MDL-61042-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 18 Dec 2017 16:26:48 +0000 (17:26 +0100)]
Merge branch 'MDL-61042-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-61040-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 18 Dec 2017 16:24:52 +0000 (17:24 +0100)]
Merge branch 'MDL-61040-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'wip-MDL-60161-master-test' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Mon, 18 Dec 2017 15:09:51 +0000 (16:09 +0100)]
Merge branch 'wip-MDL-60161-master-test' of git://github.com/abgreeve/moodle

3 years agoMDL-60793 mod_chat: Renamed 'system' into 'issystem'
Matteo Scaramuccia [Mon, 13 Nov 2017 23:24:29 +0000 (00:24 +0100)]
MDL-60793 mod_chat: Renamed 'system' into 'issystem'

'system' is now a reserved word in MySQL 8.0.3+.

3 years agoMerge branch 'MDL-31521-master' of https://github.com/lucaboesch/moodle
David Monllao [Mon, 18 Dec 2017 12:14:22 +0000 (13:14 +0100)]
Merge branch 'MDL-31521-master' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'MDL-56932-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 18 Dec 2017 10:40:17 +0000 (11:40 +0100)]
Merge branch 'MDL-56932-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-60858-master' of git://github.com/ryanwyllie/moodle
David Monllao [Mon, 18 Dec 2017 10:34:47 +0000 (11:34 +0100)]
Merge branch 'MDL-60858-master' of git://github.com/ryanwyllie/moodle

3 years agoMerge branch 'MDL-61022-master' of git://github.com/damyon/moodle
David Monllao [Mon, 18 Dec 2017 09:21:26 +0000 (10:21 +0100)]
Merge branch 'MDL-61022-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'wip-MDL-52100-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 18 Dec 2017 09:07:46 +0000 (10:07 +0100)]
Merge branch 'wip-MDL-52100-master' of git://github.com/abgreeve/moodle

3 years agoMerge branch 'MDL-42676-master' of git://github.com/zig-moodle/moodle
Andrew Nicols [Mon, 18 Dec 2017 07:08:37 +0000 (15:08 +0800)]
Merge branch 'MDL-42676-master' of git://github.com/zig-moodle/moodle

3 years agoMerge branch 'MDL-60061-master' of git://github.com/lameze/moodle
Andrew Nicols [Mon, 18 Dec 2017 06:03:47 +0000 (14:03 +0800)]
Merge branch 'MDL-60061-master' of git://github.com/lameze/moodle

3 years agoMDL-52100 filelib: Update to unit tests for maxbytes.
Adrian Greeve [Mon, 18 Dec 2017 05:01:08 +0000 (13:01 +0800)]
MDL-52100 filelib: Update to unit tests for maxbytes.

3 years agoMDL-52100 filelib: Files that are oversized are checked with user.
Adrian Greeve [Mon, 18 Dec 2017 03:32:10 +0000 (11:32 +0800)]
MDL-52100 filelib: Files that are oversized are checked with user.

Files that are oversized could have been uploaded by a user who
can ignore the file size limits. These files should not be deleted
in these situations.

3 years agoMerge branch 'MDL-34389-subcategories-for-category-changer' of https://github.com...
Damyon Wiese [Mon, 18 Dec 2017 04:56:58 +0000 (12:56 +0800)]
Merge branch 'MDL-34389-subcategories-for-category-changer' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'MDL-57431-master' of git://github.com/lameze/moodle
Damyon Wiese [Mon, 18 Dec 2017 04:51:33 +0000 (12:51 +0800)]
Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-54967-master' of git://github.com/zig-moodle/moodle
Damyon Wiese [Mon, 18 Dec 2017 04:43:50 +0000 (12:43 +0800)]
Merge branch 'MDL-54967-master' of git://github.com/zig-moodle/moodle

3 years agoMerge branch 'wip-MDL-49995-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 18 Dec 2017 03:35:29 +0000 (11:35 +0800)]
Merge branch 'wip-MDL-49995-master' of git://github.com/marinaglancy/moodle

3 years agoMerge branch 'MDL-57564-master-courseorder' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Mon, 18 Dec 2017 03:04:20 +0000 (11:04 +0800)]
Merge branch 'MDL-57564-master-courseorder' of git://github.com/mudrd8mz/moodle

3 years agoMDL-60767 admin: fix usage of admin_write_settings
Jake Dallimore [Wed, 6 Dec 2017 01:07:25 +0000 (09:07 +0800)]
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!

3 years agoMDL-59999 lesson: Boost grade essays page not indicating grade status
Mihail Geshoski [Mon, 18 Dec 2017 01:12:29 +0000 (09:12 +0800)]
MDL-59999 lesson: Boost grade essays page not indicating grade status

AMOS BEGIN
    CPY [graded,assign],[graded,lesson]
    CPY [notgraded,assign],[notgraded,lesson]
AMOS END

3 years agoMDL-60036 block_online_users: complete string about online users
Julien Boulen [Fri, 15 Dec 2017 08:36:04 +0000 (09:36 +0100)]
MDL-60036 block_online_users: complete string about online users

- add 3 varations of "x online users" string
- change string format from "x minutes: x online users" to "x online users (x minutes)"
- factorize some duplicated code

3 years agoMDL-61042 mod_lesson: Initialise pageid variable
Jun Pataleta [Fri, 15 Dec 2017 04:36:16 +0000 (17:36 +1300)]
MDL-61042 mod_lesson: Initialise pageid variable

3 years agoMDL-58888 mod_choice: Sort choice_get_my_response() results by optionid
Jun Pataleta [Fri, 15 Dec 2017 02:55:48 +0000 (15:55 +1300)]
MDL-58888 mod_choice: Sort choice_get_my_response() results by optionid

3 years agoMDL-58888 mod_choice: Verify sorting when testing multiple selections
Jun Pataleta [Fri, 15 Dec 2017 02:53:11 +0000 (15:53 +1300)]
MDL-58888 mod_choice: Verify sorting when testing multiple selections

* Improve test_choice_get_my_response() to verify the sorting of the
  responses returned by choice_get_my_response().
* Fix correct usage of choice_get_my_response().

3 years agoMDL-54967 backup: Fix IMS CC import URL decoding for XML format
Zig Tan [Fri, 15 Dec 2017 01:19:26 +0000 (09:19 +0800)]
MDL-54967 backup: Fix IMS CC import URL decoding for XML format

HTML encoding special characters to avoid XML compatibility issues during
Course backup restoration and avoid double encoding.

3 years agoMDL-61040 mod_choice: Save my choice button needs some space
Jun Pataleta [Fri, 15 Dec 2017 00:06:14 +0000 (13:06 +1300)]
MDL-61040 mod_choice: Save my choice button needs some space

3 years agoMDL-60793 core_ddl: Added the new MySQL 8 reserved words
Matteo Scaramuccia [Mon, 13 Nov 2017 22:26:08 +0000 (23:26 +0100)]
MDL-60793 core_ddl: Added the new MySQL 8 reserved words

3 years agoMDL-31521 questions: Allow more than one unit with multiplier equal to 1
Luca Bösch [Wed, 22 Nov 2017 23:06:33 +0000 (00:06 +0100)]
MDL-31521 questions: Allow more than one unit with multiplier equal to 1

3 years agoMDL-34389 course: switch to subcategory w/ course:changecategory perms
Luca Bösch [Thu, 16 Nov 2017 23:09:59 +0000 (00:09 +0100)]
MDL-34389 course: switch to subcategory w/ course:changecategory perms

3 years agoweekly release 3.5dev
Eloy Lafuente (stronk7) [Thu, 14 Dec 2017 13:47:29 +0000 (14:47 +0100)]
weekly release 3.5dev

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 14 Dec 2017 13:47:27 +0000 (14:47 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMDL-19667 report: Add a new capability to view user outline report
Dmitrii Metelkin [Thu, 14 Dec 2017 05:16:04 +0000 (16:16 +1100)]
MDL-19667 report: Add a new capability to view user outline report

3 years agoAutomatically generated installer lang files
AMOS bot [Thu, 14 Dec 2017 00:06:01 +0000 (00:06 +0000)]
Automatically generated installer lang files

3 years agoMDL-43466 mod_assign: improve submission help text
Mark Nelson [Wed, 13 Dec 2017 07:25:36 +0000 (15:25 +0800)]
MDL-43466 mod_assign: improve submission help text

Thanks go to Rajneel Totaram for the report.

3 years agoMDL-31436 registration: do not send false in update request
Marina Glancy [Wed, 13 Dec 2017 04:36:57 +0000 (12:36 +0800)]
MDL-31436 registration: do not send false in update request

3 years agoMDL-61022 recyclebin: Verify groups are restored
Damyon Wiese [Wed, 13 Dec 2017 05:34:07 +0000 (13:34 +0800)]
MDL-61022 recyclebin: Verify groups are restored

3 years agoMDL-60858 feedback: update behat tests for lang string change
Ryan Wyllie [Wed, 13 Dec 2017 05:07:19 +0000 (05:07 +0000)]
MDL-60858 feedback: update behat tests for lang string change

3 years agoMDL-60858 feedback: remove ellipsis from form lang strings
Ryan Wyllie [Wed, 13 Dec 2017 03:33:55 +0000 (03:33 +0000)]
MDL-60858 feedback: remove ellipsis from form lang strings

Remove the trailing ellipsis from the complete_the_form and
continue_the_form lang strings.

3 years agoMDL-60858 feedback: add button style for "Answer the questions" link.
Mitsuhiro Yoshida [Wed, 22 Nov 2017 20:22:56 +0000 (05:22 +0900)]
MDL-60858 feedback: add button style for "Answer the questions" link.

3 years agoMerge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle
Damyon Wiese [Wed, 13 Dec 2017 03:30:46 +0000 (11:30 +0800)]
Merge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle

3 years agoMDL-60964 calendar: lazy load context for calendar_event
Ryan Wyllie [Fri, 24 Nov 2017 06:33:41 +0000 (06:33 +0000)]
MDL-60964 calendar: lazy load context for calendar_event

Stop loading the context in the constructor if it hasn't been provided.
There is no need to load it by default. We should lazily load it when it
is required.

3 years agoMDL-60161 filelib: Unit test for duplicate curl headers.
Adrian Greeve [Wed, 13 Dec 2017 03:07:13 +0000 (11:07 +0800)]
MDL-60161 filelib: Unit test for duplicate curl headers.

3 years agoMDL-60161 class curl in filelib: Cleaned up doc block.
Carson Tam [Mon, 27 Nov 2017 22:47:53 +0000 (14:47 -0800)]
MDL-60161 class curl in filelib: Cleaned up doc block.

3 years agoMDL-60161 class curl in filelib: Avoid duplicate params in http header
Carson Tam [Thu, 28 Sep 2017 15:46:31 +0000 (08:46 -0700)]
MDL-60161 class curl in filelib: Avoid duplicate params in http header

3 years agoMDL-56932 theme_boost: fix quiz max mark input height
Simey Lameze [Mon, 11 Dec 2017 03:22:52 +0000 (11:22 +0800)]
MDL-56932 theme_boost: fix quiz max mark input height

3 years agoMDL-60061 mod_scorm: add unit tests for drag/drop
Simey Lameze [Mon, 27 Nov 2017 07:10:56 +0000 (15:10 +0800)]
MDL-60061 mod_scorm: add unit tests for drag/drop

3 years agoMDL-60061 mod_scorm: add support for drag/drop events
Simey Lameze [Mon, 27 Nov 2017 07:10:33 +0000 (15:10 +0800)]
MDL-60061 mod_scorm: add support for drag/drop events

AMOS BEGIN
CPY [openafterclose,mod_choice],[openafterclose,mod_scorm]
AMOS END

3 years agoMerge branch 'MDL-60759_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Tue, 12 Dec 2017 07:14:03 +0000 (20:14 +1300)]
Merge branch 'MDL-60759_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-58200-master' of git://github.com/damyon/moodle
Jun Pataleta [Tue, 12 Dec 2017 06:13:32 +0000 (19:13 +1300)]
Merge branch 'MDL-58200-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-59970-master' of git://github.com/damyon/moodle
Jun Pataleta [Tue, 12 Dec 2017 05:52:49 +0000 (18:52 +1300)]
Merge branch 'MDL-59970-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-59866' of https://github.com/marcusboon/moodle
Andrew Nicols [Tue, 12 Dec 2017 05:46:07 +0000 (13:46 +0800)]
Merge branch 'MDL-59866' of https://github.com/marcusboon/moodle

3 years agoMerge branch 'wip-MDL-56864-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 12 Dec 2017 05:36:32 +0000 (13:36 +0800)]
Merge branch 'wip-MDL-56864-master' of git://github.com/marinaglancy/moodle

3 years agoMerge branch 'MDL-59438-master' of git://github.com/rezaies/moodle
Damyon Wiese [Tue, 12 Dec 2017 04:56:19 +0000 (12:56 +0800)]
Merge branch 'MDL-59438-master' of git://github.com/rezaies/moodle

3 years agoMerge branch 'MDL-44660-master' of https://github.com/lucaboesch/moodle
Damyon Wiese [Tue, 12 Dec 2017 04:49:46 +0000 (12:49 +0800)]
Merge branch 'MDL-44660-master' of https://github.com/lucaboesch/moodle

3 years agoMDL-59866 session: Add retry for redis sessions
Marcus Boon [Thu, 13 Jul 2017 04:44:29 +0000 (14:44 +1000)]
MDL-59866 session: Add retry for redis sessions

There is an edge case whereby redis will fail
to accept connections on the first try but
retrying the connection seems to make it work

Included in this commit:
* Retry functionality in the session init

3 years agoMerge branch 'MDL-60861-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 12 Dec 2017 04:38:11 +0000 (12:38 +0800)]
Merge branch 'MDL-60861-master' of git://github.com/ankitagarwal/moodle

3 years agoMDL-60653 Navigation: Fixed loose string comparison.
Tyler Bannister [Wed, 1 Nov 2017 17:24:06 +0000 (13:24 -0400)]
MDL-60653 Navigation: Fixed loose string comparison.

The previous comparison would sometimes evaluate to true when the
navigation key was not a string.

3 years agoMerge branch 'master_MDL-60979' of https://github.com/danmarsden/moodle
Damyon Wiese [Tue, 12 Dec 2017 04:27:12 +0000 (12:27 +0800)]
Merge branch 'master_MDL-60979' of https://github.com/danmarsden/moodle

3 years agoMerge branch 'MDL-58058-master' of git://github.com/lameze/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:59:50 +0000 (11:59 +0800)]
Merge branch 'MDL-58058-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:39:20 +0000 (11:39 +0800)]
Merge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'MDL-60945' of https://github.com/NeillM/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:31:16 +0000 (11:31 +0800)]
Merge branch 'MDL-60945' of https://github.com/NeillM/moodle

3 years agoMerge branch 'MDL-59766-master' of git://github.com/damyon/moodle
Jun Pataleta [Tue, 12 Dec 2017 03:26:34 +0000 (16:26 +1300)]
Merge branch 'MDL-59766-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:15:03 +0000 (11:15 +0800)]
Merge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60979 cohort: allow description to be used in mustache templates.
Dan Marsden [Wed, 6 Dec 2017 08:26:18 +0000 (21:26 +1300)]
MDL-60979 cohort: allow description to be used in mustache templates.

3 years agoMerge branch 'MDL-60969_master' of git://github.com/markn86/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:08:46 +0000 (11:08 +0800)]
Merge branch 'MDL-60969_master' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-60983' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 12 Dec 2017 02:56:37 +0000 (10:56 +0800)]
Merge branch 'MDL-60983' of git://github.com/timhunt/moodle

3 years agoMerge branch 'MDL-52538-master' of git://github.com/mihailges/moodle
Damyon Wiese [Tue, 12 Dec 2017 02:40:15 +0000 (10:40 +0800)]
Merge branch 'MDL-52538-master' of git://github.com/mihailges/moodle

3 years agoMerge branch 'MDL-44667-master' of https://github.com/snake/moodle
Damyon Wiese [Tue, 12 Dec 2017 02:26:08 +0000 (10:26 +0800)]
Merge branch 'MDL-44667-master' of https://github.com/snake/moodle

3 years agoMerge branch 'MDL-60968-master' of git://github.com/lameze/moodle
Damyon Wiese [Tue, 12 Dec 2017 02:19:00 +0000 (10:19 +0800)]
Merge branch 'MDL-60968-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-60976-master' of https://github.com/matt-catalyst/moodle
Damyon Wiese [Tue, 12 Dec 2017 01:56:20 +0000 (09:56 +0800)]
Merge branch 'MDL-60976-master' of https://github.com/matt-catalyst/moodle

3 years agoMDL-57431 mod_quiz: Quiz editing help icon fix
Mathew May [Mon, 2 Oct 2017 22:05:25 +0000 (11:05 +1300)]
MDL-57431 mod_quiz: Quiz editing help icon fix

3 years agoMDL-60968 auth: Allow more flexibility with mapping attributes
Brendan Heywood [Tue, 5 Dec 2017 06:05:47 +0000 (17:05 +1100)]
MDL-60968 auth: Allow more flexibility with mapping attributes

3 years agoMerge branch 'MDL-60041' of https://github.com/NeillM/moodle
Damyon Wiese [Tue, 12 Dec 2017 01:13:43 +0000 (09:13 +0800)]
Merge branch 'MDL-60041' of https://github.com/NeillM/moodle

3 years agoMDL-42676 mod_assign: Display message fix when using grade override
Zig Tan [Tue, 12 Dec 2017 01:01:23 +0000 (09:01 +0800)]
MDL-42676 mod_assign: Display message fix when using grade override

Logic fix in mod_assign locallib.php to correctly set the submissionlockedstatus,
and added associated unit test in test_grade_submission_override()

3 years agoMerge branch 'MDL-54021-master' of git://github.com/mihailges/moodle
Damyon Wiese [Tue, 12 Dec 2017 00:55:57 +0000 (08:55 +0800)]
Merge branch 'MDL-54021-master' of git://github.com/mihailges/moodle

3 years agoMDL-52538 lesson: Grade info displayed while ongoing score disabled
Mihail Geshoski [Tue, 12 Dec 2017 00:54:51 +0000 (08:54 +0800)]
MDL-52538 lesson: Grade info displayed while ongoing score disabled

3 years agoMDL-60759 search_solr: Solr 7+ compatibility
David Monllao [Fri, 17 Nov 2017 11:10:06 +0000 (12:10 +0100)]
MDL-60759 search_solr: Solr 7+ compatibility

3 years agoMDL-60750 mod_quiz: only apply form css rules on clean theme
Simey Lameze [Mon, 11 Dec 2017 08:56:06 +0000 (16:56 +0800)]
MDL-60750 mod_quiz: only apply form css rules on clean theme

3 years agoMerge branch 'MDL-40790-master' of git://github.com/mihailges/moodle
Damyon Wiese [Mon, 11 Dec 2017 08:55:27 +0000 (16:55 +0800)]
Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle

Conflicts:
theme/boost/scss/moodle/modules.scss

3 years agoMerge branch 'MDL-56197-master' of git://github.com/mihailges/moodle
Damyon Wiese [Mon, 11 Dec 2017 08:47:19 +0000 (16:47 +0800)]
Merge branch 'MDL-56197-master' of git://github.com/mihailges/moodle

3 years agoMDL-60945 Web services: Too many progress records retrieved
Neill Magill [Fri, 1 Dec 2017 14:42:37 +0000 (14:42 +0000)]
MDL-60945 Web services: Too many progress records retrieved

The core_completion_get_activities_completion_status was getting the
progress for all users on the course called, and then discarding all
the records but one.

This change ensures that only progress for the user we are interested in
is retrieved from the database.

This has a side benefit of removing a full table scan from the query
finding the users inside the get_progress_all() method.

3 years agoMDL-60041 dml: MOODLELIB sql file must have Unix line endings
Neill Magill [Wed, 6 Sep 2017 14:04:39 +0000 (15:04 +0100)]
MDL-60041 dml: MOODLELIB sql file must have Unix line endings

If the file does not have Unix line endings then the regular expression
in oci_native_moodle_database::attempt_oci_package_install() does
not split it correctly.

This leads to an invalid package being created in Oracle.

The .gitattribute file changes for oci_native_moodle_package.sql
force it to have Unix style line endings when the branch is checked
out and the file does not already exist.

The file has been modified so that the Unix style line endings are
applied even if the file already exists, for example when pulling in
this change to an existing branch.

3 years agoMDL-56197 lesson: Multichoice answers not on same line as radio button
Mihail Geshoski [Mon, 11 Dec 2017 07:49:24 +0000 (15:49 +0800)]
MDL-56197 lesson: Multichoice answers not on same line as radio button

3 years agoMerge branch 'MDL-58272-master-2' of https://github.com/snake/moodle
Andrew Nicols [Mon, 11 Dec 2017 06:58:14 +0000 (14:58 +0800)]
Merge branch 'MDL-58272-master-2' of https://github.com/snake/moodle

3 years agoMerge branch 'MDL-60057-master' of git://github.com/lameze/moodle
Damyon Wiese [Mon, 11 Dec 2017 06:54:46 +0000 (14:54 +0800)]
Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle

3 years agoMDL-60057 mod_lesson: add unit tests for callbacks
Simey Lameze [Tue, 28 Nov 2017 08:10:46 +0000 (16:10 +0800)]
MDL-60057 mod_lesson: add unit tests for callbacks

3 years agoMDL-60057 mod_lesson: add calendar drag and drop callbacks
Simey Lameze [Tue, 28 Nov 2017 08:00:58 +0000 (16:00 +0800)]
MDL-60057 mod_lesson: add calendar drag and drop callbacks

AMOS BEGIN
        CPY [openafterclose,mod_choice],[openafterclose,mod_lesson]
CPY [closebeforeopen,mod_choice],[closebeforeopen,mod_database]
CPY [openafterclose,mod_choice],[openafterclose,mod_database]
AMOS END