moodle.git
3 years agoMerge branch 'wip-MDL-61629-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Tue, 3 Apr 2018 07:58:26 +0000 (15:58 +0800)]
Merge branch 'wip-MDL-61629-master' of git://github.com/abgreeve/moodle

3 years agoMDL-61629 message_airnotifier: Add privacy files and unit tests.
Adrian Greeve [Mon, 12 Mar 2018 08:10:38 +0000 (16:10 +0800)]
MDL-61629 message_airnotifier: Add privacy files and unit tests.

3 years agoMDL-61256 core_search: Coding style fixes
Andrew Nicols [Tue, 3 Apr 2018 06:36:15 +0000 (14:36 +0800)]
MDL-61256 core_search: Coding style fixes

3 years agoMerge branch 'MDL-61256-master' of https://github.com/sammarshallou/moodle
Andrew Nicols [Tue, 3 Apr 2018 06:23:54 +0000 (14:23 +0800)]
Merge branch 'MDL-61256-master' of https://github.com/sammarshallou/moodle

3 years agoMerge branch 'MDL-61020-master' of git://github.com/rezaies/moodle
Andrew Nicols [Tue, 3 Apr 2018 05:58:03 +0000 (13:58 +0800)]
Merge branch 'MDL-61020-master' of git://github.com/rezaies/moodle

3 years agoMerge branch 'MDL-61766-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Mon, 2 Apr 2018 23:18:20 +0000 (01:18 +0200)]
Merge branch 'MDL-61766-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-61689-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 2 Apr 2018 23:16:27 +0000 (01:16 +0200)]
Merge branch 'MDL-61689-master' of git://github.com/andrewnicols/moodle

3 years ago MDL-61223 course: keep some tests using old values (January 1st 1970)
Eloy Lafuente (stronk7) [Mon, 2 Apr 2018 19:55:08 +0000 (21:55 +0200)]
 MDL-61223 course: keep some tests using old values (January 1st 1970)

3 years agoMDL-61223 course: amend test setup to keep passing and covering case
Eloy Lafuente (stronk7) [Mon, 2 Apr 2018 10:00:54 +0000 (12:00 +0200)]
MDL-61223 course: amend test setup to keep passing and covering case

3 years agoMerge branch 'MDL-61223-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 2 Apr 2018 09:53:10 +0000 (11:53 +0200)]
Merge branch 'MDL-61223-master' of git://github.com/andrewnicols/moodle

3 years agoMerge branch 'MDL-61801-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 2 Apr 2018 09:02:34 +0000 (11:02 +0200)]
Merge branch 'MDL-61801-master' of git://github.com/andrewnicols/moodle

3 years agoMerge branch 'MDL-61574-master' of git://github.com/tallthom/moodle
Andrew Nicols [Sun, 1 Apr 2018 03:49:17 +0000 (11:49 +0800)]
Merge branch 'MDL-61574-master' of git://github.com/tallthom/moodle

3 years agoMDL-61574 mod_lti: removed usage of PHP7 reserved word in namespace
Thom Rawson [Wed, 21 Mar 2018 10:09:46 +0000 (18:09 +0800)]
MDL-61574 mod_lti: removed usage of PHP7 reserved word in namespace

3 years agoMDL-61256 core_search: Support search of section titles, summaries
sam marshall [Mon, 22 Jan 2018 17:35:09 +0000 (17:35 +0000)]
MDL-61256 core_search: Support search of section titles, summaries

3 years agoMDL-61801 core_privacy: Correct bug in unit test provider
Andrew Nicols [Mon, 26 Mar 2018 23:53:53 +0000 (07:53 +0800)]
MDL-61801 core_privacy: Correct bug in unit test provider

3 years agoMDL-61766 xmldb: Handle custom admin path
Jun Pataleta [Tue, 27 Mar 2018 09:12:00 +0000 (17:12 +0800)]
MDL-61766 xmldb: Handle custom admin path

3 years agoweekly release 3.5dev
Jun Pataleta [Thu, 29 Mar 2018 04:55:38 +0000 (12:55 +0800)]
weekly release 3.5dev

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Jun Pataleta [Thu, 29 Mar 2018 04:55:37 +0000 (12:55 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMerge branch 'MDL-53226-master-fix' of git://github.com/junpataleta/moodle
Andrew Nicols [Thu, 29 Mar 2018 04:40:39 +0000 (12:40 +0800)]
Merge branch 'MDL-53226-master-fix' of git://github.com/junpataleta/moodle

3 years agoMDL-53226 search_simpledb: Fix table name in query
Jun Pataleta [Thu, 29 Mar 2018 04:38:06 +0000 (12:38 +0800)]
MDL-53226 search_simpledb: Fix table name in query

3 years agoMerge branch 'MDL-36941_master-fix' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Wed, 28 Mar 2018 15:39:40 +0000 (17:39 +0200)]
Merge branch 'MDL-36941_master-fix' of git://github.com/markn86/moodle

3 years agoMDL-36941 message_popup: do not remove message_popup table
Mark Nelson [Wed, 28 Mar 2018 11:53:21 +0000 (19:53 +0800)]
MDL-36941 message_popup: do not remove message_popup table

This is a partial revert of commit 123631ad4718141627d77027dbef0448bae22ac8.

Most of the logic was NOT reverted, just the part deleting the table was.

Note - this fix was done on integration.git and as a result no
upgrade step was added to re-introduce the table, sorry! This
means for those on integration.git you will have to re-install
your Moodle site so the 'message_popup' table is present.

Please see tracker for comments as to why we need to keep it! :)

3 years agoMerge branch 'MDL-61770-master' of git://github.com/andrewnicols/moodle
Jake Dallimore [Wed, 28 Mar 2018 05:36:55 +0000 (13:36 +0800)]
Merge branch 'MDL-61770-master' of git://github.com/andrewnicols/moodle

3 years agoMerge branch 'MDL-61364-master' of git://github.com/lameze/moodle
Andrew Nicols [Wed, 28 Mar 2018 03:41:36 +0000 (11:41 +0800)]
Merge branch 'MDL-61364-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-61364-master' of git://github.com/lameze/moodle
Andrew Nicols [Wed, 28 Mar 2018 01:18:24 +0000 (09:18 +0800)]
Merge branch 'MDL-61364-master' of git://github.com/lameze/moodle

3 years agoMDL-25617 backup: backup/restore using extra_question_fields
Ngo Nghia [Tue, 20 Dec 2016 00:44:17 +0000 (03:44 +0300)]
MDL-25617 backup: backup/restore using extra_question_fields

3 years agoMerge branch 'MDL-39060-master' of git://github.com/zig-moodle/moodle
Eloy Lafuente (stronk7) [Tue, 27 Mar 2018 11:44:47 +0000 (13:44 +0200)]
Merge branch 'MDL-39060-master' of git://github.com/zig-moodle/moodle

3 years agoMerge branch 'wip-MDL-51362-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 27 Mar 2018 11:35:07 +0000 (13:35 +0200)]
Merge branch 'wip-MDL-51362-master' of git://github.com/marinaglancy/moodle

3 years agoMDL-60736 tool_mobile: Add missing VALUE_OPTIONAL to new returned info
Eloy Lafuente (stronk7) [Tue, 27 Mar 2018 11:31:03 +0000 (13:31 +0200)]
MDL-60736 tool_mobile: Add missing VALUE_OPTIONAL to new returned info

3 years agoMerge branch 'MDL-60736-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 27 Mar 2018 10:47:09 +0000 (12:47 +0200)]
Merge branch 'MDL-60736-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-61321-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 27 Mar 2018 10:44:18 +0000 (12:44 +0200)]
Merge branch 'MDL-61321-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-61718-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 27 Mar 2018 10:38:48 +0000 (12:38 +0200)]
Merge branch 'MDL-61718-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-60762-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Tue, 27 Mar 2018 07:47:58 +0000 (15:47 +0800)]
Merge branch 'MDL-60762-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'wip-MDL-61328-master' of git://github.com/marinaglancy/moodle
Jun Pataleta [Tue, 27 Mar 2018 05:50:22 +0000 (13:50 +0800)]
Merge branch 'wip-MDL-61328-master' of git://github.com/marinaglancy/moodle

3 years agoMerge branch 'MDL-61257-master' of git://github.com/mihailges/moodle
Jun Pataleta [Tue, 27 Mar 2018 04:59:16 +0000 (12:59 +0800)]
Merge branch 'MDL-61257-master' of git://github.com/mihailges/moodle

3 years agoMerge branch 'MDL-61656' of git://github.com/stronk7/moodle
Jun Pataleta [Tue, 27 Mar 2018 04:13:27 +0000 (12:13 +0800)]
Merge branch 'MDL-61656' of git://github.com/stronk7/moodle

3 years agoMerge branch 'MDL-53226-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 28 Mar 2018 16:15:52 +0000 (18:15 +0200)]
Merge branch 'MDL-53226-master' of git://github.com/andrewnicols/moodle

3 years agoMerge branch 'MDL-61248' of https://github.com/ak4t0sh/moodle
Eloy Lafuente (stronk7) [Mon, 26 Mar 2018 22:26:34 +0000 (00:26 +0200)]
Merge branch 'MDL-61248' of https://github.com/ak4t0sh/moodle

3 years agoMerge branch 'MDL-61576-master' of git://github.com/cescobedo/moodle
Eloy Lafuente (stronk7) [Mon, 26 Mar 2018 21:19:55 +0000 (23:19 +0200)]
Merge branch 'MDL-61576-master' of git://github.com/cescobedo/moodle

3 years agoMerge branch 'MDL-61691-master' of https://github.com/snake/moodle
Eloy Lafuente (stronk7) [Mon, 26 Mar 2018 21:15:11 +0000 (23:15 +0200)]
Merge branch 'MDL-61691-master' of https://github.com/snake/moodle

3 years agoMerge branch 'MDL-55532-master' of git://github.com/lameze/moodle
Andrew Nicols [Mon, 26 Mar 2018 07:35:29 +0000 (15:35 +0800)]
Merge branch 'MDL-55532-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-61733-master' of https://github.com/MartinGauk/moodle
Andrew Nicols [Mon, 26 Mar 2018 07:01:44 +0000 (15:01 +0800)]
Merge branch 'MDL-61733-master' of https://github.com/MartinGauk/moodle

3 years agoMerge branch 'MDL-60119-master' of https://github.com/lucaboesch/moodle
Andrew Nicols [Mon, 26 Mar 2018 06:36:31 +0000 (14:36 +0800)]
Merge branch 'MDL-60119-master' of https://github.com/lucaboesch/moodle

3 years agoMDL-61770 iplookup: Check types rather than values
Andrew Nicols [Wed, 28 Mar 2018 01:05:23 +0000 (09:05 +0800)]
MDL-61770 iplookup: Check types rather than values

3 years agoMDL-61020 media_videojs: Fix RTL display issues
Shamim Rezaie [Wed, 28 Mar 2018 00:35:34 +0000 (11:35 +1100)]
MDL-61020 media_videojs: Fix RTL display issues

3 years agoMDL-61364 core: fix cibot coding issues
Simey Lameze [Wed, 28 Mar 2018 02:14:48 +0000 (10:14 +0800)]
MDL-61364 core: fix cibot coding issues

3 years agoMDL-61364 core_question: tests for question_has_capability_on exception
Simey Lameze [Tue, 27 Mar 2018 08:47:59 +0000 (16:47 +0800)]
MDL-61364 core_question: tests for question_has_capability_on exception

3 years agoMDL-61364 question: Add unit tests for question_has_capability_on
Andrew Nicols [Tue, 27 Mar 2018 06:47:43 +0000 (14:47 +0800)]
MDL-61364 question: Add unit tests for question_has_capability_on

3 years agoMDL-61364 core: remove param from question_has_capability_on calls
Simey Lameze [Tue, 27 Mar 2018 08:11:13 +0000 (16:11 +0800)]
MDL-61364 core: remove param from question_has_capability_on calls

3 years agoMDL-61364 question: adjust code and fix phpunit errors
Simey Lameze [Mon, 26 Mar 2018 03:31:24 +0000 (11:31 +0800)]
MDL-61364 question: adjust code and fix phpunit errors

3 years agoMDL-61364 question: refactor question_has_capability_on
Simey Lameze [Mon, 26 Mar 2018 03:29:52 +0000 (11:29 +0800)]
MDL-61364 question: refactor question_has_capability_on

3 years agoMDL-60762 tool_usertours: Respect $CFG->admin in manager.php
Adam Pawełczak [Tue, 27 Feb 2018 13:24:32 +0000 (14:24 +0100)]
MDL-60762 tool_usertours: Respect $CFG->admin in manager.php

3 years agoMDL-53226 search_simpledb: Remove unnecessary object clone
David Monllao [Mon, 26 Mar 2018 07:38:37 +0000 (09:38 +0200)]
MDL-53226 search_simpledb: Remove unnecessary object clone

3 years agoMDL-61691 core_plagiarism: fix namespace in privacy provider interface
Jake Dallimore [Tue, 20 Mar 2018 03:48:52 +0000 (11:48 +0800)]
MDL-61691 core_plagiarism: fix namespace in privacy provider interface

3 years agoMDL-61257 reports: Report logs link to unavailable completion report
Mihail Geshoski [Tue, 23 Jan 2018 05:43:34 +0000 (13:43 +0800)]
MDL-61257 reports: Report logs link to unavailable completion report

3 years agoMDL-55532 gradebook: fix grade export to include category names
Nick Phillips [Sun, 14 May 2017 23:55:49 +0000 (11:55 +1200)]
MDL-55532 gradebook: fix grade export to include category names

3 years agoMDL-61364 question: unit tests for submit_tags_form
Ryan Wyllie [Mon, 26 Mar 2018 03:27:47 +0000 (11:27 +0800)]
MDL-61364 question: unit tests for submit_tags_form

3 years agoMDL-61364 question: add support for course tags on modal
Simey Lameze [Mon, 26 Mar 2018 03:24:50 +0000 (11:24 +0800)]
MDL-61364 question: add support for course tags on modal

3 years agoMDL-61328 tool_usertours: do not fix tour sortorder after step editing
Marina Glancy [Thu, 1 Feb 2018 03:47:18 +0000 (11:47 +0800)]
MDL-61328 tool_usertours: do not fix tour sortorder after step editing

otherwise it breaks when we try to modify the step sortorder

3 years agoMDL-39060 backup: fix typo backup destroy() function
Zig Tan [Mon, 26 Mar 2018 01:25:55 +0000 (09:25 +0800)]
MDL-39060 backup: fix typo backup destroy() function

3 years agoAutomatically generated installer lang files
AMOS bot [Sun, 25 Mar 2018 00:06:10 +0000 (00:06 +0000)]
Automatically generated installer lang files

3 years agoMDL-61248 admin: fix incorrectly initialized property
Arnaud Trouvé [Fri, 19 Jan 2018 16:47:54 +0000 (17:47 +0100)]
MDL-61248 admin: fix incorrectly initialized property

3 years agoMDL-61733 atto_table: fix creating new table
Martin Gauk [Fri, 23 Mar 2018 09:08:39 +0000 (09:08 +0000)]
MDL-61733 atto_table: fix creating new table

If Atto is embedded in an HTML table (e.g. in the database activity
on the template pages), you could not create a new table.

3 years agoMDL-36941 core: Remove default for convhash field in upgrade.php
Jun Pataleta [Fri, 23 Mar 2018 06:14:49 +0000 (14:14 +0800)]
MDL-36941 core: Remove default for convhash field in upgrade.php

3 years agoMerge branch 'MDL-36941_master' of git://github.com/markn86/moodle
Jun Pataleta [Fri, 23 Mar 2018 04:55:49 +0000 (12:55 +0800)]
Merge branch 'MDL-36941_master' of git://github.com/markn86/moodle

3 years agoMDL-36941 core_message: dont query DB unnecessarily checking read status
Mark Nelson [Thu, 22 Mar 2018 11:47:12 +0000 (19:47 +0800)]
MDL-36941 core_message: dont query DB unnecessarily checking read status

3 years agoMDL-36941 core_message: fixed minor CiBoT complaints
Mark Nelson [Mon, 12 Mar 2018 05:10:39 +0000 (13:10 +0800)]
MDL-36941 core_message: fixed minor CiBoT complaints

3 years agoMDL-36941 core_message: improved performance of helper::get_messages()
Mark Nelson [Tue, 27 Feb 2018 05:23:53 +0000 (13:23 +0800)]
MDL-36941 core_message: improved performance of helper::get_messages()

Improved the query to use the 'convhash' field as well as adding an index.

Also fixed issue where 'timeread' was hardcoded as 0.

3 years agoMDL-36941 core_message: added details to upgrade.txt
Mark Nelson [Wed, 24 Jan 2018 09:33:24 +0000 (17:33 +0800)]
MDL-36941 core_message: added details to upgrade.txt

3 years agoMDL-36941 core: added index to 'message_user_actions' table
Mark Nelson [Tue, 27 Feb 2018 01:39:51 +0000 (09:39 +0800)]
MDL-36941 core: added index to 'message_user_actions' table

3 years agoMDL-36941 core_message: deprecated 'api::mark_all_read_for_user'
Mark Nelson [Mon, 26 Feb 2018 10:44:02 +0000 (18:44 +0800)]
MDL-36941 core_message: deprecated 'api::mark_all_read_for_user'

3 years agoMDL-36941 core: removed 'message_working' table
Mark Nelson [Mon, 26 Feb 2018 07:46:39 +0000 (15:46 +0800)]
MDL-36941 core: removed 'message_working' table

3 years agoMDL-36941 message_popup: removed 'message_popup' table
Mark Nelson [Tue, 20 Feb 2018 08:27:57 +0000 (16:27 +0800)]
MDL-36941 message_popup: removed 'message_popup' table

3 years agoMDL-36941 core: added 'convhash' field to quickly get conversations
Mark Nelson [Tue, 6 Feb 2018 04:11:48 +0000 (12:11 +0800)]
MDL-36941 core: added 'convhash' field to quickly get conversations

3 years agoMDL-36941 core: final deprecation of functions
Mark Nelson [Thu, 25 Jan 2018 00:54:10 +0000 (08:54 +0800)]
MDL-36941 core: final deprecation of functions

This was done earlier than the usual deprecation
process since we have changed the table structure.
It would take time to change the logic in these
functions, but as they have been deprecated for
some time it was decided to forego this effort.

3 years agoMDL-36941 message_popup: use new WS for marking notifications as read
Mark Nelson [Mon, 5 Feb 2018 06:55:10 +0000 (14:55 +0800)]
MDL-36941 message_popup: use new WS for marking notifications as read

Also changed the observer to listen for the notification_viewed event,
rather than the message_viewed event.

3 years agoMDL-36941 core: added new mark notification as read webservice
Mark Nelson [Mon, 5 Feb 2018 06:54:16 +0000 (14:54 +0800)]
MDL-36941 core: added new mark notification as read webservice

3 years agoMDL-36941 core: added events for notifications
Mark Nelson [Fri, 2 Feb 2018 10:07:01 +0000 (18:07 +0800)]
MDL-36941 core: added events for notifications

3 years agoMDL-36941 core_message: mark notification/messages takes stdClass
Mark Nelson [Mon, 26 Feb 2018 11:10:16 +0000 (19:10 +0800)]
MDL-36941 core_message: mark notification/messages takes stdClass

This avoid unnecessary DB calls.

3 years agoMDL-36941 core: convert existing api to use new table structure
Mark Nelson [Thu, 4 Jan 2018 07:01:37 +0000 (15:01 +0800)]
MDL-36941 core: convert existing api to use new table structure

Also deprecated the following functions -

1. message_move_userfrom_unread2read - It is not necessary
   for us to mark a message as read on user deletion.
2. message_get_blocked_users - Horrible logic used to
   determine if a user is blocked via reference on some
   randomly chosen 'isblocked' variable.
3. message_get_contacts - The same as above. This can be
   done in a much nicer way.
4. message_mark_message_read - We want two functions to do
   this to avoid confusing messages and notifications.
5. message_can_delete_message - This assumed the variable
   $message contained the 'useridto' property, which
   was present in the old table structure. We do not want
   future usages where a query is done on the new table
   and is simply passed as this won't contain this property.
6. message_delete_message - Same as above.

3 years agoMDL-36941 core: alter events to use new table structure
Mark Nelson [Thu, 4 Jan 2018 09:17:55 +0000 (17:17 +0800)]
MDL-36941 core: alter events to use new table structure

3 years agoMDL-36941 core_message: removed unit test that will always fail
Mark Nelson [Thu, 4 Jan 2018 09:17:44 +0000 (17:17 +0800)]
MDL-36941 core_message: removed unit test that will always fail

We are changing how the API behaves so the old tables will never
be populated. This unit test is testing a deprecated function
which we will not be refactoring to use the new table structure.

3 years agoMDL-36941 core: added new messaging and notification tables
Mark Nelson [Thu, 21 Dec 2017 05:28:07 +0000 (13:28 +0800)]
MDL-36941 core: added new messaging and notification tables

3 years agoMDL-60119 mod_feedback: Suppress choice weight in parentheses.
Luca Bösch [Thu, 22 Feb 2018 19:54:34 +0000 (20:54 +0100)]
MDL-60119 mod_feedback: Suppress choice weight in parentheses.

3 years agoweekly release 3.5dev
Eloy Lafuente (stronk7) [Thu, 22 Mar 2018 15:57:05 +0000 (16:57 +0100)]
weekly release 3.5dev

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 22 Mar 2018 15:57:02 +0000 (16:57 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMDL-61576 mod_lti: remove allowinstructorcustom in lib/locallib.php
cescobedo [Thu, 22 Mar 2018 08:59:30 +0000 (09:59 +0100)]
MDL-61576 mod_lti: remove allowinstructorcustom in lib/locallib.php

3 years agoMDL-51362 libraries: Remove deprecated admin tool unittest
Ankit Agarwal [Thu, 11 May 2017 05:16:14 +0000 (10:46 +0530)]
MDL-51362 libraries: Remove deprecated admin tool unittest

3 years agoMDL-61718 admin: Make sure city and country columns are not duplicated
Jun Pataleta [Thu, 22 Mar 2018 05:43:07 +0000 (13:43 +0800)]
MDL-61718 admin: Make sure city and country columns are not duplicated

* Since City/town and Country have been added in $CFG->showuseridentity
since 3.4, we need to exclude the required city and country columns
when fetching the extra columns using get_extra_user_fields().

3 years agoMerge branch 'MDL-61678' of git://github.com/stronk7/moodle
Jun Pataleta [Thu, 22 Mar 2018 04:33:24 +0000 (12:33 +0800)]
Merge branch 'MDL-61678' of git://github.com/stronk7/moodle

3 years agoMerge branch 'MDL-58179-master-fix' of https://github.com/andrewnicols/moodle
Jake Dallimore [Thu, 22 Mar 2018 04:05:29 +0000 (12:05 +0800)]
Merge branch 'MDL-58179-master-fix' of https://github.com/andrewnicols/moodle

3 years agoMDL-58179 mod_lesson: Add missing : in labels
Andrew Nicols [Wed, 21 Mar 2018 04:11:11 +0000 (12:11 +0800)]
MDL-58179 mod_lesson: Add missing : in labels

3 years agoMerge branch 'MDL-61530-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 22 Mar 2018 03:49:09 +0000 (11:49 +0800)]
Merge branch 'MDL-61530-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-61530 mod_glossary: import_entries.feature needs @_file_upload tag
Renaat Debleu [Mon, 12 Mar 2018 19:21:36 +0000 (20:21 +0100)]
MDL-61530 mod_glossary: import_entries.feature needs @_file_upload tag

3 years agoMerge branch 'MDL-52989-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Thu, 22 Mar 2018 03:29:56 +0000 (11:29 +0800)]
Merge branch 'MDL-52989-master' of git://github.com/junpataleta/moodle

3 years agoMDL-52989 mod_lesson: Fix typo in feature description
Jun Pataleta [Thu, 22 Mar 2018 03:27:24 +0000 (11:27 +0800)]
MDL-52989 mod_lesson: Fix typo in feature description

3 years agoMerge branch 'MDL-61514-master' of git://github.com/rezaies/moodle
Jun Pataleta [Thu, 22 Mar 2018 02:52:53 +0000 (10:52 +0800)]
Merge branch 'MDL-61514-master' of git://github.com/rezaies/moodle

3 years agoMDL-61514 Quiz: Fix restore error
Shamim Rezaie [Wed, 21 Mar 2018 22:50:00 +0000 (09:50 +1100)]
MDL-61514 Quiz: Fix restore error

Include mod/quiz/locallib.php to fix the restore error.

3 years agoMerge branch 'MDL-61658-master-allcountrycodes' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 21 Mar 2018 18:36:36 +0000 (19:36 +0100)]
Merge branch 'MDL-61658-master-allcountrycodes' of git://github.com/mudrd8mz/moodle

3 years agoMDL-61658 user: Fix displaying of user's country name
David Mudrák [Thu, 15 Mar 2018 12:17:31 +0000 (13:17 +0100)]
MDL-61658 user: Fix displaying of user's country name

In these cases we want to use the method get_list_of_countries() to
obtain translated names of all potential country codes. The country code
is already there in the database. So it does not matter if the country
is among those whitelisted in $CFG->allcountrycodes - we want to see its
name anyway.