Andrew Nicols [Thu, 5 Nov 2015 05:57:22 +0000 (13:57 +0800)]
Merge branch 'MDL-51395-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Mon, 12 Oct 2015 20:47:57 +0000 (15:47 -0500)]
MDL-51395 blog: Fix output of strings for blog comments
Andrew Nicols [Thu, 5 Nov 2015 04:12:43 +0000 (12:12 +0800)]
Merge branch 'MDL-26429-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Thu, 5 Nov 2015 04:07:27 +0000 (12:07 +0800)]
MDL-51899 mod_forum: Add test for allowing 0 grades
Cameron Ball [Thu, 5 Nov 2015 03:40:58 +0000 (11:40 +0800)]
MDL-26429 usability: Add course completion icons.
This patch adds a method to the course completion criteria classes
which allows them to specify an icon for display in the course
completion report table.
There is a default implementation which simply looks for an icon
in pix/i with a name matching the completion criteria type.
Andrew Nicols [Thu, 5 Nov 2015 03:24:43 +0000 (11:24 +0800)]
Merge branch 'MDL-51899_master' of git://github.com/jacac/moodle
Andrew Nicols [Thu, 5 Nov 2015 02:41:43 +0000 (10:41 +0800)]
Merge branch 'MDL-51685-master' of git://github.com/dpalou/moodle
rajesh Taneja [Thu, 5 Nov 2015 02:02:45 +0000 (10:02 +0800)]
MDL-50837 mod_scorm: include locallib to access function
rajesh Taneja [Thu, 5 Nov 2015 01:15:41 +0000 (09:15 +0800)]
MDL-51918 behat: Key press should be down-press-up
As we simulate real user key press event, the
event should down followed by press and then up key
Jakob [Tue, 3 Nov 2015 18:41:03 +0000 (10:41 -0800)]
MDL-51899 mod/assign: Allow 0.00 grades while editing a grade.
The function unformat_float can return 0 and false.
We need to do strict comparison for the return value on line 92 to accept grades 0.00.
David Monllao [Thu, 22 Oct 2015 02:01:57 +0000 (10:01 +0800)]
MDL-51684 badges: Make sure 'moodle/badges:viewbadges' is respected
Yuliya Bozhko [Thu, 8 Oct 2015 08:29:14 +0000 (09:29 +0100)]
MDL-51684 badges: Make sure 'moodle/badges:viewbadges' is respected
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
Juan Leyva [Thu, 22 Oct 2015 06:03:12 +0000 (08:03 +0200)]
MDL-50837 mod_scorm: Fix availability checks
Juan Leyva [Sat, 24 Oct 2015 15:03:35 +0000 (17:03 +0200)]
MDL-51569 mod_choice: Check choice availability prior to do any action
Cameron Ball [Mon, 2 Nov 2015 07:09:26 +0000 (15:09 +0800)]
MDL-51091 core_registration: session key check in registration.
Simey Lameze [Thu, 24 Sep 2015 00:42:38 +0000 (08:42 +0800)]
MDL-49940 mod_survey: Fix XSS on survey module
Hugh Davenport [Thu, 24 Sep 2015 00:41:04 +0000 (08:41 +0800)]
MDL-49940 mod_survey: Escape user comments
This patch fixes a XSS vulnerability with surveys where a student user
could inject arbitrary HTML in a comment on the survey. The fix is to
escape the comment before displaying it to the teacher.
David Monllao [Wed, 9 Sep 2015 05:42:57 +0000 (13:42 +0800)]
MDL-51000 editor_atto: No autosave for guests
Simey Lameze [Thu, 10 Sep 2015 07:31:47 +0000 (15:31 +0800)]
MDL-48109 mod_lesson: prevent CSRF on password protected lesson
This commit add a new session key hidden field on the lesson password form
and confirm if the session key is valid on related pages to prevent CSRF on
password protected lessons.
Petr Skoda [Wed, 7 Oct 2015 04:08:55 +0000 (17:08 +1300)]
MDL-48085 flowplayer: prevent flash parameters via url
Damyon Wiese [Wed, 4 Nov 2015 08:10:00 +0000 (16:10 +0800)]
MDL-51970 autocomplete: Fix for a regression in MDL-51964
This was causing the suggestions list to never open.
Picked up in testing for MDL-51970.
Dani Palou [Fri, 9 Oct 2015 07:23:53 +0000 (09:23 +0200)]
MDL-51685 user: Support gravatar images in user_get_user_details
Andrew Nicols [Wed, 4 Nov 2015 07:21:37 +0000 (15:21 +0800)]
Merge branch 'MDL-51983-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Mon, 2 Nov 2015 06:47:42 +0000 (06:47 +0000)]
MDL-51983 actionmenu: behat tests
Andrew Nicols [Wed, 4 Nov 2015 06:05:01 +0000 (14:05 +0800)]
Merge branch 'MDL-45814-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Wed, 4 Nov 2015 05:49:01 +0000 (13:49 +0800)]
Merge branch 'MDL-52012-master' of https://github.com/lucisgit/moodle
Andrew Nicols [Wed, 4 Nov 2015 05:38:07 +0000 (13:38 +0800)]
Merge branch 'MDL-52004-master' of git://github.com/damyon/moodle
Ryan Wyllie [Mon, 2 Nov 2015 02:15:28 +0000 (02:15 +0000)]
MDL-51983 actionmenu: fix hideIfOutside
The hideIfOutside function was being too restrictive with the
selector for checking if the event occurred within a menu child
(anchor tag) rather than the menu itself.
Ryan Wyllie [Tue, 3 Nov 2015 05:29:55 +0000 (05:29 +0000)]
MDL-51983 actionmenu: stop event propagation
Stop event propagation on keyboard events that have been
successfully handled by the action menu code.
Andrew Nicols [Wed, 4 Nov 2015 03:35:38 +0000 (11:35 +0800)]
Merge branch 'wip-MDL-51486-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Wed, 4 Nov 2015 03:25:34 +0000 (11:25 +0800)]
Merge branch 'MDL-51918-master-navigable' of https://github.com/pauln/moodle
Adrian Greeve [Wed, 4 Nov 2015 02:08:06 +0000 (10:08 +0800)]
MDL-51486 mod_data: Unit test update for item ratings.
Additional checks that access is available for item ratings
on records that have a group id of zero (all participants).
Adrian Greeve [Mon, 2 Nov 2015 06:47:15 +0000 (14:47 +0800)]
MDL-51486 mod_data: Can view rating information.
When students are given the appropriate permissions
to view ratings, in the situation where there are
separate groups. The students can view the ratings
of an entry that is in the all participants group.
Andrew Nicols [Wed, 4 Nov 2015 00:28:57 +0000 (08:28 +0800)]
Merge branch 'MDL-51970-master' of git://github.com/damyon/moodle
Paul Nicholls [Wed, 28 Oct 2015 20:29:16 +0000 (09:29 +1300)]
MDL-51918 gradereport: Fix AJAX mode keyboard navigation
Keyboard navigation (ctrl+up/down/left/right) with AJAX enabled ceased
functioning with editing mode enabled after MDL-36606, as it was looking
for cells with a "clickable" class - but was only applying that class when
editing mode is NOT enabled. This patch uses a new "gbnavigable" class to
control keyboard navigation, whether editing mode is on or not. It also
addresses some browser compatibility and minor behavioural issues.
Eloy Lafuente (stronk7) [Tue, 3 Nov 2015 18:00:58 +0000 (19:00 +0100)]
Moodle release 3.0rc1
Eloy Lafuente (stronk7) [Tue, 3 Nov 2015 18:00:41 +0000 (19:00 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Tue, 3 Nov 2015 11:51:29 +0000 (12:51 +0100)]
Merge branch 'wip-mdl-52007' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 3 Nov 2015 11:30:23 +0000 (12:30 +0100)]
Merge branch 'wip-mdl-52020' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Nov 2015 08:46:43 +0000 (08:46 +0000)]
Merge branch 'MDL-52018-master-enfix' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Tue, 3 Nov 2015 02:57:14 +0000 (10:57 +0800)]
Merge branch 'MDL-51993-master' of git://github.com/cameron1729/moodle
AMOS bot [Tue, 3 Nov 2015 16:04:21 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 3 Nov 2015 14:46:59 +0000 (14:46 +0000)]
MDL-45814 login: don't prompt guest user to change password
rajesh Taneja [Mon, 2 Nov 2015 07:08:38 +0000 (15:08 +0800)]
MDL-52007 behat: Use extended timeout for site admin expansion
Barbara Ramiro [Tue, 29 Sep 2015 06:56:29 +0000 (14:56 +0800)]
MDL-26429 Course completion icons for self, duration, and role.
Cameron Ball [Mon, 2 Nov 2015 07:56:35 +0000 (15:56 +0800)]
MDL-51993 course: Set valid default for section_edit_control_menu
Thank you to Gareth Barnard for originally providing this patch.
Andrew Nicols [Tue, 3 Nov 2015 01:42:04 +0000 (09:42 +0800)]
Merge branch 'MDL-51914' of git://github.com/timhunt/moodle
rajesh Taneja [Tue, 3 Nov 2015 01:40:33 +0000 (09:40 +0800)]
MDL-52020 behat: Removed text checking to ensure window switch
Comment question window closes after 2 sec.
which crashes win-FF as it's slow to check for
"Changes saved" text. As after switching it is
checked the changes are saved, this step can be
avoided to ensure robustness of the scenario
Tim Hunt [Fri, 30 Oct 2015 16:52:26 +0000 (16:52 +0000)]
MDL-51914 qtype_ddmarker: fix checking points on the boundary
All points on the boundary are now considered in the shape, on the
grounds that it is better to grade someone right for an edge case.
David Mudrák [Mon, 2 Nov 2015 21:30:46 +0000 (22:30 +0100)]
MDL-52018 lang: Fix behat tests to use the new strings
Helen Foster [Mon, 2 Nov 2015 21:12:06 +0000 (22:12 +0100)]
MDL-52018 lang: Merge English strings from the en_fix language pack
Eloy Lafuente (stronk7) [Mon, 2 Nov 2015 19:02:16 +0000 (20:02 +0100)]
Merge branch 'MDL-52014-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 2 Nov 2015 18:59:01 +0000 (19:59 +0100)]
Merge branch 'wip-MDL-51999-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 2 Nov 2015 18:40:16 +0000 (19:40 +0100)]
Merge branch 'MDL-51829-master' of git://github.com/dpalou/moodle
Dan Poltawski [Mon, 2 Nov 2015 16:15:47 +0000 (16:15 +0000)]
MDL-52014 quiz: do not log preview attempt deletions
This happens automatically by the system.
Dan Poltawski [Mon, 2 Nov 2015 14:07:10 +0000 (14:07 +0000)]
Merge branch 'MDL-51128-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 2 Nov 2015 14:04:44 +0000 (14:04 +0000)]
Merge branch 'wip-MDL-50633-master2' of https://github.com/marinaglancy/moodle
Marina Glancy [Mon, 2 Nov 2015 09:52:59 +0000 (17:52 +0800)]
MDL-50633 dml: deprecated var replaced in mysql 5.7
Thanks to Charles Verge for providing a patch
Tony Butler [Mon, 2 Nov 2015 11:12:47 +0000 (11:12 +0000)]
MDL-52012 core_lib: Add namespace to $OUTPUT->notify_message definition
Dan Poltawski [Mon, 2 Nov 2015 09:08:01 +0000 (09:08 +0000)]
Merge branch 'MDL-51854-master' of https://github.com/pauln/moodle
Damyon Wiese [Mon, 2 Nov 2015 08:41:55 +0000 (16:41 +0800)]
MDL-52004 assign: Set unique urls when grading so autosaves work
The Atto autosave feature uses the $PAGE->url to generate unique hashes for
each page. Assignment uses a MUC cache to persist ordering of lists - the result
is that the urls are not unique (they depend on the cached filter).
The fix is to spoof a unique url that will grade only that student with no
active grading list (no next/prev buttons).
Andrew Nicols [Mon, 2 Nov 2015 06:36:10 +0000 (14:36 +0800)]
Merge branch 'MDL-51707-m' of https://github.com/micaherne/moodle
Andrew Nicols [Mon, 2 Nov 2015 03:54:21 +0000 (11:54 +0800)]
Merge branch 'MDL-47073-master' of git://github.com/junpataleta/moodle
Marina Glancy [Mon, 2 Nov 2015 02:53:43 +0000 (10:53 +0800)]
MDL-51999 user: remove unnecessary continue
Andrew Nicols [Mon, 2 Nov 2015 02:52:37 +0000 (10:52 +0800)]
Merge branch 'MDL-51964-master' of git://github.com/damyon/moodle
Marina Glancy [Thu, 29 Oct 2015 07:56:20 +0000 (15:56 +0800)]
MDL-51888 mod_resource: cache file details for performance
If file details (size, type, date) are configured to be displayed we cache them
in course cache raw and build the display string in user language/timezone when
displaying. Also changed behat test not to fail in 2016
Damyon Wiese [Fri, 30 Oct 2015 06:57:59 +0000 (14:57 +0800)]
MDL-51970 autocomplete: Small refactor because too many options
Each function was taking 8-10 args - combine them all in state and options
objects and pass those around instead.
Damyon Wiese [Fri, 30 Oct 2015 05:04:55 +0000 (13:04 +0800)]
MDL-51970 autocomplete: Add an option to hide the suggestions
This is used by tags when official tags are disabled.
Damyon Wiese [Fri, 30 Oct 2015 04:15:28 +0000 (12:15 +0800)]
MDL-51964 autocomplete: IE11 fires spurious "input" events
We need to check for "real" changes to the input value because
ie11 is just firing events willy nilly.
AMOS bot [Sat, 31 Oct 2015 16:07:45 +0000 (00:07 +0800)]
Automatically generated installer lang files
Jun Pataleta [Fri, 30 Oct 2015 21:53:26 +0000 (16:53 -0500)]
MDL-47073 lib: Replace backslashes with slashes in jquery plugin urls
This patch replaces backslash characters in the generated jQuery
plugin URL to forward slashes when slasharguments is disabled and
the Moodle server is running on IIS.
Thanks to Ryan Panning <Ryan.Panning@district196.org> for
reporting this issue and for suggesting a fix.
Dan Poltawski [Fri, 30 Oct 2015 21:09:21 +0000 (21:09 +0000)]
on-demand release 3.0beta+
Dan Poltawski [Fri, 30 Oct 2015 21:09:20 +0000 (21:09 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Fri, 30 Oct 2015 09:23:52 +0000 (10:23 +0100)]
Merge branch 'wip-mdl-51981' of https://github.com/rajeshtaneja/moodle
rajesh Taneja [Fri, 30 Oct 2015 03:17:11 +0000 (11:17 +0800)]
MDL-51981 behat: No need for JS tag
This scenario crashes win-chrome and probably
other comninations. Looking at this, it seems
js tag is not needed, so removing js tag to make
it pass on all OS
Andrew Nicols [Fri, 30 Oct 2015 03:01:00 +0000 (11:01 +0800)]
Merge branch 'wip-MDL-51552-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Fri, 30 Oct 2015 01:57:57 +0000 (09:57 +0800)]
MDL-51552 gradebook: Update to singleview behat test.
Andrew Nicols [Thu, 29 Oct 2015 23:56:25 +0000 (07:56 +0800)]
MDL-51966 forms: Typo correction
Andrew Nicols [Thu, 29 Oct 2015 23:31:28 +0000 (07:31 +0800)]
Merge branch 'wip-MDL-51966-master' of https://github.com/marinaglancy/moodle
AMOS bot [Thu, 29 Oct 2015 16:04:09 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Thu, 29 Oct 2015 14:22:28 +0000 (14:22 +0000)]
Merge branch 'MDL-51955' of git://github.com/stronk7/moodle
Dan Poltawski [Thu, 29 Oct 2015 13:54:56 +0000 (13:54 +0000)]
Merge branch 'MDL-51939-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Thu, 29 Oct 2015 11:54:45 +0000 (12:54 +0100)]
MDL-51939 mod_forum: all participants discussions are viewed by students
Added scenario to verify that "all participants" discussions, under
separate-groups mode are, by default, visible for students.
Andrew Nicols [Wed, 28 Oct 2015 03:55:16 +0000 (11:55 +0800)]
MDL-51939 mod_forum: Fix groupid data on upgrade
This upgrade step addresses issues identified in MDL-51939 where the
groupid was incorrectly set. The issue itself is not present in 2.9, but
this upgrade step is required to correct any incorrect data.
Eloy Lafuente (stronk7) [Thu, 29 Oct 2015 12:19:36 +0000 (13:19 +0100)]
MDL-51955 testing: Exported files may be smaller than expected
Open a bit the allowed size expectation to accomodate oracle
producing smaller files when outputing decimal numbers.
Dan Poltawski [Thu, 29 Oct 2015 10:53:40 +0000 (10:53 +0000)]
Merge branch 'MDL-50811-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Thu, 29 Oct 2015 10:35:03 +0000 (10:35 +0000)]
Merge branch 'MDL-51921-master' of git://github.com/junpataleta/moodle
Adrian Greeve [Mon, 12 Oct 2015 08:43:22 +0000 (16:43 +0800)]
MDL-51552 gradebook: Single view bulk insert fix.
Single view now doesn't overwrite non-empty grades.
A thank you to Sam Anderson and Robert Russo for providing a patch.
Marina Glancy [Thu, 29 Oct 2015 05:49:56 +0000 (13:49 +0800)]
MDL-51966 forms: case-insensitive search in autocomplete
Andrew Nicols [Thu, 29 Oct 2015 06:48:25 +0000 (14:48 +0800)]
Merge branch 'MDL-51923-master-2' of git://github.com/xow/moodle
Andrew Nicols [Thu, 29 Oct 2015 06:41:45 +0000 (14:41 +0800)]
Merge branch 'MDL-51915' of git://github.com/timhunt/moodle
Andrew Nicols [Thu, 29 Oct 2015 05:16:15 +0000 (13:16 +0800)]
Merge branch 'MDL-51799-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Mon, 26 Oct 2015 07:02:03 +0000 (07:02 +0000)]
MDL-51799 javascript: dialogue accessibility
Moved setting the aria visiblity of the dialogues from the show
and hide functions into the visibility change handler to stop
multiple calls.
Also made the visibility checker just continue to buffer the elements
it hides, rather than clearning them, on multiple calls.
Andrew Nicols [Thu, 29 Oct 2015 03:06:18 +0000 (11:06 +0800)]
Merge branch 'MDL-51956-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Thu, 29 Oct 2015 02:32:01 +0000 (02:32 +0000)]
MDL-51956 atto_table: fix bg colour bug
The table editor will now set the backgorund colour on the
table in Firefox version 34 and below.
Also expanded the dialogue slightly because the colour choices
were wrapping and I added some styling to put a gap in for the
metric markers for border width and table width.
Dan Poltawski [Wed, 28 Oct 2015 12:48:18 +0000 (12:48 +0000)]
Merge branch 'wip-MDL-51919-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 28 Oct 2015 12:04:20 +0000 (12:04 +0000)]
Merge branch 'MDL-51924-master' of git://github.com/barbararamiro/moodle
Dan Poltawski [Wed, 28 Oct 2015 11:22:36 +0000 (11:22 +0000)]
Merge branch 'MDL-51838-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 28 Oct 2015 11:10:38 +0000 (11:10 +0000)]
Merge branch 'MDL-51914' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 26 Oct 2015 17:40:26 +0000 (17:40 +0000)]
MDL-51914 qtype_ddmarker: precise grading round the edges of zones
There was a previous change to the CSS (7px -> 3px) to make things
look prettier, which acutally broke the grading by a few pixes.
I fixed this by:
* Changing the offset of the cross hairs back to the correct value,
and adding a comment to point out the imporance of not changing
that CSS.
* Achieved the nice layout of the label relative to the cross-hairs
in a different way.
* Added a similar clafirying comment in the JavaScript.
* Improved how the grid on the editing form is aligned with the
background image.
* Added rounding to the grading code, to cope better now that
browsers do sub-pixel positioning.