moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 11:26:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76744 commits 37 branches 544 tags 1.3 GiB
Commit graph

17416 commits

Author SHA1 Message Date
Dan Poltawski
b58d059525 MDL-37834 assign: avoid newlines in status column of csv 
Previously we were generating a CSV file with newlines in it, which
seems to cause problems importing into some versions of MS Excel.

Instead seperate status lines by '-' - this column is only used to
provide context to the teacher in the spreadsheet.
 2015-11-20 18:36:30 +00:00
David Monllao
c181efe978 MDL-42571 editpdf: Fix search comments 
They are also hidden instead of destroyed.
 2015-11-19 14:59:03 +08:00
David Monllao
402f4a1f53 MDL-42571 editpdf: Fix comments search and multiple views drawing 2015-11-19 12:29:20 +08:00
Stephen Bourget
83f3ac5207 MDL-51097 Lesson: allow resume from within a cluster 2015-11-18 23:03:42 -05:00
Pavel Sokolov
4dab33b586 MDL-43069 assign: prevent JS error on grading table 
Previously submission comments failed to expand if you hid
the file submissions column.
 2015-11-18 15:41:42 +00:00
Dan Poltawski
a49fca44e0 MDL-49490 assign: can't export to portfolio on non-submission 2015-11-18 09:10:20 +00:00
Eloy Lafuente (stronk7)
6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
rajesh Taneja
131d4ac2b0 MDL-50163 behat: Restart session after scenario with switch_window 
Restart session after a scenario with switch window
is finished. This will close all open browser windows
and open a new browser window
 2015-11-17 12:12:03 +08:00
David Monllao
f2b28f8130 Merge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle 2015-11-17 08:54:50 +08:00
David Monllao
f9cccec39f Merge branch 'MDL-41643-master' of git://github.com/jojoob/moodle 2015-11-16 14:54:19 +08:00
David Monllao
09083ab0a8 Merge branch 'MDL-42571' of git://github.com/blaky/moodle 
Conflicts:
	mod/assign/feedback/editpdf/version.php
 2015-11-16 13:39:59 +08:00
Eloy Lafuente (stronk7)
9dbbdcb40a MDL-52126 forum: Verify forum mailout contents 
New unit test able to verify mail contents
configured by provider do match all expectations defined.
 2015-11-15 13:29:31 +01:00
Eloy Lafuente (stronk7)
593aaa5366 MDL-52126 forum: Correct over-escaping of html-based emails 2015-11-15 13:16:42 +01:00
Andrew Nicols
f98345b976 MDL-52126 forum: Correct over-escaping of text-based emails 2015-11-14 22:35:09 +01:00
Johannes Burk
64b9afa6a5 MDL-41643 datafield_checkbox: Add line breaks behind checkbox options. 
Add line a break behind each checkbox option in advanced search.
 2015-11-14 13:48:20 +01:00
Bence Laky
da91de7821 MDL-42571 assignfeedback_editpdf: Fixed second PDF view 2015-11-12 14:16:17 +00:00
Eloy Lafuente (stronk7)
9e9754b7aa Merge branch 'MDL-51515-master' of git://github.com/junpataleta/moodle 2015-11-11 23:14:47 +01:00
Damyon Wiese
6c2cfe281f MDL-51515 assign: Fix typo setting url in nav tree. 
Thanks to Nelson Moller and Tyler Bannister.
 2015-11-11 11:14:03 -06:00
David Monllao
82ee9604a2 Merge branch 'MDL-51935-master' of git://github.com/dpalou/moodle 2015-11-11 09:59:36 +08:00
Eloy Lafuente (stronk7)
2a8709f6df Merge branch 'MDL-51686-master' of git://github.com/damyon/moodle 2015-11-10 20:19:06 +01:00
Eloy Lafuente (stronk7)
d18a8d716c Merge branch 'MDL-51720-master' of git://github.com/damyon/moodle 2015-11-10 19:28:41 +01:00
Dan Poltawski
6ae9762b37 Merge branch 'MDL-52059' of git://github.com/stronk7/moodle 2015-11-10 14:48:27 +00:00
Dan Poltawski
8e4c398b52 Merge branch 'MDL-51314-groupmembership' of https://github.com/dmitriim/moodle 2015-11-10 14:44:22 +00:00
Eloy Lafuente (stronk7)
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
Dan Poltawski
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
Dan Poltawski
022f5b5e50 Merge branch 'MDL-52054-master-option4' of git://github.com/xow/moodle 2015-11-10 09:17:51 +00:00
Dani Palou
487f6471a0 MDL-51935 wiki: Add missing strings in wiki 2015-11-10 10:05:06 +01:00
John Okely
616dd1b594 MDL-52054 forum: Prevent error when clicking move without a destination 2015-11-10 16:43:19 +08:00
John Okely
d7f95392ac MDL-52054 forum: Revert MDL-46321. Add the "move" button back. 
This reverts commit 5a699f25a2.
 2015-11-10 10:46:37 +08:00
John Okely
cb658a4d04 MDL-52063 forum: Display message when moving forum 2015-11-10 10:24:06 +08:00
Dan Poltawski
f46aa6bc42 Merge branch 'MDL-51628-master' of git://github.com/damyon/moodle 2015-11-09 11:01:21 +00:00
David Monllao
0f1b3c69d8 Merge branch 'MDL-40245_master' of git://github.com/SWiT/moodle 2015-11-09 16:12:44 +08: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
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
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
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
8acf1ccd22 MDL-51899 mod_forum: Add test for allowing 0 grades 2015-11-05 12:07:27 +08:00
Andrew Nicols
da737c7201 Merge branch 'MDL-51899_master' of git://github.com/jacac/moodle 2015-11-05 11:24:43 +08:00
rajesh Taneja
03b1f63d40 MDL-50837 mod_scorm: include locallib to access function 2015-11-05 10:23:31 +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
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
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
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
Andrew Nicols
01451bbc5a Merge branch 'MDL-52004-master' of git://github.com/damyon/moodle 2015-11-04 13:38:07 +08:00