Commit graph

76078 commits

Author SHA1 Message Date
David Monllao
a2bb9b8751 Merge branch 'MDL-49473-master' of git://github.com/danpoltawski/moodle 2015-11-09 15:12:30 +08:00
David Monllao
814809d59e Merge branch 'wip-MDL-52008-master' of git://github.com/abgreeve/moodle 2015-11-09 13:16:06 +08:00
AMOS bot
323e38c4a1 Automatically generated installer lang files 2015-11-08 00:04:45 +08:00
Marina Glancy
9390d02099 MDL-52039 block_tags: remove unused setting 2015-11-07 12:45:35 +08:00
Dan Poltawski
82467e580b MDL-50426 behat: Update non-contacts feature naming 2015-11-06 19:47:38 +01:00
Dan Poltawski
1533fca4b5 Moodle release 3.0rc2 2015-11-06 11:57:10 +00:00
Rajesh Taneja
7b4933db3a MDL-51685 unittest: Test functionality individually 2015-11-06 11:14:17 +01:00
Dan Poltawski
5208168e0c Merge branch 'MDL-51861' of https://github.com/stronk7/moodle 2015-11-06 10:04:02 +00:00
Eloy Lafuente (stronk7)
ed4e707577 MDL-51861 enrol: added missing external cleanup for formal compliance 2015-11-06 10:58:28 +01:00
Dan Poltawski
265ddbf30c MDL-51569 mod_choice: Fix use of hardcoded ids
(Previous approach of making up ids longer works now we are validating
them..)
2015-11-06 08:09:47 +00:00
Dani Palou
b036215acc MDL-51861 enrol: Don't get all parts in get_enrolled_users with groups 2015-11-06 15:07:24 +08:00
Andrew Nicols
af8472a91f Merge branch 'MDL-51861' of git://github.com/stronk7/moodle 2015-11-06 15:01:20 +08:00
John Okely
531bcb13f6 MDL-51569 mod_choice: Prevent users from updating choices with curl
And fix unit tests.
2015-11-06 14:52:26 +08:00
Dmitrii Metelkin
6d6e297b13 MDL-51314 mod_assign: cache group membership in can_edit_submission 2015-11-06 15:21:01 +11:00
Andrew Nicols
1d1f08a045 MDL-51685-master Fix unit tests following change
These unit tests were modifying the PAGE and other globals in the middle of
tests and were failing as a result.

Broke the tests up into separate tests where the functionality is now
tested individually.
2015-11-06 10:36:06 +08:00
Adrian Greeve
9e8d0842ba MDL-52008 accessibility: Skip link works with chrome vox. 2015-11-06 09:47:51 +08:00
Eloy Lafuente (stronk7)
f076ce2834 MDL-51861 enrol: new unit test to verify all conditions and filters
This unit test does not verify contents, details, but only
that the returned users for every group mode, for every
filtering (active, groupid and withcapability) together
with permissions are correct.
2015-11-06 02:26:02 +01:00
Dan Poltawski
600b815279 MDL-46049 chat: update calendar times on repeating chat sessions
Previously were using the invalid chat id and the calendar entry was not
updated.

Thanks to Andy McGill who worked this out.
2015-11-05 16:02:08 +00:00
Dan Poltawski
1c2a11fcfa MDL-46049 chat: add missing closing parenthesis 2015-11-05 16:01:42 +00:00
Damyon Wiese
0bca129775 MDL-51569 mod_choice: Validate the submitted optionid
Make sure any submitted choice options actually belong to the current choice
module.
2015-11-05 10:48:40 +00:00
Dan Poltawski
2759c1218d Merge branch 'MDL-52036-master-resettable' of git://github.com/mudrd8mz/moodle 2015-11-05 09:03:20 +00:00
Juan Leyva
a7d13ecf2b MDL-50589 gradereport_user: Force regrade in external function 2015-11-05 09:40:38 +01:00
Ryan Wyllie
ceb689b9fc MDL-50426 message: post_message capability tests
Behat and unit tests to confirm the behaviour of the
messaging lib after the capability checks were added
to the post message function.
2015-11-05 08:20:39 +00:00
Ryan Wyllie
cd0c9ac87d MDL-50426 message: optional permission check on message
Changed the messaging API to allow you to provide a parameter
that will cause the code to check if the sender of the message
has the correct permissions before the message is sent.

The ajax messaging (message button on profile page) has been
updated to perform these permission checks. This brings it
inline with the existing private message page.
2015-11-05 08:20:39 +00:00
Ryan Wyllie
e24188c881 MDL-50426 behat: fix behat field manager
Thanks to Raj for the patch.
2015-11-05 08:20:39 +00:00
Damyon Wiese
85d0696dfa MDL-51720 assign: Always fallback on userid as a default sort
Even when the table has no userid column (this is normally the edit column).
2015-11-05 15:33:19 +08:00
Andrew Nicols
19f14de362 Merge branch 'MDL-51395-master' of git://github.com/junpataleta/moodle 2015-11-05 13:57:22 +08:00
Jun Pataleta
cefa583e71 MDL-51395 blog: Fix output of strings for blog comments 2015-11-04 23:46:31 -06:00
Andrew Nicols
c73acaa7ef Merge branch 'MDL-26429-master' of git://github.com/cameron1729/moodle 2015-11-05 12:12:43 +08:00
Andrew Nicols
8acf1ccd22 MDL-51899 mod_forum: Add test for allowing 0 grades 2015-11-05 12:07:27 +08:00
Cameron Ball
7062e7c6b3 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.
2015-11-05 11:40:58 +08:00
Andrew Nicols
da737c7201 Merge branch 'MDL-51899_master' of git://github.com/jacac/moodle 2015-11-05 11:24:43 +08:00
Andrew Nicols
f8e685af44 Merge branch 'MDL-51685-master' of git://github.com/dpalou/moodle 2015-11-05 10:41:43 +08:00
rajesh Taneja
03b1f63d40 MDL-50837 mod_scorm: include locallib to access function 2015-11-05 10:23:31 +08:00
rajesh Taneja
0db240c1dd 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
2015-11-05 09:15:41 +08:00
Matt Switlik
08334e0692 MDL-40245 assignment: download all submissions raise time limit 2015-11-04 16:32:37 -05:00
Jakob
90e815390a 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.
2015-11-04 11:11:42 -08:00
David Mudrák
19168d0934 MDL-52036 tablelib: Fix the behaviour of resetting table preferences
The problem with the previous implementation was that the table's
$this->prefs can contain valid non-empty value in its default state -
the default column to sort by. On resetting, we must not throw away
these default prefs.

This patch simplifies the TABLE_VAR_RESET interpretation. If such an
HTTP parameter is passed via the request, the table simply behaves as if
there were no previously stored preferences (does not matter if coming
from the current session, or from the persistent cross-session storage).

The logic that decides on whether or not the reset widget should be
displayed is put into a new method can_be_reset() with unit tests
attached.

Finally, the previously private method render_reset_button() is now
protected and the reset widget is given a new semantic CSS class.
2015-11-04 15:07:17 +01:00
David Monllao
47d5c29202 MDL-51684 badges: Make sure 'moodle/badges:viewbadges' is respected 2015-11-04 13:01:11 +00:00
Yuliya Bozhko
4bd4d4eee8 MDL-51684 badges: Make sure 'moodle/badges:viewbadges' is respected
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2015-11-04 13:01:11 +00:00
Juan Leyva
02c256c941 MDL-50837 mod_scorm: Fix availability checks 2015-11-04 12:54:55 +01:00
Juan Leyva
3dd0ac559f MDL-51569 mod_choice: Check choice availability prior to do any action 2015-11-04 11:08:32 +00:00
Cameron Ball
4bb9e1ad8a MDL-51091 core_registration: session key check in registration. 2015-11-04 18:46:27 +08:00
Simey Lameze
31d0bf81af MDL-49940 mod_survey: Fix XSS on survey module 2015-11-04 18:46:27 +08:00
Hugh Davenport
45ae1da263 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.
2015-11-04 18:46:27 +08:00
David Monllao
3f08e9b98a MDL-51000 editor_atto: No autosave for guests 2015-11-04 18:46:27 +08:00
Simey Lameze
541c5b8552 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.
2015-11-04 18:46:27 +08:00
Petr Skoda
c73f6d03e5 MDL-48085 flowplayer: prevent flash parameters via url 2015-11-04 10:31:12 +00:00
Damyon Wiese
861c1dea98 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.
2015-11-04 16:29:47 +08:00
Dani Palou
1f7273af6a MDL-51685 user: Support gravatar images in user_get_user_details 2015-11-04 08:40:19 +01:00