moodle.git
4 years agoMDL-55528 fileconverter_unoconv: Unit test correction
Andrew Nicols [Wed, 15 Mar 2017 02:59:53 +0000 (10:59 +0800)]
MDL-55528 fileconverter_unoconv: Unit test correction

4 years agoMDL-55528 fileconverter_unoconv: Move env check langstring to core
Andrew Nicols [Wed, 15 Mar 2017 01:14:31 +0000 (09:14 +0800)]
MDL-55528 fileconverter_unoconv: Move env check langstring to core

AMOS BEGIN
 MOV [unoconvwarning,fileconverter_unoconv],[unoconvwarning,admin]
AMOS END

4 years agoMerge branch 'MDL-57066-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 14 Mar 2017 23:58:37 +0000 (00:58 +0100)]
Merge branch 'MDL-57066-master' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'm33_MDL-58027_Restore_Missing_HTMLEntities_Call' of https://github...
Eloy Lafuente (stronk7) [Tue, 14 Mar 2017 23:37:02 +0000 (00:37 +0100)]
Merge branch 'm33_MDL-58027_Restore_Missing_HTMLEntities_Call' of https://github.com/scara/moodle

4 years agoMerge branch 'MDL-58023_behat_find_node_in_navigation_improvement_master' of https...
Dan Poltawski [Tue, 14 Mar 2017 16:31:05 +0000 (16:31 +0000)]
Merge branch 'MDL-58023_behat_find_node_in_navigation_improvement_master' of https://github.com/gthomas2/moodle

4 years agoMerge branch 'MDL-57658-master-3' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 14 Mar 2017 16:06:19 +0000 (16:06 +0000)]
Merge branch 'MDL-57658-master-3' of git://github.com/junpataleta/moodle

4 years agoMDL-50538 mod_feedback: New WS mod_feedback_get_feedbacks_by_courses
Juan Leyva [Tue, 31 Jan 2017 09:09:09 +0000 (10:09 +0100)]
MDL-50538 mod_feedback: New WS mod_feedback_get_feedbacks_by_courses

4 years agoMerge branch 'MDL-55528-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 14 Mar 2017 12:07:33 +0000 (12:07 +0000)]
Merge branch 'MDL-55528-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-57631_ldap_enrol_sync_task_master' of https://github.com/gthomas2...
David Monllao [Tue, 14 Mar 2017 10:21:46 +0000 (11:21 +0100)]
Merge branch 'MDL-57631_ldap_enrol_sync_task_master' of https://github.com/gthomas2/moodle

4 years agoMerge branch 'MDL-58114-master-excparams' of git://github.com/mudrd8mz/moodle
David Monllao [Tue, 14 Mar 2017 10:02:37 +0000 (11:02 +0100)]
Merge branch 'MDL-58114-master-excparams' of git://github.com/mudrd8mz/moodle

4 years agoMDL-58109 report_security: Remove empty line
David Monllao [Tue, 14 Mar 2017 10:00:20 +0000 (11:00 +0100)]
MDL-58109 report_security: Remove empty line

4 years agoMerge branch 'MDL-58109-preventexecpath-check' of https://github.com/brendanheywood...
David Monllao [Tue, 14 Mar 2017 09:59:28 +0000 (10:59 +0100)]
Merge branch 'MDL-58109-preventexecpath-check' of https://github.com/brendanheywood/moodle

4 years agoMerge branch 'wip-mdl-58169' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 14 Mar 2017 09:07:17 +0000 (09:07 +0000)]
Merge branch 'wip-mdl-58169' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'MDL-57751-master' of https://github.com/xow/moodle
Andrew Nicols [Tue, 14 Mar 2017 05:31:43 +0000 (13:31 +0800)]
Merge branch 'MDL-57751-master' of https://github.com/xow/moodle

4 years agoMerge branch 'MDL-57583-master' of https://github.com/snake/moodle
Andrew Nicols [Tue, 14 Mar 2017 04:28:52 +0000 (12:28 +0800)]
Merge branch 'MDL-57583-master' of https://github.com/snake/moodle

4 years agoMerge branch 'MDL-58217-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 14 Mar 2017 04:10:56 +0000 (12:10 +0800)]
Merge branch 'MDL-58217-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'wip-mdl-58250' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Tue, 14 Mar 2017 03:25:01 +0000 (11:25 +0800)]
Merge branch 'wip-mdl-58250' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'MDL-57915-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 13 Mar 2017 21:39:38 +0000 (22:39 +0100)]
Merge branch 'MDL-57915-master' of git://github.com/jleyva/moodle

4 years agoMDL-58169 phpunit: Clear opcode cache before checking file
Rajesh Taneja [Tue, 14 Mar 2017 05:30:24 +0000 (13:30 +0800)]
MDL-58169 phpunit: Clear opcode cache before checking file

In unit test, we write cache file often and
opcache might fail to detect changes. It will
be nice to invalidate opcode cache to ensure
we have the correct file_exists status

4 years agoMDL-58250 behat: Status should be new exit code
Rajesh Taneja [Mon, 13 Mar 2017 22:58:55 +0000 (06:58 +0800)]
MDL-58250 behat: Status should be new exit code

Oring should not be done with old status,
as it will always return failure.

4 years agoMDL-58027 files: Restored missing htmlentities() call
Matteo Scaramuccia [Mon, 20 Feb 2017 21:50:24 +0000 (22:50 +0100)]
MDL-58027 files: Restored missing htmlentities() call

4 years agoMDL-57915 mod_data: New Web Service mod_data_view_database
Juan Leyva [Thu, 9 Feb 2017 14:06:16 +0000 (15:06 +0100)]
MDL-57915 mod_data: New Web Service mod_data_view_database

4 years agoMDL-57915 mod_data: Move view completion and event code to function
Juan Leyva [Thu, 9 Feb 2017 14:04:17 +0000 (15:04 +0100)]
MDL-57915 mod_data: Move view completion and event code to function

4 years agoMDL-58023 behat: Improve find_node_in_navigation function
gthomas2 [Wed, 22 Feb 2017 15:04:23 +0000 (15:04 +0000)]
MDL-58023 behat: Improve find_node_in_navigation function

4 years agoMDL-57066 theme_boost: Fix course section move icon alignment
Krishnan [Fri, 10 Mar 2017 12:08:58 +0000 (17:38 +0530)]
MDL-57066 theme_boost: Fix course section move icon alignment

4 years agoMDL-51853 calendar: Whitespace fix
Andrew Nicols [Mon, 13 Mar 2017 01:18:07 +0000 (09:18 +0800)]
MDL-51853 calendar: Whitespace fix

4 years agoMDL-57583 completion: fix bug with advcheckbox in course completion form
Jake Dallimore [Thu, 2 Mar 2017 06:34:37 +0000 (14:34 +0800)]
MDL-57583 completion: fix bug with advcheckbox in course completion form

Added the appropriate checks to handle the advcheckbox post data.

4 years agoMerge branch 'MDL-51853_m33v3' of https://github.com/sbourget/moodle
Andrew Nicols [Mon, 13 Mar 2017 00:40:45 +0000 (08:40 +0800)]
Merge branch 'MDL-51853_m33v3' of https://github.com/sbourget/moodle

4 years agoweekly release 3.3dev
Eloy Lafuente (stronk7) [Fri, 10 Mar 2017 19:59:40 +0000 (20:59 +0100)]
weekly release 3.3dev

4 years agoNOBUG: Fixed SVG browser compatibility
Eloy Lafuente (stronk7) [Fri, 10 Mar 2017 19:59:35 +0000 (20:59 +0100)]
NOBUG: Fixed SVG browser compatibility

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Fri, 10 Mar 2017 19:59:34 +0000 (20:59 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMDL-55956 mod_assign: Do not use API constant in upgrade
Andrew Nicols [Fri, 10 Mar 2017 05:27:49 +0000 (13:27 +0800)]
MDL-55956 mod_assign: Do not use API constant in upgrade

4 years agoMerge branch 'MDL-55956-master-integration' of git://github.com/junpataleta/moodle
Andrew Nicols [Fri, 10 Mar 2017 04:18:20 +0000 (12:18 +0800)]
Merge branch 'MDL-55956-master-integration' of git://github.com/junpataleta/moodle

4 years agoMDL-57596 forms: CLEANHTML in persistent forms
Damyon Wiese [Tue, 7 Mar 2017 03:19:00 +0000 (11:19 +0800)]
MDL-57596 forms: CLEANHTML in persistent forms

Add special handling for text fields with the CLEANHTML type. This should
be used when students and teachers can edit the same field (you can't trust those students).

Applies cleaning on submitted data, and on data stored in the DB before it is put back in an editing form.

4 years agoMDL-55956 mod_assign: Set priorities of old assign event overrides
Jun Pataleta [Fri, 10 Mar 2017 02:50:07 +0000 (10:50 +0800)]
MDL-55956 mod_assign: Set priorities of old assign event overrides

4 years agoMDL-58010 user: allow to update only whitelisted user preferences
Marina Glancy [Sun, 5 Mar 2017 05:20:03 +0000 (13:20 +0800)]
MDL-58010 user: allow to update only whitelisted user preferences

4 years agoMDL-57557 theme_boost: tweak js popover settings
Ryan Wyllie [Thu, 9 Mar 2017 06:11:35 +0000 (06:11 +0000)]
MDL-57557 theme_boost: tweak js popover settings

Added the focus trigger to non hover popovers so that they close when
they lose focus.

Also added a 500ms delay to hiding the hover triggered popover to give
time for clicking on the contents.

4 years agoMDL-55956 core: Update major db change version
Jun Pataleta [Thu, 9 Mar 2017 01:30:49 +0000 (09:30 +0800)]
MDL-55956 core: Update major db change version

4 years agoMerge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle
Andrew Nicols [Wed, 8 Mar 2017 08:32:33 +0000 (16:32 +0800)]
Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'MDL-57914-master' of git://github.com/jleyva/moodle
Andrew Nicols [Wed, 8 Mar 2017 07:59:25 +0000 (15:59 +0800)]
Merge branch 'MDL-57914-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'wip-mdl-57940' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 8 Mar 2017 04:02:17 +0000 (12:02 +0800)]
Merge branch 'wip-mdl-57940' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'MDL-57975-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Wed, 8 Mar 2017 03:54:24 +0000 (11:54 +0800)]
Merge branch 'MDL-57975-master' of git://github.com/ryanwyllie/moodle

4 years agoMerge branch 'MDL-58123-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 7 Mar 2017 19:45:55 +0000 (20:45 +0100)]
Merge branch 'MDL-58123-master' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'MDL-57557-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 7 Mar 2017 19:23:41 +0000 (20:23 +0100)]
Merge branch 'MDL-57557-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'MDL-58035' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 7 Mar 2017 17:49:42 +0000 (14:49 -0300)]
Merge branch 'MDL-58035' of git://github.com/timhunt/moodle

4 years agoMDL-56526 userlib: Do not allow not loggedin users if forceloginforprofile is set
Ankit Agarwal [Tue, 28 Feb 2017 16:31:49 +0000 (22:01 +0530)]
MDL-56526 userlib: Do not allow not loggedin users if forceloginforprofile is set

4 years agoMDL-56526 globalsearch: Fix bug in phpdocs
Ankit Agarwal [Wed, 15 Feb 2017 07:59:21 +0000 (13:29 +0530)]
MDL-56526 globalsearch: Fix bug in phpdocs

4 years agoMDL-57597 competency: Fix serving of prior learning evidence files
David Mudrák [Mon, 13 Feb 2017 21:49:33 +0000 (22:49 +0100)]
MDL-57597 competency: Fix serving of prior learning evidence files

For security reasons, all files submitted by students must be disposed
as attachments, not inline contents.

4 years agoMDL-58217 mod_feedback: Add data generators for items
Juan Leyva [Fri, 10 Mar 2017 09:51:51 +0000 (10:51 +0100)]
MDL-58217 mod_feedback: Add data generators for items

4 years agoMDL-58217 mod_feedback: API changes to allow generators
Juan Leyva [Fri, 10 Mar 2017 09:51:32 +0000 (10:51 +0100)]
MDL-58217 mod_feedback: API changes to allow generators

We include a new function set_date at item level so we can add the data
instead using the forms.

4 years agoMDL-55528 assignfeedback_editpdf: Remove unnecessary escapes
Andrew Nicols [Wed, 8 Mar 2017 00:25:02 +0000 (08:25 +0800)]
MDL-55528 assignfeedback_editpdf: Remove unnecessary escapes

4 years agoMDL-55528 assignfeedback_editpdf: Add step to check all pages loaded
Andrew Nicols [Tue, 7 Mar 2017 02:11:01 +0000 (10:11 +0800)]
MDL-55528 assignfeedback_editpdf: Add step to check all pages loaded

4 years agoMDL-55528 assignfeedback_editpdf: Update to use fileconverter_unoconv
Andrew Nicols [Fri, 3 Mar 2017 01:57:19 +0000 (09:57 +0800)]
MDL-55528 assignfeedback_editpdf: Update to use fileconverter_unoconv

4 years agoMDL-55528 fileconverter_unoconv: Add new unoconv plugin
Andrew Nicols [Fri, 17 Feb 2017 01:40:45 +0000 (09:40 +0800)]
MDL-55528 fileconverter_unoconv: Add new unoconv plugin

AMOS BEGIN
 MOV [pathtounoconv,admin],[pathtounoconv,fileconverter_unoconv]
 MOV [pathtounoconv_help,admin],[pathtounoconv_help,fileconv_helperter_unoconv_help]
 MOV [unoconvwarning,admin],[unoconvwarning,fileconverter_unoconv]
 MOV [test_unoconv,assignfeedback_editpdf],[test_unoconv,fileconverter_unoconv]
 MOV [test_unoconvempty,assignfeedback_editpdf],[test_unoconvempty,fileconverter_unoconv]
 MOV [test_unoconvdoesnotexist,assignfeedback_editpdf],[test_unoconvdoesnotexist,fileconverter_unoconv]
 MOV [test_unoconvdownload,assignfeedback_editpdf],[test_unoconvdownload,fileconverter_unoconv]
 MOV [test_unoconvisdir,assignfeedback_editpdf],[test_unoconvisdir,fileconverter_unoconv]
 MOV [test_unoconvnotestfile,assignfeedback_editpdf],[test_unoconvnotestfile,fileconverter_unoconv]
 MOV [test_unoconvnotexecutable,assignfeedback_editpdf],[test_unoconvnotexecutable,fileconverter_unoconv]
 MOV [test_unoconvok,assignfeedback_editpdf],[test_unoconvok,fileconverter_unoconv]
 MOV [test_unoconvversionnotsupported,assignfeedback_editpdf],[test_unoconvversionnotsupported,fileconverter_unoconv]
AMOS END

4 years agoMDL-55528 core_files: Create new fileconverter plugintype
Andrew Nicols [Fri, 17 Feb 2017 01:34:55 +0000 (09:34 +0800)]
MDL-55528 core_files: Create new fileconverter plugintype

4 years agoAutomatically generated installer lang files
AMOS bot [Thu, 9 Mar 2017 16:04:10 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMDL-57658 calendar: Fix rrulemanager and unit tests
Jun Pataleta [Thu, 19 Jan 2017 07:22:06 +0000 (15:22 +0800)]
MDL-57658 calendar: Fix rrulemanager and unit tests

Issues fixed:
* Additional rule validations.
* Rewrote recurrence logic.
* Additional unit tests, especially from the examples in the RFC.
* The date format "YmdThis" results into an incorrect date for the
  "UNTIL" parameter. The literal "T" should be escaped, and a literal
  "Z" is also needed at the end of the format string to indicate UTC.
* Implemented handling of negative modifier values for BYxxx rules.
* Implemented handling of BYWEEKNO, BYYEARDAY, BYSETPOS, BYHOUR,
  BYMINUTE, BYSECOND rules.

4 years agoMDL-55956 calendar: Include courses parameter in subquery conditions
Jun Pataleta [Wed, 8 Mar 2017 07:30:04 +0000 (15:30 +0800)]
MDL-55956 calendar: Include courses parameter in subquery conditions

4 years agoMDL-57975 core: version bump
Ryan Wyllie [Wed, 22 Feb 2017 05:55:26 +0000 (05:55 +0000)]
MDL-57975 core: version bump

Part of MDL-55611

4 years agoMDL-57975 core: add userdate mustache php helper
Ryan Wyllie [Tue, 21 Feb 2017 05:44:57 +0000 (05:44 +0000)]
MDL-57975 core: add userdate mustache php helper

Part of MDL-55611

4 years agoMDL-57975 javascript: add userdate mustache js helper
Ryan Wyllie [Tue, 21 Feb 2017 05:34:33 +0000 (05:34 +0000)]
MDL-57975 javascript: add userdate mustache js helper

Part of MDL-55611

4 years agoMDL-57975 javascript: add user_date.js
Ryan Wyllie [Tue, 21 Feb 2017 05:32:12 +0000 (05:32 +0000)]
MDL-57975 javascript: add user_date.js

Part of MDL-55611

4 years agoMDL-57975 core: test for user date external function
Ryan Wyllie [Wed, 22 Feb 2017 05:53:46 +0000 (05:53 +0000)]
MDL-57975 core: test for user date external function

Part of MDL-55611

4 years agoMDL-57975 core: add get user date external function
Ryan Wyllie [Tue, 21 Feb 2017 05:31:18 +0000 (05:31 +0000)]
MDL-57975 core: add get user date external function

Part of MDL-55611

4 years agoMDL-57751 libraries: Remove <2.6 only check from load_installed_plugins
John Okely [Thu, 22 Dec 2016 08:14:11 +0000 (16:14 +0800)]
MDL-57751 libraries: Remove <2.6 only check from load_installed_plugins

4 years agoMerge branch 'MDL-57990-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Tue, 7 Mar 2017 17:00:07 +0000 (14:00 -0300)]
Merge branch 'MDL-57990-master' of git://github.com/crazyserver/moodle

4 years agoAutomatically generated installer lang files
AMOS bot [Tue, 7 Mar 2017 16:05:35 +0000 (00:05 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-58064-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 7 Mar 2017 15:36:54 +0000 (16:36 +0100)]
Merge branch 'MDL-58064-master-enfix' of git://github.com/mudrd8mz/moodle

4 years agoMerge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle
Dan Poltawski [Tue, 7 Mar 2017 14:12:32 +0000 (11:12 -0300)]
Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle

4 years agoMerge branch 'wip-mdl-58056' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 7 Mar 2017 14:08:24 +0000 (11:08 -0300)]
Merge branch 'wip-mdl-58056' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'MDL-57361-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 7 Mar 2017 14:07:47 +0000 (11:07 -0300)]
Merge branch 'MDL-57361-master' of git://github.com/jleyva/moodle

4 years agoMDL-58035 tool_templatelibrary: fix unit test using removed base theme
Tim Hunt [Tue, 7 Mar 2017 13:35:06 +0000 (13:35 +0000)]
MDL-58035 tool_templatelibrary: fix unit test using removed base theme

4 years agoMDL-58035 lib: log when the expected theme cannot be initialised
Tim Hunt [Tue, 21 Feb 2017 11:50:47 +0000 (11:50 +0000)]
MDL-58035 lib: log when the expected theme cannot be initialised

4 years agoMerge branch 'MDL-58106' of git://github.com/timhunt/moodle
David Monllao [Tue, 7 Mar 2017 12:37:24 +0000 (13:37 +0100)]
Merge branch 'MDL-58106' of git://github.com/timhunt/moodle

4 years agoMerge branch 'wip-mdl-58091' of https://github.com/rajeshtaneja/moodle
David Monllao [Tue, 7 Mar 2017 12:15:55 +0000 (13:15 +0100)]
Merge branch 'wip-mdl-58091' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'MDL-57280-master' of git://github.com/ryanwyllie/moodle
David Monllao [Tue, 7 Mar 2017 12:13:51 +0000 (13:13 +0100)]
Merge branch 'MDL-57280-master' of git://github.com/ryanwyllie/moodle

4 years agoMDL-58064 lang: Clarify the PHP 7.x limitations
David Mudrák [Tue, 7 Mar 2017 12:01:27 +0000 (13:01 +0100)]
MDL-58064 lang: Clarify the PHP 7.x limitations

These are related to SQL*Server support only and affect all PHP 7
versions, not just 7.0.x. Credit goes to Eloy Lafuente for spotting
this.

4 years agoMerge branch 'wip-MDL-57485-master' of git://github.com/abgreeve/moodle
David Monllao [Tue, 7 Mar 2017 11:15:46 +0000 (12:15 +0100)]
Merge branch 'wip-MDL-57485-master' of git://github.com/abgreeve/moodle

4 years agoMerge branch 'MDL-58057-master' of https://github.com/snake/moodle
David Monllao [Tue, 7 Mar 2017 11:09:00 +0000 (12:09 +0100)]
Merge branch 'MDL-58057-master' of https://github.com/snake/moodle

4 years agoMerge branch 'MDL-45584_master' of git://github.com/markn86/moodle
David Monllao [Tue, 7 Mar 2017 11:00:01 +0000 (12:00 +0100)]
Merge branch 'MDL-45584_master' of git://github.com/markn86/moodle

4 years agoMDL-58040 blocks: add upgrade.txt note
Dan Poltawski [Tue, 7 Mar 2017 10:46:38 +0000 (07:46 -0300)]
MDL-58040 blocks: add upgrade.txt note

4 years agoMerge branch 'MDL-58040' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 7 Mar 2017 10:43:46 +0000 (07:43 -0300)]
Merge branch 'MDL-58040' of git://github.com/timhunt/moodle

4 years agoMerge branch 'MDL-55859-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 7 Mar 2017 10:02:33 +0000 (07:02 -0300)]
Merge branch 'MDL-55859-master' of git://github.com/ankitagarwal/moodle

4 years agoMerge branch 'MDL-58052_behat_get_session_user' of https://github.com/gthomas2/moodle
Dan Poltawski [Tue, 7 Mar 2017 09:54:37 +0000 (06:54 -0300)]
Merge branch 'MDL-58052_behat_get_session_user' of https://github.com/gthomas2/moodle

4 years agoMerge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 7 Mar 2017 09:47:38 +0000 (06:47 -0300)]
Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle

4 years agoMDL-57362 assign: Fix permission checks
Ankit Agarwal [Tue, 7 Mar 2017 07:13:30 +0000 (12:43 +0530)]
MDL-57362 assign: Fix permission checks

4 years agoMerge branch 'MDL-57972-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Tue, 7 Mar 2017 06:35:00 +0000 (14:35 +0800)]
Merge branch 'MDL-57972-master' of git://github.com/ryanwyllie/moodle

4 years agoMDL-57972 mustache: add shortentext template helper
Ryan Wyllie [Fri, 17 Feb 2017 01:15:46 +0000 (01:15 +0000)]
MDL-57972 mustache: add shortentext template helper

Part of MDL-55611

4 years agoMDL-57972 javascript: add upgrade instructions for truncate.js
Ryan Wyllie [Tue, 7 Mar 2017 05:21:47 +0000 (05:21 +0000)]
MDL-57972 javascript: add upgrade instructions for truncate.js

Part of MDL-55611

4 years agoMDL-57972 javascript: Change truncate.js behaviour
Ryan Wyllie [Mon, 20 Feb 2017 07:47:40 +0000 (07:47 +0000)]
MDL-57972 javascript: Change truncate.js behaviour

Updated truncate.js to behave closer to the moodle implementation of
shorten_text.

Part of MDL-55611

4 years agoMDL-57972 javascript: Add truncate.js third party lib
Ryan Wyllie [Mon, 20 Feb 2017 07:45:43 +0000 (07:45 +0000)]
MDL-57972 javascript: Add truncate.js third party lib

Part of MDL-55611

4 years agoMerge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle
Andrew Nicols [Tue, 7 Mar 2017 04:07:50 +0000 (12:07 +0800)]
Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle

4 years agoMDL-55956 mod_assign: Remove calendar events with 'open' eventtype
Jun Pataleta [Fri, 3 Mar 2017 08:19:49 +0000 (16:19 +0800)]
MDL-55956 mod_assign: Remove calendar events with 'open' eventtype

Remove creation of calendar events for mod_assign with
eventtype = 'open'. Since mod_assign instance creation only creates a
calendar event for the due date, there's no point in creating an override
event for an event type that does not exist.

4 years agoMDL-55956 calendar: Show only one of duplicate events relevant to user
Jun Pataleta [Wed, 11 Jan 2017 08:25:38 +0000 (16:25 +0800)]
MDL-55956 calendar: Show only one of duplicate events relevant to user

If there are multiple, non-repeating events with the same module name,
instance and event type. The most specific event or the event with the
highest priority will be shown.
The ordering of event priorities:
  User override events > Group override events > Course events.
If there are no user override events and there are multiple group
overrides for an event, then the one with the highest priority will be
shown.

4 years agoMDL-55956 mod: Set event priority for activity overrides
Jun Pataleta [Wed, 11 Jan 2017 03:16:03 +0000 (11:16 +0800)]
MDL-55956 mod: Set event priority for activity overrides

Set the event priority of the following activity overrides:
* mod_assign
* mod_lesson
* mod_quiz
Always create separate events for start and end dates of activities.

4 years agoMDL-58057 core_files: properly trim curl whitelist config when fetching
Jake Dallimore [Thu, 23 Feb 2017 03:01:58 +0000 (11:01 +0800)]
MDL-58057 core_files: properly trim curl whitelist config when fetching

4 years agoMDL-57975 javascript: add sessionstorage.js
Ryan Wyllie [Wed, 22 Feb 2017 02:33:39 +0000 (02:33 +0000)]
MDL-57975 javascript: add sessionstorage.js

Part of MDL-55611

4 years agoMDL-55528 admin: Add a new generic admin setting type
Andrew Nicols [Fri, 17 Feb 2017 01:29:34 +0000 (09:29 +0800)]
MDL-55528 admin: Add a new generic admin setting type

4 years agoMDL-57932 version: bump for new icon
Dan Poltawski [Mon, 6 Mar 2017 16:54:32 +0000 (13:54 -0300)]
MDL-57932 version: bump for new icon

4 years agoMerge branch 'MDL-57932-core-moodle-logo-svg' of https://github.com/lucaboesch/moodle
Dan Poltawski [Mon, 6 Mar 2017 16:51:07 +0000 (13:51 -0300)]
Merge branch 'MDL-57932-core-moodle-logo-svg' of https://github.com/lucaboesch/moodle