82ee9604a2
Merge branch 'MDL-51935-master' of git://github.com/dpalou/moodle
2015-11-11 09:59:36 +08:00
2a8709f6df
Merge branch 'MDL-51686-master' of git://github.com/damyon/moodle
2015-11-10 20:19:06 +01:00
d18a8d716c
Merge branch 'MDL-51720-master' of git://github.com/damyon/moodle
2015-11-10 19:28:41 +01:00
6ae9762b37
Merge branch 'MDL-52059' of git://github.com/stronk7/moodle
2015-11-10 14:48:27 +00:00
8e4c398b52
Merge branch 'MDL-51314-groupmembership' of https://github.com/dmitriim/moodle
2015-11-10 14:44:22 +00:00
2e144835bb
MDL-52059 versions: bump all versions and requires near release
...
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
2015-11-10 12:33:52 +01:00
0880780ee8
MDL-52063 forum: Moved notification is not a problem
...
The default behaviour of $OUTPUT->notification() is to indiciate a
problem.
2015-11-10 09:39:18 +00:00
022f5b5e50
Merge branch 'MDL-52054-master-option4' of git://github.com/xow/moodle
2015-11-10 09:17:51 +00:00
487f6471a0
MDL-51935 wiki: Add missing strings in wiki
2015-11-10 10:05:06 +01:00
616dd1b594
MDL-52054 forum: Prevent error when clicking move without a destination
2015-11-10 16:43:19 +08:00
d7f95392ac
MDL-52054 forum: Revert MDL-46321. Add the "move" button back.
...
This reverts commit 5a699f25a2
2015-11-10 10:46:37 +08:00
cb658a4d04
MDL-52063 forum: Display message when moving forum
2015-11-10 10:24:06 +08:00
f46aa6bc42
Merge branch 'MDL-51628-master' of git://github.com/damyon/moodle
2015-11-09 11:01:21 +00:00
0f1b3c69d8
Merge branch 'MDL-40245_master' of git://github.com/SWiT/moodle
2015-11-09 16:12:44 +08:00
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
531bcb13f6
MDL-51569 mod_choice: Prevent users from updating choices with curl
...
And fix unit tests.
2015-11-06 14:52:26 +08:00
6d6e297b13
MDL-51314 mod_assign: cache group membership in can_edit_submission
2015-11-06 15:21:01 +11:00
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
1c2a11fcfa
MDL-46049 chat: add missing closing parenthesis
2015-11-05 16:01:42 +00:00
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
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
8acf1ccd22
MDL-51899 mod_forum: Add test for allowing 0 grades
2015-11-05 12:07:27 +08:00
da737c7201
Merge branch 'MDL-51899_master' of git://github.com/jacac/moodle
2015-11-05 11:24:43 +08:00
03b1f63d40
MDL-50837 mod_scorm: include locallib to access function
2015-11-05 10:23:31 +08:00
08334e0692
MDL-40245 assignment: download all submissions raise time limit
2015-11-04 16:32:37 -05:00
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
02c256c941
MDL-50837 mod_scorm: Fix availability checks
2015-11-04 12:54:55 +01:00
3dd0ac559f
MDL-51569 mod_choice: Check choice availability prior to do any action
2015-11-04 11:08:32 +00:00
31d0bf81af
MDL-49940 mod_survey: Fix XSS on survey module
2015-11-04 18:46:27 +08:00
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
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
01451bbc5a
Merge branch 'MDL-52004-master' of git://github.com/damyon/moodle
2015-11-04 13:38:07 +08:00
4a9a9bad73
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).
2015-11-04 10:12:39 +08:00
ca3e8022d1
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.
2015-11-04 10:12:39 +08:00
836c6d7883
Merge branch 'wip-mdl-52020' of https://github.com/rajeshtaneja/moodle
2015-11-03 17:56:22 +01:00
728754de6b
Merge branch 'MDL-52018-master-enfix' of git://github.com/mudrd8mz/moodle
2015-11-03 17:56:21 +01:00
f497fdcc21
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
2015-11-03 09:40:33 +08:00
da6ecfd8c1
MDL-52018 lang: Merge English strings from the en_fix language pack
2015-11-02 22:12:06 +01:00
2cc040c6c0
Merge branch 'MDL-52014-master' of git://github.com/danpoltawski/moodle
2015-11-02 20:02:16 +01:00
5294052875
MDL-52014 quiz: do not log preview attempt deletions
...
This happens automatically by the system.
2015-11-02 16:17:22 +00:00
cfca338d7a
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).
2015-11-02 16:41:55 +08:00
9dfe870449
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
2015-11-02 10:38:26 +08:00
02315eb2bb
Merge branch 'MDL-51939-master' of git://github.com/andrewnicols/moodle
2015-10-29 13:54:56 +00:00
1f0f002e1d
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.
2015-10-29 21:10:20 +08:00
7774cf96f8
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.
2015-10-29 21:10:11 +08:00
3adcb91d55
Merge branch 'MDL-50811-master' of git://github.com/cameron1729/moodle
2015-10-29 10:53:40 +00:00
346ba4f443
MDL-50811 mod_forum: Add completion tracking for emailed replies
2015-10-27 15:53:42 +08:00
3363cbe55b
Merge branch 'MDL-51779_master' of https://github.com/Syxton/moodle
2015-10-26 09:46:38 +08:00
626d833543
MDL-51779 assign: PDF annotate quality
...
Fixes the quality of pdf content when annotating.
2015-10-23 09:22:38 -04:00
8c976328c1
MDL-40863 mod_resource: bump version
...
(not technically necessary - but I prefrer to make it explicit against
stable)
2015-10-23 11:34:52 +01:00
David Monllao