Dan Poltawski [Mon, 20 Mar 2017 13:15:07 +0000 (13:15 +0000)]
Merge branch 'MDL-58121-master' of https://github.com/snake/moodle
Dan Poltawski [Mon, 20 Mar 2017 13:08:54 +0000 (13:08 +0000)]
Merge branch 'MDL-58255-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 20 Mar 2017 11:39:58 +0000 (11:39 +0000)]
Merge branch 'MDL-58263-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 20 Mar 2017 11:35:43 +0000 (12:35 +0100)]
Merge branch 'MDL-57812-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 20 Mar 2017 11:27:04 +0000 (11:27 +0000)]
Merge branch 'MDL-57838-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 20 Mar 2017 11:09:33 +0000 (11:09 +0000)]
Merge branch 'MDL-58273-master-ldapenrol' of git://github.com/mudrd8mz/moodle
David Monllao [Mon, 20 Mar 2017 10:25:09 +0000 (11:25 +0100)]
Merge branch 'MDL-57665_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 20 Mar 2017 10:20:22 +0000 (11:20 +0100)]
Merge branch 'MDL-57664_master' of git://github.com/dmonllao/moodle
Juan Leyva [Tue, 17 Jan 2017 16:27:45 +0000 (17:27 +0100)]
MDL-57665 mod_lesson: New WS mod_lesson_get_user_timers
Juan Leyva [Tue, 17 Jan 2017 16:27:37 +0000 (17:27 +0100)]
MDL-57665 mod_lesson: New method for get timers
Juan Leyva [Mon, 16 Jan 2017 17:06:05 +0000 (18:06 +0100)]
MDL-57664 mod_lesson: New Ws mod_lesson_get_content_pages_viewed
Juan Leyva [Mon, 16 Jan 2017 17:05:30 +0000 (18:05 +0100)]
MDL-57664 mod_lesson: New lesson method get_content_pages_viewed
David Monllao [Mon, 20 Mar 2017 09:15:36 +0000 (10:15 +0100)]
Merge branch 'MDL-37168-master' of https://github.com/xow/moodle
Dan Poltawski [Mon, 20 Mar 2017 08:53:23 +0000 (08:53 +0000)]
Merge branch 'MDL-58285' of https://github.com/NeillM/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
John Okely [Fri, 27 Jan 2017 06:59:33 +0000 (14:59 +0800)]
MDL-37168 grade: Debugging if gradebook callbacks are not both present
John Okely [Tue, 10 Jan 2017 04:09:02 +0000 (12:09 +0800)]
MDL-37168 mod_lti: Add behat test to cover lti quick edit
Sam Chaffee [Tue, 20 May 2014 16:44:46 +0000 (10:44 -0600)]
MDL-37168 mod_lti: Fix LTI activity quick edit title
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
Dan Poltawski [Mon, 20 Mar 2017 07:24:54 +0000 (07:24 +0000)]
Merge branch 'MDL-57657-master' of git://github.com/jleyva/moodle
Marina Glancy [Fri, 17 Feb 2017 08:21:55 +0000 (16:21 +0800)]
MDL-34859 backup: add restore defaults
Marina Glancy [Tue, 14 Feb 2017 07:53:20 +0000 (15:53 +0800)]
MDL-34859 course: use defaultcustom element for sections
Marina Glancy [Thu, 16 Feb 2017 05:52:32 +0000 (13:52 +0800)]
MDL-34859 forms: new element defaultcustom
Andrew Nicols [Mon, 20 Mar 2017 06:40:37 +0000 (14:40 +0800)]
MDL-40759 themes: Correct ignore file whitespace
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
Andrew Nicols [Mon, 20 Mar 2017 05:57:38 +0000 (13:57 +0800)]
Merge branch 'MDL-40759-master' of git://github.com/damyon/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
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.
David Monllao [Mon, 20 Mar 2017 05:29:16 +0000 (06:29 +0100)]
Merge branch 'MDL-57994' of https://github.com/ak4t0sh/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
David Monllao [Mon, 20 Mar 2017 04:15:29 +0000 (05:15 +0100)]
Merge branch 'MDL-58288-master' of git://github.com/andrewnicols/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
David Monllao [Mon, 20 Mar 2017 04:04:25 +0000 (05:04 +0100)]
Merge branch 'MDL-58182-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
Pavel Sokolov [Fri, 17 Mar 2017 14:45:20 +0000 (17:45 +0300)]
MDL-58166 mod_assign: markingworkflow breaks assign for non-graders
Dan Poltawski [Fri, 17 Mar 2017 08:21:03 +0000 (08:21 +0000)]
Merge branch 'MDL-57648-master' of git://github.com/jleyva/moodle
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.
Damyon Wiese [Fri, 17 Mar 2017 01:57:03 +0000 (09:57 +0800)]
MDL-40759 fontawesome: Fix bugs from rebase
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.
Damyon Wiese [Wed, 1 Mar 2017 06:09:40 +0000 (14:09 +0800)]
MDL-40759 icons: Peer review fixes (all minor)
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.
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.
Damyon Wiese [Fri, 3 Feb 2017 05:14:05 +0000 (13:14 +0800)]
MDL-40759 icons: Behat fixes for font-awesome
Damyon Wiese [Thu, 2 Feb 2017 06:25:55 +0000 (14:25 +0800)]
MDL-40759 icons: Better mapping of some icons
Damyon Wiese [Thu, 2 Feb 2017 04:59:55 +0000 (12:59 +0800)]
MDL-40759 icons: Refactor to allow theme icon systems
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.
Damyon Wiese [Tue, 31 Jan 2017 07:06:17 +0000 (15:06 +0800)]
MDL-40759 icons: Fixes for icons used in CSS
Damyon Wiese [Tue, 31 Jan 2017 06:45:24 +0000 (14:45 +0800)]
MDL-40759 icons: Fix when icon map comes from cache
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.
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.
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.
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.
Damyon Wiese [Fri, 20 Jan 2017 03:05:33 +0000 (11:05 +0800)]
MDL-40759 icons: Deprecate $OUTPUT->pix_url()
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.
Damyon Wiese [Tue, 3 Jan 2017 02:40:42 +0000 (10:40 +0800)]
MDL-40759 icons: Refactor icon system to be extensible.
Damyon Wiese [Wed, 21 Dec 2016 01:41:09 +0000 (09:41 +0800)]
MDL-40759 pix: Use proper pix tags for required fields.
Damyon Wiese [Tue, 20 Dec 2016 08:52:00 +0000 (16:52 +0800)]
MDL-40759 output: Fix non-existent fa icons
Damyon Wiese [Tue, 20 Dec 2016 08:29:19 +0000 (16:29 +0800)]
MDL-40759 upgrade: Note about fontawesome callback
Damyon Wiese [Tue, 20 Dec 2016 08:08:21 +0000 (16:08 +0800)]
MDL-40759 plugins: Add font icon mapping to all plugins
Damyon Wiese [Tue, 20 Dec 2016 07:19:14 +0000 (15:19 +0800)]
MDL-40759 dragdrop: Use a pix icon renderer for drag handles.
Damyon Wiese [Tue, 20 Dec 2016 06:39:22 +0000 (14:39 +0800)]
MDL-40759 atto: Use pix_icon renderer for atto buttons
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.
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).
Jun Pataleta [Tue, 14 Mar 2017 08:25:14 +0000 (16:25 +0800)]
MDL-58255 mod_assign: Fix usage of assign object for overrides
* Fix the parameters being passed for the assign constructor.
* Use assign::get_instance() instead of assign::get_context() to fetch
the assignment instance's properties.
Andrew Nicols [Fri, 17 Mar 2017 01:27:55 +0000 (09:27 +0800)]
MDL-58288 fileconverter_unoconv: Remove old test conversions
Andrew Nicols [Fri, 17 Mar 2017 01:27:37 +0000 (09:27 +0800)]
MDL-58288 fileconverter_unoconv: Fix issue with test generation
Jake Dallimore [Thu, 2 Mar 2017 02:34:45 +0000 (10:34 +0800)]
MDL-58121 email: ensure support user is defined in email_to_user
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.
David Mudrák [Thu, 16 Mar 2017 18:56:59 +0000 (19:56 +0100)]
MDL-58291 fileconverter_unoconv: Fix the admin section name
Arnaud Trouve [Fri, 10 Mar 2017 17:20:30 +0000 (18:20 +0100)]
MDL-57994 course: fix newsitems value
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
Juan Leyva [Mon, 16 Jan 2017 14:17:42 +0000 (15:17 +0100)]
MDL-57657 mod_lesson: New WS mod_lesson_get_user_grade
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
Dan Poltawski [Thu, 16 Mar 2017 15:42:07 +0000 (15:42 +0000)]
Merge branch 'MDL-57645-master' of git://github.com/jleyva/moodle
Juan Leyva [Fri, 13 Jan 2017 10:27:17 +0000 (11:27 +0100)]
MDL-57645 mod_lesson: New Web Service mod_lesson_view_lesson
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)
Neill Magill [Thu, 16 Mar 2017 12:08:36 +0000 (12:08 +0000)]
MDL-58285 tool_mobile: Web service generates incorrect fileurl on IIS
The tool_mobile_get_plugins_supporting_mobile generated an incorrect
fileurl on IIS. The /mobile/filename.zip part was generated as
\mobile\filename.zip, this failed the PARAM_URL check.
This change stops the use of OS specific directory separators and uses
the linux/web separator. PHP file functions recognise this properly.
Dan Poltawski [Thu, 16 Mar 2017 11:52:46 +0000 (11:52 +0000)]
weekly release 3.3dev
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
John Okely [Wed, 15 Mar 2017 07:29:33 +0000 (15:29 +0800)]
MDL-57419 messaging: Don't use enter to send
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.
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.
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.
Andrew Nicols [Wed, 15 Mar 2017 23:58:08 +0000 (07:58 +0800)]
Merge branch 'MDL-57643-master' of git://github.com/jleyva/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
David Mudrák [Wed, 15 Mar 2017 17:30:46 +0000 (18:30 +0100)]
MDL-58273 enrol_ldap: Fix the name of the capability
This capability controls who can hide/show the enrolment instance.
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
Juan Leyva [Tue, 31 Jan 2017 16:51:17 +0000 (17:51 +0100)]
MDL-57812 mod_feedback: New WS get_feedback_access_information
Juan Leyva [Tue, 14 Mar 2017 20:43:31 +0000 (21:43 +0100)]
MDL-57838 tool_mobile: Point to the docs for more information
We should ask the admin to check the "Moodle docs for this page"
instead of adding a constant including a URL in the code.
Juan Leyva [Thu, 12 Jan 2017 22:25:17 +0000 (23:25 +0100)]
MDL-57643 mod_lesson: New WS mod_lesson_get_access_information
Juan Leyva [Thu, 12 Jan 2017 22:25:00 +0000 (23:25 +0100)]
MDL-57643 mod_lesson: Refactor, move php code to locallib
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
David Monllao [Wed, 15 Mar 2017 07:49:10 +0000 (08:49 +0100)]
MDL-57631 enrol_ldap: Disable CLI script if task is enabled
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
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
Jun Pataleta [Wed, 15 Mar 2017 06:03:07 +0000 (14:03 +0800)]
MDL-57658 calendar: Remove BYDAY filtering dependence on NumberFormatter
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
Jun Pataleta [Wed, 15 Mar 2017 03:18:21 +0000 (11:18 +0800)]
MDL-57658 calendar: Set sort order for fetched DB records
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
Andrew Nicols [Wed, 15 Mar 2017 02:59:53 +0000 (10:59 +0800)]
MDL-55528 fileconverter_unoconv: Unit test correction