Adrian Greeve
f847669e33
MDL-55327 mod_lesson: Unit tests for the new function
2016-09-20 10:36:13 +08:00
Adrian Greeve
9f937c3bb3
MDL-55327 mod_lesson: Added the ability to duplicate pages.
2016-09-20 10:36:13 +08:00
Dan Poltawski
a2184f971f
Merge branch 'master_MDL-55820' of git://github.com/danmarsden/moodle
2016-09-19 11:32:19 +01:00
Dan Poltawski
daa571af9f
Merge branch 'MDL-55944' of https://github.com/mr-russ/moodle
2016-09-19 11:25:12 +01:00
Dani Palou
d33c67bc47
MDL-56019 ws: Use itemid null when getting modules intro
2016-09-19 11:33:55 +02:00
David Monllao
9df9382e4d
Merge branch 'MDL-42041-master' of git://github.com/andrewnicols/moodle
2016-09-19 15:08:56 +08:00
spvickers
d8f9109a12
MDL-49609 mod_lti: Add Content-Item message
...
Added option for tools to support Content-Item message and redirect
to/from tool provider when creating an instance.
2016-09-18 22:16:10 +08:00
Andrew Nicols
4e2e54eed0
MDL-55866 mod_data: Remember editor enabled state for templates
...
Some templates can legitimately contain invalid HTML (e.g. mismatched tags)
because the templates operate in pairs.
In these instances we should not use an editor because the nature of the
editor (content editable) means that the browser automatically corrects all
HTML supplied to it, thus breaking the template entirely.
Therefore we need to disable HTML editors for some templates, and do so in
a way tied to the instance of the activity, rather than to a specific user.
This patch adds a new 'config' field, with matching setters and getters, to
allow such per-instance values to be stored.
2016-09-15 08:38:10 +08:00
David Mudrák
161131f057
MDL-55957 workshop: Add behat tests for embedded images
...
This tests basic functionality of the images embedded into the
instructions and conclusion fields.
2016-09-14 14:25:41 +02:00
David Mudrák
e46aec4c45
MDL-55957 workshop: Fix the embedded files serving
...
There was a bug with serving the files from the areas instructauthors,
instructreviewers and conclusion. These three areas should not use the
itemid in the plugininfo URLs. But they did use 0 as the itemid which
broke the file previews when browsing via server files repository.
The first part of the patch fixes all relevant calls to
file_rewrite_pluginfile_urls() so that null is now properly used instead
of zero.
The second part of the fix is that we no longer delete the first $args
element in the workshop_pluginfile() function - the itemid is not
supposed to appear there now.
The last part of the patch is that instead of repeating the same code
block copy&pasted for each file area in workshop_pluginfile(), we now
have a single block covering them all.
2016-09-14 12:14:56 +02:00
Andrew Nicols
8bdd97a35a
MDL-54872 mod_assign: Allocate Unique IDs before tests
2016-09-14 09:20:33 +08:00
Russell Smith
74ee9d29d2
MDL-55944 testing: Reduce sleep usage.
...
Remove sleep() and replace with waiting for a second to roll over,
this results in a simpler call the guarantee time() has moved forward
2016-09-14 09:49:30 +10:00
David Monllao
c46432ad6c
Merge branch 'MDL-54872-master' of git://github.com/andrewnicols/moodle
2016-09-13 10:05:26 +08:00
Eloy Lafuente (stronk7)
9579b52372
Merge branch 'wip-MDL-55505-master' of git://github.com/abgreeve/moodle
2016-09-12 19:19:45 +02:00
Eloy Lafuente (stronk7)
61b246fd0e
Merge branch 'MDL-55632-master' of git://github.com/andrewnicols/moodle
2016-09-12 19:12:26 +02:00
Andrew Nicols
eb4c466162
MDL-54872 assign: Order blindly marked assignments more blindly
2016-09-12 09:29:45 +08:00
Adrian Greeve
a14cde804e
MDL-55505 mod_assign: Editing previous attempt works correctly.
...
Editing a previous attempt keeps the current feedback and grades
as it should and does not override them.
2016-09-08 20:31:05 +08:00
Adrian Greeve
80753d3107
MDL-41174 mod_workshop: Added workshop_refresh_events
...
This function was missing from this activity.
2016-09-07 14:29:13 +08:00
Andrew Nicols
64ebf3955b
MDL-37669 mod_forum: Mark posts as read on notify to user pref
...
Some people prefer to have posts marked as read when they receive them, and
some prefer not to. Let us allow them to choose.
2016-09-07 12:32:42 +08:00
Eloy Lafuente (stronk7)
a6a787c011
Merge branch 'MDL-55236' of https://github.com/bostelm/moodle
2016-09-06 20:30:49 +02:00
Eloy Lafuente (stronk7)
69e18dbf70
Merge branch 'wip-MDL-55832-master' of git://github.com/marinaglancy/moodle
2016-09-06 15:56:01 +02:00
Dan Poltawski
2e79c7305d
MDL-42125 quiz stats: removal trivial additional phpdocs newline
2016-09-06 11:47:57 +01:00
Dan Poltawski
7c5b0bbcbe
Merge branch 'MDL-42125' of git://github.com/timhunt/moodle
2016-09-06 11:46:52 +01:00
Eloy Lafuente (stronk7)
5e16bdb25c
Merge branch 'MDL-55724-master' of https://github.com/sammarshallou/moodle
2016-09-05 17:33:25 +02:00
Dan Poltawski
dca4a87101
Merge branch 'MDL-55742-master' of https://github.com/xow/moodle
2016-09-05 10:50:47 +01:00
Henning Bostelmann
e5e89cacfb
MDL-55236 mod_assign: Allow subplugins to backup files
2016-09-05 11:39:12 +02:00
Dan Poltawski
eccebeebf5
Merge branch 'MDL-55815' of git://github.com/timhunt/moodle
2016-09-05 08:27:58 +01:00
Dan Poltawski
e5c5f5d3ff
Merge branch 'MDL-54113-master' of git://github.com/andrewnicols/moodle
2016-09-05 07:53:26 +01:00
Marina Glancy
f9e2d3d451
MDL-55832 mod_feedback: apply filters to multichoice quesitons
2016-09-05 13:29:57 +08:00
Andrew Nicols
63d7b1acc0
MDL-42041 mod_book: Add Turn Editing On to page body
2016-09-05 13:08:24 +08:00
John Okely
d51757a729
MDL-55457 mod_lti: Support object icon_info in tool proxy
2016-09-02 09:39:31 +08:00
Tim Hunt
6ae04c2684
MDL-42125 quiz stats: fix regression caused by MDL-51603
2016-09-01 12:38:30 +01:00
Tim Hunt
9e5e0d8de4
MDL-42125 quiz stats: clearer message when manual grading required
2016-09-01 12:34:40 +01:00
John Okely
3b4491e8aa
MDL-55742 mod_lti: Remove support for get_magic_quotes_gpc
...
Thanks to Bishop Bettini for the original patch.
2016-09-01 14:58:29 +08:00
Dan Marsden
5d453ff40e
MDL-55820 scorm: use correct displayattempt default options
2016-09-01 13:19:35 +12:00
Tim Hunt
d0f8daef12
MDL-55815 quiz review: after close should beat immediately after
...
This only arises in specific situations: student submitted less than 2
mintues before time close, or when a teacher previews after the close
date. However, in those cases, the old behaviour was confusing. Now,
'After the quiz is closed' takes priority.
2016-08-31 12:55:21 +01:00
Tim Hunt
daf6becfb0
MDL-55815 quiz: convert attempt state tests to a data provider
2016-08-31 12:54:18 +01:00
Eloy Lafuente (stronk7)
4bdb1298c4
Merge branch 'MDL-55237_master' of git://github.com/dmonllao/moodle
2016-08-30 12:54:46 +02:00
sam marshall
3bf0482841
MDL-55724 Glossary: Prevent infinite loop in trusttext_strip
2016-08-30 10:25:38 +01:00
David Monllao
bb75b82e21
Merge branch 'MDL-54873-master' of git://github.com/andrewnicols/moodle
2016-08-30 12:52:38 +08:00
Andrew Nicols
5e171c6986
MDL-54873 assign: Seed recordid to print_recent_activity
2016-08-30 11:57:57 +08:00
Andrew Nicols
c06ce32d85
MDL-54873 assign: Add recordid fetching participants
...
get_submission_info_for_participants is primarily used by externallib.php
2016-08-30 11:46:21 +08:00
Andrew Nicols
cf29b1e08d
MDL-54873 assign: Fetch mapping id for blind marking in cron
2016-08-30 11:46:20 +08:00
Andrew Nicols
4ed4be4988
MDL-54873 assign: Fetch mapping id for blind marking grading
...
This change modifies the grading table to pre-seed record ids where they
already exist.
Where they do not exist, they are still fetched.
2016-08-30 11:46:20 +08:00
David Monllao
8bee2d8df6
MDL-55237 core_component: Fix last namespace level matching
...
Thanks to Andreas Grabs for proposing a fix.
2016-08-30 11:15:27 +08:00
Eloy Lafuente (stronk7)
e6166d9bf7
Merge branch 'MDL-53634-master' of git://github.com/andrewnicols/moodle
2016-08-30 02:28:32 +02:00
David Monllao
a74218d464
Merge branch 'MDL-55661-master-enfix' of git://github.com/mudrd8mz/moodle
2016-08-29 14:40:03 +08:00
David Monllao
bc1ac4a89d
Merge branch 'wip-MDL-55708-master' of git://github.com/marinaglancy/moodle
2016-08-29 11:18:58 +08:00
David Monllao
af1cacb586
Merge branch 'MDL-55477' of git://github.com/timhunt/moodle
2016-08-29 11:14:11 +08:00
David Monllao
80e31fdeaa
Merge branch 'MDL-55668-master' of git://github.com/danpoltawski/moodle
2016-08-29 10:26:51 +08:00
