Damyon Wiese [Thu, 2 Nov 2017 06:39:32 +0000 (14:39 +0800)]
Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Thu, 2 Nov 2017 05:03:35 +0000 (13:03 +0800)]
Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Thu, 2 Nov 2017 04:21:39 +0000 (12:21 +0800)]
Merge branch 'MDL-59982_master' of git://github.com/markn86/moodle
Damyon Wiese [Thu, 2 Nov 2017 04:10:04 +0000 (12:10 +0800)]
Merge branch 'MDL-60645-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 26 Oct 2017 02:13:57 +0000 (10:13 +0800)]
MDL-60558 calendar: Upcoming block should use the right template
Andrew Nicols [Thu, 26 Oct 2017 02:13:36 +0000 (10:13 +0800)]
MDL-60558 calendar: Add event metadata to upcoming template
Andrew Nicols [Thu, 26 Oct 2017 02:12:41 +0000 (10:12 +0800)]
MDL-60558 calendar: Upcoming should support categories
Andrew Nicols [Thu, 26 Oct 2017 02:12:03 +0000 (10:12 +0800)]
MDL-60558 calendar: Adjust URL change
The URL change belongs in the calendar_view, not the view_manager.
The view_manager is responsibe for updating the view, not for the
resultant actions from it.
This also changes to use pushState so as not to overwrite the current
location in history.
Andrew Nicols [Thu, 26 Oct 2017 02:09:21 +0000 (10:09 +0800)]
MDL-60558 calendar: Move edit event to CRUD
Andrew Nicols [Thu, 26 Oct 2017 02:07:48 +0000 (10:07 +0800)]
MDL-60558 calendar: Remove old SELECTORS
Andrew Nicols [Thu, 26 Oct 2017 02:05:40 +0000 (10:05 +0800)]
MDL-60558 calendar: Harden event link detection
Damyon Wiese [Thu, 2 Nov 2017 03:51:35 +0000 (11:51 +0800)]
Merge branch 'MDL-60619-master' of https://github.com/snake/moodle
Damyon Wiese [Thu, 2 Nov 2017 03:38:57 +0000 (11:38 +0800)]
Merge branch 'MDL-60576-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 26 Oct 2017 02:04:41 +0000 (10:04 +0800)]
MDL-60558 calendar: Move the summary modal to view_manager
Damyon Wiese [Thu, 2 Nov 2017 02:45:07 +0000 (10:45 +0800)]
Merge branch 'MDL-60655-master' of git://github.com/junpataleta/moodle
Jake Dallimore [Thu, 2 Nov 2017 02:40:43 +0000 (10:40 +0800)]
Merge branch 'MDL-60555-master' of https://github.com/sammarshallou/moodle
Jake Dallimore [Thu, 2 Nov 2017 00:50:42 +0000 (08:50 +0800)]
Merge branch 'master_MDL-60007' of https://github.com/CengageEng/moodle
Andrew Nicols [Thu, 2 Nov 2017 00:47:17 +0000 (08:47 +0800)]
Merge branch 'wip-MDL-60515-master' of git://github.com/abgreeve/moodle
Jun Pataleta [Wed, 1 Nov 2017 21:38:33 +0000 (10:38 +1300)]
MDL-60655 tool_httpsreplace: Use \core_text string functions
Jun Pataleta [Wed, 1 Nov 2017 21:42:08 +0000 (10:42 +1300)]
MDL-60655 tool_httpsreplace: Use appropriate classes for PHPDocs params
Eloy Lafuente (stronk7) [Wed, 1 Nov 2017 12:40:07 +0000 (13:40 +0100)]
on-demand release 3.4beta+
Eloy Lafuente (stronk7) [Wed, 1 Nov 2017 09:41:48 +0000 (10:41 +0100)]
Merge branch 'MDL-60503-master' of git://github.com/damyon/moodle
Adrian Greeve [Mon, 30 Oct 2017 08:17:55 +0000 (16:17 +0800)]
MDL-60515 groups: Behat test for viewing the group description.
Adrian Greeve [Mon, 30 Oct 2017 03:09:33 +0000 (11:09 +0800)]
MDL-60515 groups: Group details template change.
The group details template has been changed to be
simpler and is styled a bit nicer.
Damyon Wiese [Wed, 1 Nov 2017 06:52:16 +0000 (14:52 +0800)]
MDL-60503 npm: Lock required node 8.9.x (LTS)
Mark Nelson [Tue, 29 Aug 2017 07:57:41 +0000 (15:57 +0800)]
MDL-59982 core_user: allow user to use filters from same category
Damyon Wiese [Wed, 1 Nov 2017 03:14:50 +0000 (11:14 +0800)]
Merge branch 'MDL-52037-master-fix' of https://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 1 Nov 2017 02:22:32 +0000 (10:22 +0800)]
MDL-52037 theme: Correct question feedback width
This relates to the cloze question answer when hovered.
Andrew Nicols [Wed, 1 Nov 2017 01:36:15 +0000 (09:36 +0800)]
MDL-60645 calendar: Add missing clean classes
sam marshall [Mon, 23 Oct 2017 17:09:10 +0000 (18:09 +0100)]
MDL-60555 core_search: Change unit tests to use fake time
Using real time caused rare failures. I've changed it to use fake
measurement for the indexing timeouts, which were unit-tested.
Vervoort, Claude [Tue, 31 Oct 2017 13:57:38 +0000 (09:57 -0400)]
MDL-60007 mod lti: allow delete without content-type
Juan Leyva [Tue, 31 Oct 2017 12:20:02 +0000 (13:20 +0100)]
MDL-60433 mod_data: Fix strict check for groupid
David Monllao [Tue, 31 Oct 2017 10:00:59 +0000 (11:00 +0100)]
MDL-52037 theme: Update compiled css
Luca Bösch [Tue, 31 Oct 2017 09:35:36 +0000 (09:35 +0000)]
MDL-52037 questions: „Whether correct“-feedback marks adaptive width
Jun Pataleta [Tue, 31 Oct 2017 08:30:01 +0000 (21:30 +1300)]
Merge branch 'MDL-60635-master' of git://github.com/andrewnicols/moodle
Jake Dallimore [Tue, 31 Oct 2017 07:18:37 +0000 (15:18 +0800)]
Merge branch 'MDL-60472_master' of git://github.com/markn86/moodle
Jake Dallimore [Tue, 31 Oct 2017 04:57:36 +0000 (12:57 +0800)]
Merge branch 'MDL-60607' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 31 Oct 2017 04:08:01 +0000 (12:08 +0800)]
Merge branch 'MDL-60631_master' of git://github.com/dmonllao/moodle
Mark Nelson [Sat, 28 Oct 2017 07:58:21 +0000 (15:58 +0800)]
MDL-60472 core_user: filter by group id when specified in URL
Jun Pataleta [Tue, 31 Oct 2017 03:02:50 +0000 (16:02 +1300)]
Merge branch 'MDL-59936-int-fix-1' of github.com:ryanwyllie/moodle
Jun Pataleta [Tue, 31 Oct 2017 02:40:19 +0000 (15:40 +1300)]
Merge branch 'MDL-57560-master' of git://github.com/damyon/moodle
Ryan Wyllie [Tue, 31 Oct 2017 02:38:29 +0000 (02:38 +0000)]
MDL-59936 boost: improve focus outline on modal header
Andrew Nicols [Tue, 31 Oct 2017 02:15:56 +0000 (10:15 +0800)]
Merge branch 'wip-MDL-60569-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 31 Oct 2017 02:05:38 +0000 (10:05 +0800)]
Merge branch 'MDL-60575-master' of https://github.com/snake/moodle
Andrew Nicols [Tue, 31 Oct 2017 01:14:32 +0000 (09:14 +0800)]
Merge branch 'MDL-60139' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 31 Oct 2017 00:51:46 +0000 (08:51 +0800)]
MDL-60635 calendar: Fix end of month issue with previous/next month
This reverts to the previous way in which this was calculated.
Andrew Nicols [Tue, 31 Oct 2017 00:12:31 +0000 (08:12 +0800)]
Merge branch 'MDL-60522-master' of https://github.com/Kathrin84/moodle
Jake Dallimore [Mon, 30 Oct 2017 06:32:27 +0000 (14:32 +0800)]
MDL-60619 core: fix autocomplete suggestions css for RTL
Jake Dallimore [Fri, 27 Oct 2017 03:14:47 +0000 (11:14 +0800)]
MDL-60575 lang: Change registration string to html from markdown
Tim Hunt [Mon, 30 Oct 2017 13:41:56 +0000 (13:41 +0000)]
MDL-60607 quiz reports: catch separate groups & user has no group case
David Monllao [Mon, 30 Oct 2017 16:58:39 +0000 (17:58 +0100)]
Merge branch 'MDL-60528-m' of https://github.com/micaherne/moodle
David Monllao [Mon, 30 Oct 2017 14:58:39 +0000 (15:58 +0100)]
Merge branch 'MDL-52037-cloze-whether-correct-feedback-width' of https://github.com/lucaboesch/moodle
David Monllao [Mon, 30 Oct 2017 14:53:53 +0000 (15:53 +0100)]
Merge branch 'MDL-60348-master' of git://github.com/jleyva/moodle
Tim Hunt [Mon, 30 Oct 2017 13:34:15 +0000 (13:34 +0000)]
MDL-60607 quiz reports: move duplicate code to superclass method
Tim Hunt [Thu, 26 Oct 2017 18:00:46 +0000 (19:00 +0100)]
MDL-60139 question manual grading: move code to reduce confusion
Move the variable definition closer to where it is used.
Tim Hunt [Thu, 26 Oct 2017 17:37:11 +0000 (18:37 +0100)]
MDL-60139 question manual grading: redisplay mark as typed if editing
When the teacher is upgrading a previously entered grade, we re-display
exactly what they typed before if possible, rather than displaying with
a set number of decimal places.
Tim Hunt [Thu, 26 Oct 2017 17:36:35 +0000 (18:36 +0100)]
MDL-60139 phpunit: Make assertTag verify attribute values with ===
I had a test that cared about the difference between value="5.0" and value="5".
Juan Leyva [Tue, 10 Oct 2017 14:06:20 +0000 (16:06 +0200)]
MDL-60348 mod_workshop: Add parameters checks in evaluate_assessment WS
David Monllao [Mon, 30 Oct 2017 12:23:35 +0000 (13:23 +0100)]
Merge branch 'MDL-60433-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 30 Oct 2017 10:42:11 +0000 (11:42 +0100)]
Merge branch 'MDL-60377-master' of git://github.com/jleyva/moodle
Luca Bösch [Sun, 29 Oct 2017 23:11:01 +0000 (23:11 +0000)]
MDL-52037 questions: „Whether correct“-feedback marks adaptive width
David Monllao [Mon, 30 Oct 2017 09:53:30 +0000 (10:53 +0100)]
MDL-60631 analytics: Pass evaluation analysables filters as objects
Adrian Greeve [Mon, 30 Oct 2017 03:00:36 +0000 (11:00 +0800)]
MDL-60515 groups: Update to weblib group function.
Added a new function to get the url for the group picture.
Adrian Greeve [Mon, 23 Oct 2017 00:04:09 +0000 (08:04 +0800)]
MDL-60515 groups: Display group information on the participants page.
Kathrin Osswald [Fri, 20 Oct 2017 11:22:20 +0000 (13:22 +0200)]
MDL-60522 message: Removed additional tooltips
I removed the additional tooltips because I think that they are just used
in the notifications and messages context and duplicate the all over used
title tag that gives the same information when hovering. So the whole system
stays more consistently.
Damyon Wiese [Mon, 30 Oct 2017 05:09:42 +0000 (13:09 +0800)]
MDL-57560 boost: File upload progress
Copy / adapt some styles from the bootstrap progress widget to match the DOM used for file upload progress.
Bootstrap changed this alot in the current beta so I opted to do a minimal change (affect the scss for boost only), rather
than adapt the HTML to something that will change again anyway when we upgrade to the release version of bootstrap 4.
Jake Dallimore [Mon, 30 Oct 2017 03:23:18 +0000 (11:23 +0800)]
Merge branch 'MDL-59606' of git://github.com/timhunt/moodle
Andrew Nicols [Mon, 30 Oct 2017 02:50:26 +0000 (10:50 +0800)]
Merge branch 'MDL-60605_filetree-spacing' of https://github.com/dvdcastro/moodle
Jun Pataleta [Mon, 30 Oct 2017 01:34:58 +0000 (14:34 +1300)]
Merge branch 'MDL-59936-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 30 Oct 2017 01:17:13 +0000 (09:17 +0800)]
Merge branch 'MDL-60360_enable_file_indexing_retroactively' of https://github.com/mattporritt/moodle
Ryan Wyllie [Tue, 24 Oct 2017 07:46:01 +0000 (07:46 +0000)]
MDL-59936 calendar: use event colour in summary modal header
Ryan Wyllie [Tue, 24 Oct 2017 06:57:12 +0000 (06:57 +0000)]
MDL-59936 calendar: use icons in event summary modal
Ryan Wyllie [Tue, 24 Oct 2017 07:47:28 +0000 (07:47 +0000)]
MDL-59936 javascript: hide modal footer without content
Jun Pataleta [Sun, 29 Oct 2017 22:47:54 +0000 (11:47 +1300)]
Merge branch 'MDL-60608-master' of git://github.com/lameze/moodle
Jun Pataleta [Sun, 29 Oct 2017 22:00:44 +0000 (11:00 +1300)]
Merge branch 'MDL-60570-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Sun, 29 Oct 2017 21:10:34 +0000 (10:10 +1300)]
Merge branch 'MDL-60572-master' of git://github.com/jleyva/moodle
Andrew Nicols [Sun, 29 Oct 2017 13:05:10 +0000 (21:05 +0800)]
MDL-60570 calendar: Correct course filter label in day view
Andrew Nicols [Tue, 24 Oct 2017 23:41:57 +0000 (07:41 +0800)]
MDL-60576 calendar: Remove underline between icons and text
David Castro [Thu, 26 Oct 2017 19:55:06 +0000 (14:55 -0500)]
MDL-60605 assignment: Added some styles to fix spacing in YUI file tree
Tim Hunt [Mon, 31 Jul 2017 16:58:29 +0000 (18:58 +0200)]
MDL-59606 quiz responses: fix edge cases in the report
This patch conbines valuable contributions from Kashmira Nagwekar and
Luca Bösch. Many thanks to them. However, the final form of the fix,
and hence the blame, falls to me -- Tim.
There were several issues here:
* The load_questions_usages_by_activity method in
question/engine/datalib.php was incorrectly treating the case
when no data was returned. (Looks like a historic copy-pase from
other methods that fetch one item by unique id, which therefore
must exist.)
* The report was not correctly handling the display when the 'Which
tries' was set to 'with, and without, attempts'.
* It was possible to select the 'All tries' option when also saying
'Users without attempts'. This combination makes not sense, so
a disabledIf rule was added to the form.
David Monllao [Fri, 27 Oct 2017 10:49:10 +0000 (12:49 +0200)]
on-demand release 3.4beta+
Juan Leyva [Fri, 27 Oct 2017 08:34:49 +0000 (10:34 +0200)]
MDL-60572 admin: Enforce URLs in forgottenpasswordurl setting
Also display warnings for admins.
Juan Leyva [Tue, 24 Oct 2017 11:24:50 +0000 (13:24 +0200)]
MDL-60572 admin: Fix forgottenpasswordurl for WS
We should expect URLs in that field.
The tool_mobile change is to not break the WS response if
forgottenpasswordurl does not contain a URL.
David Monllao [Fri, 27 Oct 2017 08:28:54 +0000 (10:28 +0200)]
MDL-59950 analytics: Use cognitive depth and social breadth constants
David Monllao [Fri, 27 Oct 2017 08:19:43 +0000 (10:19 +0200)]
MDL-59950 analytics: Add constants for cognitive and social levels
Simey Lameze [Fri, 27 Oct 2017 06:19:16 +0000 (14:19 +0800)]
MDL-60608 calendar: change eventdefaultcontext default to 0
Matt Porritt [Fri, 27 Oct 2017 00:11:12 +0000 (11:11 +1100)]
MDL-60360 Global Search: Enable file indexing message update.
If you have Global Search set up on a site without file
indexing enabled, then at a later date you enable file indexing
files associated with existing objects are not added.
The only way to have files for existing objects indexed is to
run a reindex of all content.
This patches updates the file indexing language string in the
solr search settings of Global Search to make this clear
to the site administrator.
David Monllao [Thu, 26 Oct 2017 17:17:28 +0000 (19:17 +0200)]
Merge branch 'wip-MDL-57055-master' of git://github.com/abgreeve/moodle
David Monllao [Thu, 26 Oct 2017 17:15:44 +0000 (19:15 +0200)]
Merge branch 'MDL-60559-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 26 Oct 2017 16:33:49 +0000 (18:33 +0200)]
Merge branch 'MDL-60600_master' of https://github.com/marxjohnson/moodle
Mark Johnson [Thu, 26 Oct 2017 13:59:35 +0000 (14:59 +0100)]
MDL-60600 core_output: Clear static icon system cache between unit tests
David Monllao [Thu, 26 Oct 2017 08:27:34 +0000 (10:27 +0200)]
Merge branch 'MDL-60430-master' of https://github.com/mihailges/moodle
Jun Pataleta [Thu, 26 Oct 2017 08:09:12 +0000 (21:09 +1300)]
Merge branch 'MDL-59909-master' of git://github.com/damyon/moodle
Damyon Wiese [Thu, 26 Oct 2017 08:02:13 +0000 (16:02 +0800)]
Merge branch 'MDL-60366_feedback_upgrade' of git://github.com/davosmith/moodle
David Monllao [Thu, 26 Oct 2017 07:47:22 +0000 (09:47 +0200)]
Merge branch 'MDL-59973-master' of git://github.com/damyon/moodle
David Monllao [Thu, 26 Oct 2017 07:41:09 +0000 (09:41 +0200)]
Merge branch 'MDL-60458-master' of git://github.com/damyon/moodle
Damyon Wiese [Thu, 26 Oct 2017 06:43:39 +0000 (14:43 +0800)]
Merge branch 'MDL-60564_master' of git://github.com/markn86/moodle
Damyon Wiese [Thu, 26 Oct 2017 06:39:35 +0000 (14:39 +0800)]
MDL-59973 calendar: Remove duplication
The function calendar_get_default_courses is responsible for loading all variants of calendar
course lists.
1 the list of courses that the current user will see events for in the site calendar.
2 the list of courses the current user will see when they are looking at a specific course calendar.
3 the list of course calendars the current user can create / edit events in.
Damyon Wiese [Thu, 26 Oct 2017 06:21:29 +0000 (14:21 +0800)]
MDL-59973 calendar: Only load required fields
When loading courses for the course filter on the calendar, we only need the id and shortname.
Andrew Nicols [Thu, 26 Oct 2017 06:19:43 +0000 (14:19 +0800)]
Merge branch 'wip-MDL-60543-master' of git://github.com/marinaglancy/moodle