Dan Poltawski
b8b7f33acd
Merge branch 'MDL-52669-master' of git://github.com/jleyva/moodle
2016-03-01 14:56:58 +08:00
Andrew Nicols
37f39924b5
Merge branch 'MDL-52397_fix-behat' of git://github.com/dmonllao/moodle
2016-03-01 14:35:54 +08:00
Andrew Nicols
9557a603e6
Merge branch 'MDL-52397_fix-oracle' of git://github.com/dmonllao/moodle
2016-03-01 14:35:50 +08:00
David Monllao
2a03c5fe06
MDL-52397 mod_assign: Fix behat test
2016-03-01 14:29:27 +08:00
Andrew Nicols
21d43c12b9
MDL-50546 mod_quiz: Correct typos in WS docs
2016-03-01 14:22:06 +08:00
Andrew Nicols
614173c7dc
Merge branch 'MDL-50546-master' of git://github.com/jleyva/moodle
2016-03-01 13:41:35 +08:00
Dan Poltawski
6a9b3c5a48
Merge branch 'MDL-53077' of git://github.com/Dave-B/moodle
2016-03-01 13:10:57 +08:00
Dan Poltawski
340d35a902
Merge branch 'MDL-53166' of https://github.com/eugeneventer/moodle-fixes
2016-03-01 13:03:06 +08:00
Dan Poltawski
71ea84048d
Merge branch 'MDL-53263-forum-reply-deeplink' of https://github.com/brendanheywood/moodle
2016-03-01 12:53:10 +08:00
Dan Poltawski
b23f27fdd2
Merge branch 'wip-MDL-44952-master' of https://github.com/marinaglancy/moodle
2016-03-01 12:30:56 +08:00
David Monllao
4edd8e773d
MDL-52397 editpdf: Fix draft vs nondraft comparison
...
We can not rely on the db engine returning results in the same order
if no order is specified in get_comments and get_annotations.
Also fixing a related unit test.
2016-03-01 12:29:13 +08:00
Andrew Hancox
23b6636997
MDL-51687 mod_folder: Trigger event when downloading all files.
2016-03-01 12:27:55 +08:00
Dan Poltawski
fd8e293030
Merge branch 'MDL-52809-master' of git://github.com/dpalou/moodle
2016-03-01 12:23:54 +08:00
Marina Glancy
17f53b45ab
MDL-44952 mod_feedback: set value for hidenoselect if disabled
2016-03-01 12:21:00 +08:00
Andrew Nicols
64d6465650
MDL-52974 mod_assign: Improve tests for view_submission_status
...
External tests only
2016-03-01 11:50:11 +08:00
Andrew Nicols
05b0f579ca
Merge branch 'MDL-52974-master' of git://github.com/jleyva/moodle
2016-03-01 11:48:16 +08:00
Dan Poltawski
d76acc87f7
Merge branch 'MDL-52999-master' of git://github.com/jleyva/moodle
2016-03-01 10:43:12 +08:00
Dan Poltawski
9f82928bb6
Merge branch 'MDL-53050-forum-target' of https://github.com/brendanheywood/moodle
2016-03-01 10:38:55 +08:00
Andrew Nicols
80f79ad6ec
Merge branch 'MDL-50175-master' of git://github.com/danpoltawski/moodle
2016-03-01 08:07:56 +08:00
Dan Poltawski
b70b436875
Merge branch 'MDL-44952-master' of git://github.com/marinaglancy/moodle
2016-02-29 16:34:22 +08:00
Dan Poltawski
c3717ca64e
Merge branch 'MDL-50794-master-workshop-restrict-filetypes' of git://github.com/mudrd8mz/moodle
2016-02-29 16:15:27 +08:00
Dan Poltawski
17ac1b5349
Merge branch 'MDL-30811-master' of git://github.com/andrewnicols/moodle
2016-02-29 13:43:53 +08:00
Andrew Nicols
372d6b923b
MDL-30811 core: Replace use of continue_button with redirect
2016-02-29 09:05:58 +08:00
Andrew Nicols
d954b54f9e
MDL-30811 forum: Update use of redirect to include message and type
2016-02-29 09:05:57 +08:00
Andrew Nicols
a31d1e5726
Merge branch 'wip-MDL-52397-master' of git://github.com/abgreeve/moodle
2016-02-29 08:33:41 +08:00
Brendan Heywood
f0b7925f01
MDL-53263 forum: Add anchor to reply by email confirmation link
2016-02-27 23:39:59 +11:00
Juan Leyva
19429de4be
MDL-52669 mod_quiz: Move logging in view.php to a new API function
2016-02-26 15:45:23 +01:00
Juan Leyva
4064dd0ec4
MDL-52669 mod_quiz: New Web Service mod_quiz_view_quiz
2016-02-26 15:45:22 +01:00
Juan Leyva
51e27aac2b
MDL-50546 mod_quiz: New WS mod_quiz_get_quizzes_by_courses
2016-02-26 15:42:11 +01:00
Dani Palou
5380c664d4
MDL-52809 wiki: Add tests for mod_wiki_get_subwikis
2016-02-26 14:11:24 +01:00
Dani Palou
44f1b701db
MDL-52809 wiki: New WS mod_wiki_get_subwikis
2016-02-26 14:00:12 +01:00
Brendan Heywood
2e0caa8e06
MDL-53050 mod_forum: Add anchor target highlight style
2016-02-26 21:12:25 +11:00
David Mudrák
996f7e8228
MDL-50794 workshop: Improve the file type restricting implementation
...
This is basically a clean up and what I think improved version of the
original Mahmoud's patch.
The actual checking for allowed file extensions has been re-implemented
and is now covered by unit tests. The list of allowed extensions is now
also assed to the filemanager element's accepted_types option to prevent
picking other files (we still need the in-place validation though). The
form validation is simplified a bit. The custom validation of file size
introduced in the previous patch has been removed as not related to this
issue (also I believe it should not be done at this level).
2016-02-25 18:03:18 +01:00
M Kassaei
1a282212c1
MDL-50794 workshop: Allow restricting submitted file types
...
It was reported at the Open University that there have been some
problems with the formats of files submitted by students. Not all
students completed their outlines as a Word .doc (despite this being the
format of the template provided). Some formats (e.g. .pages) couldn’t be
translated by some of the reviewing students. Therefore, they were
unable to provide a review and the submitting students not receiving any
comments.
This patch allows the teacher to define list of allowed file types that
can be attached to submitted work and/or overall feedback in the
workshop.
2016-02-25 18:03:18 +01:00
KeenRivals
83ea83ec19
MDL-50175 graphics: Optimized SVGs with SVGO.
2016-02-25 11:56:42 +00:00
KeenRivals
26c19b02d5
MDL-50175 graphics: Optimized PNG images with optipng
...
Used options: -o7 -strip all and advdef -z4 -i50.
(With ./lib excluded)
2016-02-25 11:56:37 +00:00
Adrian Greeve
50c734e8a5
MDL-52397 mod_assign: Unit tests for feedback plugins.
...
Testing that the new method is_feedback_modified() works
as it should with the standard plugins.
2016-02-24 15:09:27 +08:00
Adrian Greeve
238c05c23c
MDL-52397 mod_assign: Added new method to feedback plugins.
...
Added a method to the feedback plugins to check if feedback
has been modified. This allows for a more accurate record
of when the grade has been modified.
2016-02-24 15:09:08 +08:00
Dan Poltawski
fef5360053
Merge branch 'MDL-42460-master' of git://github.com/marinaglancy/moodle
2016-02-23 14:36:54 +00:00
David Monllao
c625b01a4c
MDL-31989 mod_survey: Prevent templates from being indexed
2016-02-23 19:58:52 +08:00
David Monllao
69d66020ce
MDL-31989 search: get_config method to search areas
...
Also content_to_text moved to weblib.
2016-02-23 10:47:59 +00:00
David Monllao
e2be996171
MDL-31989 search: New search areas
...
Some search areas have been introduced as part of the initial search API
and search engine API implementation.
- Forum posts
- Glossary enties
- All moodle activities
2016-02-23 10:47:57 +00:00
Andrew Nicols
bde3e8c5d1
Merge branch 'MDL-49338' of git://github.com/timhunt/moodle
2016-02-23 13:32:00 +08:00
Andrew Nicols
7bf992cccb
Merge branch 'wip-MDL-53129-master' of https://github.com/marinaglancy/moodle
2016-02-23 13:22:49 +08:00
Marina Glancy
42756192d7
MDL-53129 mod_feedback: forms cleanup and behat tests
2016-02-23 13:17:21 +08:00
Eloy Lafuente (stronk7)
a4a44e2c27
Merge branch 'MDL-52806' of git://github.com/timhunt/moodle
2016-02-22 23:04:43 +01:00
Eloy Lafuente (stronk7)
153fbcd24a
Merge branch 'MDL-53065' of git://github.com/timhunt/moodle
2016-02-22 23:01:04 +01:00
Michael Milette
89e68e6c1e
MDL-42460 mod_feedback: Fix markup validation
2016-02-22 22:41:32 +08:00
Marina Glancy
8ad534bd9f
MDL-44952 mod_feedback: validate required multichoice
2016-02-22 22:01:02 +08:00
Tim Hunt
293f5d1b11
MDL-53065 quiz redo question: avoid PHP notice in edge case
...
When selecting the variant of the new question, we need to add the
new question to the usage before trying to select a variant.
Also, we need to acutally use the selected variant number!
2016-02-19 12:10:39 +00:00
