moodle.git
4 years agoMerge branch 'MDL-58291-master-unoconvlink' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 20 Mar 2017 08:49:54 +0000 (08:49 +0000)]
Merge branch 'MDL-58291-master-unoconvlink' of git://github.com/mudrd8mz/moodle

4 years agoMerge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 20 Mar 2017 07:54:22 +0000 (07:54 +0000)]
Merge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-57657-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 20 Mar 2017 07:24:54 +0000 (07:24 +0000)]
Merge branch 'MDL-57657-master' of git://github.com/jleyva/moodle

4 years agoMDL-34859 backup: add restore defaults
Marina Glancy [Fri, 17 Feb 2017 08:21:55 +0000 (16:21 +0800)]
MDL-34859 backup: add restore defaults

4 years agoMDL-34859 course: use defaultcustom element for sections
Marina Glancy [Tue, 14 Feb 2017 07:53:20 +0000 (15:53 +0800)]
MDL-34859 course: use defaultcustom element for sections

4 years agoMDL-34859 forms: new element defaultcustom
Marina Glancy [Thu, 16 Feb 2017 05:52:32 +0000 (13:52 +0800)]
MDL-34859 forms: new element defaultcustom

4 years agoMDL-40759 themes: Correct ignore file whitespace
Andrew Nicols [Mon, 20 Mar 2017 06:40:37 +0000 (14:40 +0800)]
MDL-40759 themes: Correct ignore file whitespace

4 years agoMerge branch 'MDL-57419-master-2' of https://github.com/xow/moodle
David Monllao [Mon, 20 Mar 2017 06:33:25 +0000 (07:33 +0100)]
Merge branch 'MDL-57419-master-2' of https://github.com/xow/moodle

4 years agoMerge branch 'MDL-40759-master' of git://github.com/damyon/moodle
Andrew Nicols [Mon, 20 Mar 2017 05:57:38 +0000 (13:57 +0800)]
Merge branch 'MDL-40759-master' of git://github.com/damyon/moodle

4 years agoMerge branch 'MDL-57254-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 20 Mar 2017 05:48:43 +0000 (06:48 +0100)]
Merge branch 'MDL-57254-master' of git://github.com/jleyva/moodle

4 years agoMDL-40759 fontawesome: Add BC for unmapped icons
Damyon Wiese [Mon, 20 Mar 2017 02:57:41 +0000 (10:57 +0800)]
MDL-40759 fontawesome: Add BC for unmapped icons

This is yukky but it works. Note: I had to duplicate the standard pix icon template
inside the font-awesome one because the way this is rendered does not support partials.

4 years agoMerge branch 'MDL-57994' of https://github.com/ak4t0sh/moodle
David Monllao [Mon, 20 Mar 2017 05:29:16 +0000 (06:29 +0100)]
Merge branch 'MDL-57994' of https://github.com/ak4t0sh/moodle

4 years agoMerge branch 'MDL-57390-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 20 Mar 2017 05:07:25 +0000 (06:07 +0100)]
Merge branch 'MDL-57390-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-58288-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 20 Mar 2017 04:15:29 +0000 (05:15 +0100)]
Merge branch 'MDL-58288-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-58166-m' of git://github.com/pavelsokolov/moodle
David Monllao [Mon, 20 Mar 2017 04:13:10 +0000 (05:13 +0100)]
Merge branch 'MDL-58166-m' of git://github.com/pavelsokolov/moodle

4 years agoMerge branch 'MDL-58182-master' of https://github.com/snake/moodle
David Monllao [Mon, 20 Mar 2017 04:04:25 +0000 (05:04 +0100)]
Merge branch 'MDL-58182-master' of https://github.com/snake/moodle

4 years agoMerge branch 'MDL-57429-master' of https://github.com/snake/moodle
Andrew Nicols [Mon, 20 Mar 2017 00:16:07 +0000 (08:16 +0800)]
Merge branch 'MDL-57429-master' of https://github.com/snake/moodle

4 years agoMDL-58166 mod_assign: markingworkflow breaks assign for non-graders
Pavel Sokolov [Fri, 17 Mar 2017 14:45:20 +0000 (17:45 +0300)]
MDL-58166 mod_assign: markingworkflow breaks assign for non-graders

4 years agoMerge branch 'MDL-57648-master' of git://github.com/jleyva/moodle
Dan Poltawski [Fri, 17 Mar 2017 08:21:03 +0000 (08:21 +0000)]
Merge branch 'MDL-57648-master' of git://github.com/jleyva/moodle

4 years agoMDL-40759 fontawesome: Minor cleanups
Damyon Wiese [Fri, 17 Mar 2017 07:25:56 +0000 (15:25 +0800)]
MDL-40759 fontawesome: Minor cleanups

Remove eslint hints that are not required and revert changes to the
behat test for recycle bin that are not needed.

4 years agoMDL-40759 fontawesome: Fix bugs from rebase
Damyon Wiese [Fri, 17 Mar 2017 01:57:03 +0000 (09:57 +0800)]
MDL-40759 fontawesome: Fix bugs from rebase

4 years agoMDL-40759 icons: More details in upgrade.txt
Damyon Wiese [Wed, 1 Mar 2017 07:24:51 +0000 (15:24 +0800)]
MDL-40759 icons: More details in upgrade.txt

More details in upgrade.txt for developers who were using pix_url.

4 years agoMDL-40759 icons: Peer review fixes (all minor)
Damyon Wiese [Wed, 1 Mar 2017 06:09:40 +0000 (14:09 +0800)]
MDL-40759 icons: Peer review fixes (all minor)

4 years agoMDL-40759 icons: Keep separate alt/title
Damyon Wiese [Wed, 1 Mar 2017 05:39:33 +0000 (13:39 +0800)]
MDL-40759 icons: Keep separate alt/title

For font awesome icons I had only supported one of alt/title. This was because (subjectively) we have
done a terrible job of providing meaningful alt text for icons. This is not a good idea and not backwards
compatible so I have put it back again.

Fingers crossed I did not break 1000 behats.

4 years agoMDL-40759 icons: Rename activity_icon
Damyon Wiese [Thu, 16 Feb 2017 05:42:03 +0000 (13:42 +0800)]
MDL-40759 icons: Rename activity_icon

image_icon is a better name because there are some valid uses for these other than for activity icons.

E.g. Old JS code that is not worth re-writing.

4 years agoMDL-40759 icons: Behat fixes for font-awesome
Damyon Wiese [Fri, 3 Feb 2017 05:14:05 +0000 (13:14 +0800)]
MDL-40759 icons: Behat fixes for font-awesome

4 years agoMDL-40759 icons: Better mapping of some icons
Damyon Wiese [Thu, 2 Feb 2017 06:25:55 +0000 (14:25 +0800)]
MDL-40759 icons: Better mapping of some icons

4 years agoMDL-40759 icons: Refactor to allow theme icon systems
Damyon Wiese [Thu, 2 Feb 2017 04:59:55 +0000 (12:59 +0800)]
MDL-40759 icons: Refactor to allow theme icon systems

4 years agoMDL-40759 icons: Remove unused file type icons.
Damyon Wiese [Tue, 31 Jan 2017 07:18:25 +0000 (15:18 +0800)]
MDL-40759 icons: Remove unused file type icons.

Because we can use svgs always - we got rid of different size icons for file types.

4 years agoMDL-40759 icons: Fixes for icons used in CSS
Damyon Wiese [Tue, 31 Jan 2017 07:06:17 +0000 (15:06 +0800)]
MDL-40759 icons: Fixes for icons used in CSS

4 years agoMDL-40759 icons: Fix when icon map comes from cache
Damyon Wiese [Tue, 31 Jan 2017 06:45:24 +0000 (14:45 +0800)]
MDL-40759 icons: Fix when icon map comes from cache

4 years agoMDL-40759 icons: Update unit tests
Damyon Wiese [Tue, 31 Jan 2017 02:37:02 +0000 (10:37 +0800)]
MDL-40759 icons: Update unit tests

Match the expected output for unit tests.

4 years agoMDL-40759 icons: filepicker
Damyon Wiese [Mon, 30 Jan 2017 09:14:17 +0000 (17:14 +0800)]
MDL-40759 icons: filepicker

Use font awesome svg icons for files in the file picker. Move the old icons to bootstrapbase.

4 years agoMDL-40759 icons: convert uses of pix_url to pix_icon
Damyon Wiese [Thu, 19 Jan 2017 08:20:27 +0000 (16:20 +0800)]
MDL-40759 icons: convert uses of pix_url to pix_icon

Also change filepicker to use scaled svgs instead of sets of custom pngs. The svgs are taken from font-awesome.

4 years agoMDL-40759 icons: Fix icons in action menus and links
Damyon Wiese [Fri, 20 Jan 2017 06:56:28 +0000 (14:56 +0800)]
MDL-40759 icons: Fix icons in action menus and links

Always use the pix icon helper in templates.

4 years agoMDL-40759 icons: Deprecate $OUTPUT->pix_url()
Damyon Wiese [Fri, 20 Jan 2017 03:05:33 +0000 (11:05 +0800)]
MDL-40759 icons: Deprecate $OUTPUT->pix_url()

4 years agoMDL-40759 icons: Split pix_icon from activity_icon
Damyon Wiese [Thu, 19 Jan 2017 06:06:07 +0000 (14:06 +0800)]
MDL-40759 icons: Split pix_icon from activity_icon

Activity icons always use the standard icon renderer.

4 years agoMDL-40759 icons: Refactor icon system to be extensible.
Damyon Wiese [Tue, 3 Jan 2017 02:40:42 +0000 (10:40 +0800)]
MDL-40759 icons: Refactor icon system to be extensible.

4 years agoMDL-40759 pix: Use proper pix tags for required fields.
Damyon Wiese [Wed, 21 Dec 2016 01:41:09 +0000 (09:41 +0800)]
MDL-40759 pix: Use proper pix tags for required fields.

4 years agoMDL-40759 output: Fix non-existent fa icons
Damyon Wiese [Tue, 20 Dec 2016 08:52:00 +0000 (16:52 +0800)]
MDL-40759 output: Fix non-existent fa icons

4 years agoMDL-40759 upgrade: Note about fontawesome callback
Damyon Wiese [Tue, 20 Dec 2016 08:29:19 +0000 (16:29 +0800)]
MDL-40759 upgrade: Note about fontawesome callback

4 years agoMDL-40759 plugins: Add font icon mapping to all plugins
Damyon Wiese [Tue, 20 Dec 2016 08:08:21 +0000 (16:08 +0800)]
MDL-40759 plugins: Add font icon mapping to all plugins

4 years agoMDL-40759 dragdrop: Use a pix icon renderer for drag handles.
Damyon Wiese [Tue, 20 Dec 2016 07:19:14 +0000 (15:19 +0800)]
MDL-40759 dragdrop: Use a pix icon renderer for drag handles.

4 years agoMDL-40759 atto: Use pix_icon renderer for atto buttons
Damyon Wiese [Tue, 20 Dec 2016 06:39:22 +0000 (14:39 +0800)]
MDL-40759 atto: Use pix_icon renderer for atto buttons

4 years agoMDL-40759 course: Fix group mode switcher to use renderPix
Damyon Wiese [Tue, 20 Dec 2016 05:06:13 +0000 (13:06 +0800)]
MDL-40759 course: Fix group mode switcher to use renderPix

Dont assume icons are image tags and call Templates.renderPix to rebuild the entire icon.

4 years agoMDL-40759 themes: font awesome support
Damyon Wiese [Mon, 19 Dec 2016 08:50:49 +0000 (16:50 +0800)]
MDL-40759 themes: font awesome support

We add a new theme config so the theme can say it supports font-awesome.
If this is true, the pix_icon renderer will call a mapping function to map
from the moodle style t/edit to a font-awesome style fa-cog icon name. Then the renderer
will either render an image tag for old icons - or an accessible font-awesome <i> tag.

This mostly works - but there are some places where we don't use the pix icon renderer, and
we directly create image tags with pix_url image sources. These will need updating (Atto icons,
drag and drop move icons, editpdf icons).

4 years agoMDL-58288 fileconverter_unoconv: Remove old test conversions
Andrew Nicols [Fri, 17 Mar 2017 01:27:55 +0000 (09:27 +0800)]
MDL-58288 fileconverter_unoconv: Remove old test conversions

4 years agoMDL-58288 fileconverter_unoconv: Fix issue with test generation
Andrew Nicols [Fri, 17 Mar 2017 01:27:37 +0000 (09:27 +0800)]
MDL-58288 fileconverter_unoconv: Fix issue with test generation

4 years agoMDL-58182 javascript: Fix for buttons regression in core dialog.
Jake Dallimore [Wed, 8 Mar 2017 06:33:05 +0000 (14:33 +0800)]
MDL-58182 javascript: Fix for buttons regression in core dialog.

Fixes a regression caused by MDL-56364, wherein the buttons were made
readOnly, meaning addButtons wouldn't work. This removes that change,
while maintaining the original dependency between the buttons and the
closeButton config options.

4 years agoMDL-58291 fileconverter_unoconv: Fix the admin section name
David Mudrák [Thu, 16 Mar 2017 18:56:59 +0000 (19:56 +0100)]
MDL-58291 fileconverter_unoconv: Fix the admin section name

4 years agoMDL-57994 course: fix newsitems value
Arnaud Trouve [Fri, 10 Mar 2017 17:20:30 +0000 (18:20 +0100)]
MDL-57994 course: fix newsitems value

4 years agoMDL-57657 mod_lesson: New WS mod_lesson_get_user_attempt_grade
Juan Leyva [Mon, 16 Jan 2017 14:50:21 +0000 (15:50 +0100)]
MDL-57657 mod_lesson: New WS mod_lesson_get_user_attempt_grade

4 years agoMDL-57657 mod_lesson: New WS mod_lesson_get_user_grade
Juan Leyva [Mon, 16 Jan 2017 14:17:42 +0000 (15:17 +0100)]
MDL-57657 mod_lesson: New WS mod_lesson_get_user_grade

4 years agoMDL-57648 mod_lesson: New Web Service mod_lesson_get_questions_attempts
Juan Leyva [Fri, 13 Jan 2017 15:24:10 +0000 (16:24 +0100)]
MDL-57648 mod_lesson: New Web Service mod_lesson_get_questions_attempts

4 years agoMerge branch 'MDL-57645-master' of git://github.com/jleyva/moodle
Dan Poltawski [Thu, 16 Mar 2017 15:42:07 +0000 (15:42 +0000)]
Merge branch 'MDL-57645-master' of git://github.com/jleyva/moodle

4 years agoMDL-57645 mod_lesson: New Web Service mod_lesson_view_lesson
Juan Leyva [Fri, 13 Jan 2017 10:27:17 +0000 (11:27 +0100)]
MDL-57645 mod_lesson: New Web Service mod_lesson_view_lesson

4 years agoMDL-57645 mod_lesson: Refactor code to move completion to lib
Juan Leyva [Fri, 13 Jan 2017 10:26:53 +0000 (11:26 +0100)]
MDL-57645 mod_lesson: Refactor code to move completion to lib

This commit also fix how completion was being set (before the access
restriction checks)

4 years agoweekly release 3.3dev
Dan Poltawski [Thu, 16 Mar 2017 11:52:46 +0000 (11:52 +0000)]
weekly release 3.3dev

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 16 Mar 2017 11:52:44 +0000 (11:52 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMDL-57419 messaging: Don't use enter to send
John Okely [Wed, 15 Mar 2017 07:29:33 +0000 (15:29 +0800)]
MDL-57419 messaging: Don't use enter to send

4 years agoMDL-57429 badges: removal of unused Persona code
Jake Dallimore [Tue, 21 Feb 2017 07:45:56 +0000 (15:45 +0800)]
MDL-57429 badges: removal of unused Persona code

Removed the backpackconnect script used with Persona, and all the
associated js code.

4 years agoMDL-57429 badges: lang string deprecation for new email verify process
Jake Dallimore [Tue, 21 Feb 2017 07:41:02 +0000 (15:41 +0800)]
MDL-57429 badges: lang string deprecation for new email verify process

Deprecated those lang strings used in the old Persona login process.

4 years agoMDL-57429 badges: add email verification for openbackpack connections
Jake Dallimore [Tue, 21 Feb 2017 07:10:28 +0000 (15:10 +0800)]
MDL-57429 badges: add email verification for openbackpack connections

With the Persona provider now out of commission, no new connections to
the Mozilla openbackpack can be created. This patch adds an email
verification step to core to restore the openbackpack functionality.

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

4 years agoMerge branch 'MDL-57913_auth_db_sync_task_master' of git://github.com/gthomas2/moodle
Andrew Nicols [Wed, 15 Mar 2017 23:39:48 +0000 (07:39 +0800)]
Merge branch 'MDL-57913_auth_db_sync_task_master' of git://github.com/gthomas2/moodle

4 years agoMDL-57913 auth_db: warn CLI about scheduled task, abort CLI if scheduled task enabled
gthomas2 [Wed, 15 Mar 2017 16:42:45 +0000 (16:42 +0000)]
MDL-57913 auth_db: warn CLI about scheduled task, abort CLI if scheduled task enabled

4 years agoMDL-57643 mod_lesson: New WS mod_lesson_get_access_information
Juan Leyva [Thu, 12 Jan 2017 22:25:17 +0000 (23:25 +0100)]
MDL-57643 mod_lesson: New WS mod_lesson_get_access_information

4 years agoMDL-57643 mod_lesson: Refactor, move php code to locallib
Juan Leyva [Thu, 12 Jan 2017 22:25:00 +0000 (23:25 +0100)]
MDL-57643 mod_lesson: Refactor, move php code to locallib

4 years agoMerge branch 'MDL-57631_master-disable-cli' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 15 Mar 2017 08:12:04 +0000 (08:12 +0000)]
Merge branch 'MDL-57631_master-disable-cli' of git://github.com/dmonllao/moodle

4 years agoMDL-57631 enrol_ldap: Disable CLI script if task is enabled
David Monllao [Wed, 15 Mar 2017 07:49:10 +0000 (08:49 +0100)]
MDL-57631 enrol_ldap: Disable CLI script if task is enabled

4 years agoMerge branch 'MDL-57658-master-integration-fix-2' of git://github.com/junpataleta...
Andrew Nicols [Wed, 15 Mar 2017 06:44:17 +0000 (14:44 +0800)]
Merge branch 'MDL-57658-master-integration-fix-2' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'MDL-55528-master-fix' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 15 Mar 2017 06:31:49 +0000 (14:31 +0800)]
Merge branch 'MDL-55528-master-fix' of git://github.com/andrewnicols/moodle

4 years agoMDL-57658 calendar: Remove BYDAY filtering dependence on NumberFormatter
Jun Pataleta [Wed, 15 Mar 2017 06:03:07 +0000 (14:03 +0800)]
MDL-57658 calendar: Remove BYDAY filtering dependence on NumberFormatter

4 years agoMerge branch 'MDL-57658-master-integration-fix' of git://github.com/junpataleta/moodle
Andrew Nicols [Wed, 15 Mar 2017 03:42:28 +0000 (11:42 +0800)]
Merge branch 'MDL-57658-master-integration-fix' of git://github.com/junpataleta/moodle

4 years agoMDL-57658 calendar: Set sort order for fetched DB records
Jun Pataleta [Wed, 15 Mar 2017 03:18:21 +0000 (11:18 +0800)]
MDL-57658 calendar: Set sort order for fetched DB records

4 years agoMerge branch 'MDL-47354_gradereport_singleview_perpage' of git://github.com/davosmith...
Andrew Nicols [Wed, 15 Mar 2017 03:17:49 +0000 (11:17 +0800)]
Merge branch 'MDL-47354_gradereport_singleview_perpage' of git://github.com/davosmith/moodle

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 agoAutomatically generated installer lang files
AMOS bot [Tue, 14 Mar 2017 16:04:32 +0000 (00:04 +0800)]
Automatically generated installer lang files

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 agoMDL-57390 mod_forum: Return more permissions in can_add_discussion
Juan Leyva [Tue, 14 Mar 2017 14:10:16 +0000 (15:10 +0100)]
MDL-57390 mod_forum: Return more permissions in can_add_discussion

When adding new discussions we should know if:
- Pinned discussions can be created
- Attachments are supported

4 years agoMDL-57254 mod_choice: Add not open case in choice_can_view_results
Juan Leyva [Tue, 14 Mar 2017 12:34:27 +0000 (13:34 +0100)]
MDL-57254 mod_choice: Add not open case in choice_can_view_results

If the choice is not available (not open yet), the function must return
false even is CHOICE_SHOWRESULTS_ALWAYS is set to true.
This was failing only in Web Services, in Web that function is not
reached (execution stops when the time open check is done).

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