moodle.git
3 years agoMDL-52811 course: Note about the new capability when creating courses
David Monllao [Tue, 6 Feb 2018 07:10:10 +0000 (08:10 +0100)]
MDL-52811 course: Note about the new capability when creating courses

3 years agoMerge branch 'MDL-52811_prevent_forcelang' of git://github.com/davosmith/moodle
David Monllao [Tue, 6 Feb 2018 07:00:11 +0000 (08:00 +0100)]
Merge branch 'MDL-52811_prevent_forcelang' of git://github.com/davosmith/moodle

3 years agoMerge branch 'MDL-61132-master' of git://github.com/rezaies/moodle
Andrew Nicols [Tue, 6 Feb 2018 06:33:41 +0000 (14:33 +0800)]
Merge branch 'MDL-61132-master' of git://github.com/rezaies/moodle

3 years agoMerge branch 'MDL-61133-master' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 6 Feb 2018 06:00:51 +0000 (14:00 +0800)]
Merge branch 'MDL-61133-master' of git://github.com/lameze/moodle

3 years agoMDL-61133 core_question: move all selectors to a new module
Simey Lameze [Tue, 6 Feb 2018 02:24:22 +0000 (10:24 +0800)]
MDL-61133 core_question: move all selectors to a new module

3 years agoMDL-61133 core_question: add new question tags modal
Simey Lameze [Wed, 31 Jan 2018 05:46:30 +0000 (13:46 +0800)]
MDL-61133 core_question: add new question tags modal

3 years agoMerge branch 'MDL-61168-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Mon, 5 Feb 2018 19:17:34 +0000 (20:17 +0100)]
Merge branch 'MDL-61168-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-61341-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 5 Feb 2018 19:06:32 +0000 (20:06 +0100)]
Merge branch 'MDL-61341-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-52811 course: moodle/course:setforcedlanguage integration fixes
Davo Smith [Mon, 5 Feb 2018 13:20:42 +0000 (13:20 +0000)]
MDL-52811 course: moodle/course:setforcedlanguage integration fixes

3 years agoMerge branch 'MDL-61027-master' of git://github.com/rezaies/moodle
David Monllao [Mon, 5 Feb 2018 10:56:18 +0000 (11:56 +0100)]
Merge branch 'MDL-61027-master' of git://github.com/rezaies/moodle

3 years agoMerge branch 'MDL-61251-master' of https://github.com/lucaboesch/moodle
David Monllao [Mon, 5 Feb 2018 10:50:39 +0000 (11:50 +0100)]
Merge branch 'MDL-61251-master' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'MDL-42764_master' of git://github.com/markn86/moodle
David Monllao [Mon, 5 Feb 2018 10:18:34 +0000 (11:18 +0100)]
Merge branch 'MDL-42764_master' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-61269' of git://github.com/stronk7/moodle
Andrew Nicols [Mon, 5 Feb 2018 09:29:25 +0000 (17:29 +0800)]
Merge branch 'MDL-61269' of git://github.com/stronk7/moodle

3 years agoMerge branch 'MDL-51189-master' of git://github.com/rezaies/moodle
Andrew Nicols [Mon, 5 Feb 2018 07:43:47 +0000 (15:43 +0800)]
Merge branch 'MDL-51189-master' of git://github.com/rezaies/moodle

3 years agoMDL-61132 Questions: Fix behat failures
Shamim Rezaie [Mon, 5 Feb 2018 02:59:39 +0000 (13:59 +1100)]
MDL-61132 Questions: Fix behat failures

3 years agoMDL-61133 core_question: tags form and fragment callback
Simey Lameze [Wed, 31 Jan 2018 05:43:05 +0000 (13:43 +0800)]
MDL-61133 core_question: tags form and fragment callback

3 years agoMDL-61133 core_question: new submit_tags_form webservice
Simey Lameze [Wed, 31 Jan 2018 05:40:46 +0000 (13:40 +0800)]
MDL-61133 core_question: new submit_tags_form webservice

3 years agoMDL-61133 core_question: add tags column class to question list
Simey Lameze [Wed, 31 Jan 2018 05:38:23 +0000 (13:38 +0800)]
MDL-61133 core_question: add tags column class to question list

3 years agoMDL-61133 core_output: add fontawesome mapping for tags icon
Simey Lameze [Tue, 9 Jan 2018 00:27:46 +0000 (08:27 +0800)]
MDL-61133 core_output: add fontawesome mapping for tags icon

3 years agoMDL-61132 Questions: Unit tests compatibility
Shamim Rezaie [Tue, 30 Jan 2018 03:18:29 +0000 (14:18 +1100)]
MDL-61132 Questions: Unit tests compatibility

Modified unit tests to adapt with "Top" categories.

3 years agoMDL-61132 Questions: Adapt logic on export/import
Shamim Rezaie [Tue, 30 Jan 2018 03:17:08 +0000 (14:17 +1100)]
MDL-61132 Questions: Adapt logic on export/import

Modified import/export to adapt with "Top" categories.

3 years agoMDL-61132 Questions: Adapt logic on backup/restore
Shamim Rezaie [Tue, 30 Jan 2018 03:05:02 +0000 (14:05 +1100)]
MDL-61132 Questions: Adapt logic on backup/restore

Modifying backup/restore to adapt with "Top" categories.

3 years agoMDL-61132 Quiz: "Random" question from "Top" categories
Shamim Rezaie [Tue, 30 Jan 2018 02:46:39 +0000 (13:46 +1100)]
MDL-61132 Quiz: "Random" question from "Top" categories

* Support for adding ranodm questions from "Top" categories

3 years agoMDL-61132 Questions: Question Bank amendments to cope with Top category
Shamim Rezaie [Tue, 30 Jan 2018 02:05:19 +0000 (13:05 +1100)]
MDL-61132 Questions: Question Bank amendments to cope with Top category

* Display "Top" categories in the category filter when listing questions in the question bank
* Prevent editing "Top" categories
* Prevent deleting "Top" categories

3 years agoMDL-61132 Questions: Add "Top" categories by default when don't exist
Shamim Rezaie [Tue, 30 Jan 2018 01:55:39 +0000 (12:55 +1100)]
MDL-61132 Questions: Add "Top" categories by default when don't exist

Create "Top" categories along with the default categories when they don't exist

3 years agoMDL-61132 Questions: Upgrade step to add Top to existing contexts
Shamim Rezaie [Tue, 30 Jan 2018 00:42:27 +0000 (11:42 +1100)]
MDL-61132 Questions: Upgrade step to add Top to existing contexts

Upgrade script to add a "Top" category as a real category to the question bank

3 years agoMDL-61269 composer: better license GPL-3.0-or-later
Eloy Lafuente (stronk7) [Sun, 4 Feb 2018 18:38:32 +0000 (19:38 +0100)]
MDL-61269 composer: better license GPL-3.0-or-later

Source: https://spdx.org/licenses/

3 years agoMDL-61341 theme_boost: Fix usertour zindex calculations
Andrew Nicols [Fri, 2 Feb 2018 03:31:12 +0000 (11:31 +0800)]
MDL-61341 theme_boost: Fix usertour zindex calculations

3 years agoMDL-61341 theme_boost: Modify variables used for calculations
Andrew Nicols [Fri, 2 Feb 2018 03:29:33 +0000 (11:29 +0800)]
MDL-61341 theme_boost: Modify variables used for calculations

Variables must be of the same type for Math to take place. We cannot
mix REM and EM because they have different relative roots.

3 years agoMDL-61168 mod_assign: Truncate only the online text submission
Jun Pataleta [Mon, 8 Jan 2018 08:34:37 +0000 (16:34 +0800)]
MDL-61168 mod_assign: Truncate only the online text submission

3 years agoMDL-61251 admin: configenablerssfeedsdisabled2 string more correct.
Luca Bösch [Wed, 31 Jan 2018 08:48:45 +0000 (09:48 +0100)]
MDL-61251 admin: configenablerssfeedsdisabled2 string more correct.

3 years agoMDL-52811 course: fix unit tests broken by setforcedlanguage
Davo Smith [Thu, 1 Feb 2018 16:48:14 +0000 (16:48 +0000)]
MDL-52811 course: fix unit tests broken by setforcedlanguage

3 years agoMDL-52811 course: prevent setting of 'lang' without permission
Davo Smith [Fri, 22 Dec 2017 09:49:37 +0000 (09:49 +0000)]
MDL-52811 course: prevent setting of 'lang' without permission

3 years agoMDL-52811 course: Require course:setforcedlanguage to force language.
Yair Spielmann [Mon, 18 Jan 2016 13:48:30 +0000 (13:48 +0000)]
MDL-52811 course: Require course:setforcedlanguage to force language.

3 years agoweekly release 3.5dev
David Monllao [Thu, 1 Feb 2018 13:26:35 +0000 (14:26 +0100)]
weekly release 3.5dev

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Thu, 1 Feb 2018 13:26:33 +0000 (14:26 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMerge branch 'MDL-60077-master-fix' of https://github.com/andrewnicols/moodle
Jake Dallimore [Thu, 1 Feb 2018 06:55:50 +0000 (14:55 +0800)]
Merge branch 'MDL-60077-master-fix' of https://github.com/andrewnicols/moodle

3 years agoMDL-60077 tool_usertours: Pull v0.12.2 of usertours for triangle fix
Andrew Nicols [Thu, 1 Feb 2018 06:28:13 +0000 (14:28 +0800)]
MDL-60077 tool_usertours: Pull v0.12.2 of usertours for triangle fix

3 years agoMDL-37190 blocks: Fix behat failure with new langstring
Andrew Nicols [Thu, 1 Feb 2018 00:03:03 +0000 (08:03 +0800)]
MDL-37190 blocks: Fix behat failure with new langstring

3 years agoMDL-61242 repository_equella: Fix missing class repository
David Mudrák [Wed, 31 Jan 2018 22:05:22 +0000 (23:05 +0100)]
MDL-61242 repository_equella: Fix missing class repository

The call to the class 'repository' introduced in the commit d05c2ac7cc78
didn't fully work and threw: "Exception - Class 'repository' not found".
This fixes the missing library inclusion.

3 years agoMerge branch 'MDL-61058-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Wed, 31 Jan 2018 20:04:08 +0000 (21:04 +0100)]
Merge branch 'MDL-61058-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-61023-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Wed, 31 Jan 2018 19:35:26 +0000 (20:35 +0100)]
Merge branch 'MDL-61023-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-37190-master-fix2' of https://github.com/snake/moodle
Andrew Nicols [Wed, 31 Jan 2018 06:06:13 +0000 (14:06 +0800)]
Merge branch 'MDL-37190-master-fix2' of https://github.com/snake/moodle

3 years agoMerge branch 'MDL-61313_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Wed, 31 Jan 2018 01:14:40 +0000 (09:14 +0800)]
Merge branch 'MDL-61313_master' of git://github.com/dmonllao/moodle

3 years agoMDL-37190 blocks: fix erroneous strings in the block_blog_tags block
Jake Dallimore [Wed, 31 Jan 2018 05:39:52 +0000 (13:39 +0800)]
MDL-37190 blocks: fix erroneous strings in the block_blog_tags block

3 years agoMDL-61313 behat: Move future events further
David Monllao [Tue, 30 Jan 2018 14:20:17 +0000 (15:20 +0100)]
MDL-61313 behat: Move future events further

3 years agoMerge branch 'MDL-37190-master-fix1' of https://github.com/snake/moodle
Andrew Nicols [Wed, 31 Jan 2018 01:08:46 +0000 (09:08 +0800)]
Merge branch 'MDL-37190-master-fix1' of https://github.com/snake/moodle

3 years agoMerge branch 'MDL-60836-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 30 Jan 2018 17:00:13 +0000 (18:00 +0100)]
Merge branch 'MDL-60836-master' of git://github.com/jleyva/moodle

3 years agoMDL-37190 behat: fix for char case in html block test
Jake Dallimore [Wed, 31 Jan 2018 01:02:19 +0000 (09:02 +0800)]
MDL-37190 behat: fix for char case in html block test

3 years agoMerge branch 'MDL-37190-master' of https://github.com/lucaboesch/moodle
Jake Dallimore [Tue, 30 Jan 2018 04:02:37 +0000 (12:02 +0800)]
Merge branch 'MDL-37190-master' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'MDL-57394-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 30 Jan 2018 16:57:59 +0000 (17:57 +0100)]
Merge branch 'MDL-57394-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-44612-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 30 Jan 2018 00:11:06 +0000 (01:11 +0100)]
Merge branch 'MDL-44612-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-61281_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 29 Jan 2018 22:59:36 +0000 (23:59 +0100)]
Merge branch 'MDL-61281_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-60646-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 29 Jan 2018 10:27:03 +0000 (11:27 +0100)]
Merge branch 'MDL-60646-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-60997-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 29 Jan 2018 09:38:58 +0000 (10:38 +0100)]
Merge branch 'MDL-60997-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-61152-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 29 Jan 2018 09:21:39 +0000 (10:21 +0100)]
Merge branch 'MDL-61152-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-61260_master' of git://github.com/markn86/moodle
David Monllao [Mon, 29 Jan 2018 09:17:39 +0000 (10:17 +0100)]
Merge branch 'MDL-61260_master' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-61253-master' of git://github.com/andrewnicols/moodle
Jake Dallimore [Mon, 29 Jan 2018 05:32:22 +0000 (13:32 +0800)]
Merge branch 'MDL-61253-master' of git://github.com/andrewnicols/moodle

3 years agoMerge branch 'MDL-60077-master' of https://github.com/HuongNV13/moodle
Andrew Nicols [Mon, 29 Jan 2018 04:36:37 +0000 (12:36 +0800)]
Merge branch 'MDL-60077-master' of https://github.com/HuongNV13/moodle

3 years agoMerge branch 'MDL-61250-master' of https://github.com/lucaboesch/moodle
Andrew Nicols [Mon, 29 Jan 2018 03:19:18 +0000 (11:19 +0800)]
Merge branch 'MDL-61250-master' of https://github.com/lucaboesch/moodle

3 years agoAutomatically generated installer lang files
AMOS bot [Thu, 1 Feb 2018 00:06:35 +0000 (00:06 +0000)]
Automatically generated installer lang files

3 years agoAutomatically generated installer lang files
AMOS bot [Wed, 31 Jan 2018 00:06:25 +0000 (00:06 +0000)]
Automatically generated installer lang files

3 years agoMDL-57394 mod_chat: New WS mod_chat_get_session_messages
Juan Leyva [Fri, 22 Sep 2017 14:12:42 +0000 (16:12 +0200)]
MDL-57394 mod_chat: New WS mod_chat_get_session_messages

3 years agoMDL-57394 mod_chat: Move get session messages code to new function
Juan Leyva [Fri, 22 Sep 2017 14:12:21 +0000 (16:12 +0200)]
MDL-57394 mod_chat: Move get session messages code to new function

3 years agoMDL-57394 mod_chat: New WS mod_chat_get_sessions
Juan Leyva [Fri, 22 Sep 2017 10:53:55 +0000 (12:53 +0200)]
MDL-57394 mod_chat: New WS mod_chat_get_sessions

3 years agoMDL-57394 mod_chat: Move get sessions code to new function
Juan Leyva [Fri, 22 Sep 2017 10:53:39 +0000 (12:53 +0200)]
MDL-57394 mod_chat: Move get sessions code to new function

To avoid code duplication when creating new web services we need to
move code to a function chat_get_sessions.

3 years agoMDL-60836 core_calendar: Return categoryid in get_calendar_events
Juan Leyva [Thu, 11 Jan 2018 08:55:54 +0000 (09:55 +0100)]
MDL-60836 core_calendar: Return categoryid in get_calendar_events

3 years agoAutomatically generated installer lang files
AMOS bot [Tue, 30 Jan 2018 00:06:27 +0000 (00:06 +0000)]
Automatically generated installer lang files

3 years agoMDL-42764 core: added missing string definition
Mark Nelson [Mon, 29 Jan 2018 11:04:41 +0000 (19:04 +0800)]
MDL-42764 core: added missing string definition

Also changed the string index so it was not
vague. The index 'emailempty' appears as if it
could belong to a validation method for a form.

3 years agoMDL-37190 blocks: Block name label consistency
Luca Bösch [Thu, 18 Jan 2018 13:30:46 +0000 (14:30 +0100)]
MDL-37190 blocks: Block name label consistency

   AMOS BEGIN
    MOV [blocktitle,blog],[configtitle,block_blog_tags]
   AMOS END

3 years agoMDL-60077 User tours: pop-up triangle look bad next to the corners
Huong Nguyen [Mon, 29 Jan 2018 02:54:32 +0000 (09:54 +0700)]
MDL-60077 User tours: pop-up triangle look bad next to the corners

3 years agoMDL-61260 auth_ldap: require /user/profile/lib.php file
Mark Nelson [Mon, 29 Jan 2018 03:30:05 +0000 (11:30 +0800)]
MDL-61260 auth_ldap: require /user/profile/lib.php file

3 years agoMerge branch 'wip-MDL-61242-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Mon, 29 Jan 2018 00:41:06 +0000 (01:41 +0100)]
Merge branch 'wip-MDL-61242-master' of git://github.com/abgreeve/moodle

3 years agoMerge branch 'MDL-58410_master' of git://github.com/markn86/moodle
Andrew Nicols [Mon, 29 Jan 2018 00:15:39 +0000 (08:15 +0800)]
Merge branch 'MDL-58410_master' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-61218-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Sun, 28 Jan 2018 23:10:25 +0000 (00:10 +0100)]
Merge branch 'MDL-61218-master' of git://github.com/lameze/moodle

3 years agoMDL-61281 search_solr: PHP 7.2 compatible counts
David Monllao [Fri, 26 Jan 2018 12:11:51 +0000 (13:11 +0100)]
MDL-61281 search_solr: PHP 7.2 compatible counts

3 years agoMDL-61250 questions: Omit leading space in question preview link
Luca Bösch [Sun, 21 Jan 2018 12:01:37 +0000 (13:01 +0100)]
MDL-61250 questions: Omit leading space in question preview link

3 years agoMDL-60997 core_message: Add replytoname in unit test
Jun Pataleta [Thu, 25 Jan 2018 08:47:12 +0000 (16:47 +0800)]
MDL-60997 core_message: Add replytoname in unit test

3 years agoweekly release 3.5dev
Andrew Nicols [Thu, 25 Jan 2018 07:14:24 +0000 (15:14 +0800)]
weekly release 3.5dev

3 years agoNOBUG: Fixed SVG browser compatibility
Andrew Nicols [Thu, 25 Jan 2018 07:14:21 +0000 (15:14 +0800)]
NOBUG: Fixed SVG browser compatibility

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 25 Jan 2018 07:14:20 +0000 (15:14 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMerge branch 'MDL-60078-master-fix' of https://github.com/andrewnicols/moodle
Jake Dallimore [Thu, 25 Jan 2018 06:47:14 +0000 (14:47 +0800)]
Merge branch 'MDL-60078-master-fix' of https://github.com/andrewnicols/moodle

3 years agoMDL-60078 tool_usertours: Adjust accessibility checks for all themes
Andrew Nicols [Thu, 25 Jan 2018 04:45:56 +0000 (12:45 +0800)]
MDL-60078 tool_usertours: Adjust accessibility checks for all themes

3 years agoMDL-61269 behat-extension: bump to fix some caps & defaults
Eloy Lafuente (stronk7) [Wed, 24 Jan 2018 19:46:56 +0000 (20:46 +0100)]
MDL-61269 behat-extension: bump to fix some caps & defaults

3 years agoMDL-44612 mod_glossary: Test importing of glossary entries
Jun Pataleta [Mon, 8 Jan 2018 02:22:53 +0000 (10:22 +0800)]
MDL-44612 mod_glossary: Test importing of glossary entries

* And check that the importing of entries is reflected in the recent
activity block.

3 years agoMDL-44612 mod_forum: Confirm forum post listing in recent activity block
Jun Pataleta [Mon, 8 Jan 2018 02:21:13 +0000 (10:21 +0800)]
MDL-44612 mod_forum: Confirm forum post listing in recent activity block

3 years agoMDL-61023 behat: Automate MDLQA-8158
Damyon Wiese [Tue, 19 Dec 2017 05:42:14 +0000 (13:42 +0800)]
MDL-61023 behat: Automate MDLQA-8158

Verify the general section does not appear in the navigation when it is empty.

3 years agoMDL-61058 behat: Automate MDLQA-8146
Damyon Wiese [Tue, 19 Dec 2017 07:55:21 +0000 (15:55 +0800)]
MDL-61058 behat: Automate MDLQA-8146

Verify that the keyholder is displayed on the self enrolment page.

3 years agoMDL-58410 user: add support for alternative name search
Igor Sazonov [Fri, 19 Jan 2018 12:13:17 +0000 (15:13 +0300)]
MDL-58410 user: add support for alternative name search

The solution about searching all external names fields (middlename etc) from course enrolment page (enrolled and enrolling pages)

3 years agoMDL-61234 tool_usertours: Rewrite feature to work with all themes
Andrew Nicols [Wed, 24 Jan 2018 02:05:42 +0000 (10:05 +0800)]
MDL-61234 tool_usertours: Rewrite feature to work with all themes

3 years agoMDL-61218 lib: set chart border color to white
Simey Lameze [Wed, 17 Jan 2018 07:04:33 +0000 (15:04 +0800)]
MDL-61218 lib: set chart border color to white

3 years agoMerge branch 'MDL-61203_m35v3' of git://github.com/sbourget/moodle
Andrew Nicols [Tue, 23 Jan 2018 03:30:09 +0000 (11:30 +0800)]
Merge branch 'MDL-61203_m35v3' of git://github.com/sbourget/moodle

3 years agoMDL-61152 calendar: Remove usage of undefined variable
Jun Pataleta [Thu, 4 Jan 2018 07:06:07 +0000 (15:06 +0800)]
MDL-61152 calendar: Remove usage of undefined variable

3 years agoMDL-61253 repository: Add referenced files to archives
Andrew Nicols [Tue, 23 Jan 2018 01:48:05 +0000 (09:48 +0800)]
MDL-61253 repository: Add referenced files to archives

3 years agoMerge branch 'MDL-61252-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jan 2018 01:13:10 +0000 (02:13 +0100)]
Merge branch 'MDL-61252-master' of git://github.com/andrewnicols/moodle

3 years agoMerge branch 'MDL-60814_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jan 2018 00:24:46 +0000 (01:24 +0100)]
Merge branch 'MDL-60814_master' of git://github.com/markn86/moodle

3 years agoMDL-61252 mod_quiz: Fix ambiguous behat check
Andrew Nicols [Mon, 22 Jan 2018 04:38:03 +0000 (12:38 +0800)]
MDL-61252 mod_quiz: Fix ambiguous behat check

3 years agoMDL-51189 Quiz: Edit overrides when quiz is not available to students
Shamim Rezaie [Mon, 11 Dec 2017 13:36:39 +0000 (21:36 +0800)]
MDL-51189 Quiz: Edit overrides when quiz is not available to students

The $active variable should simply be used to dim the text, nothing more.

3 years agoMerge branch 'MDL-60918-master' of git://github.com/ryanwyllie/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jan 2018 19:17:20 +0000 (20:17 +0100)]
Merge branch 'MDL-60918-master' of git://github.com/ryanwyllie/moodle

3 years agoMerge branch 'MDL-58006-master' of git://github.com/zig-moodle/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jan 2018 18:57:33 +0000 (19:57 +0100)]
Merge branch 'MDL-58006-master' of git://github.com/zig-moodle/moodle