Commit Graph

20348 Commits

Author SHA1 Message Date
Jun Pataleta 1e7490ad9a MDL-49609 mod_lti: Content-Item message type-related unit tests 2016-09-23 16:29:27 +08:00
Jun Pataleta 6696cdab8f MDL-49609 mod_lti: Content-Item message type-related Behat tests 2016-09-23 16:29:27 +08:00
Jun Pataleta c1fae2b928 MDL-49609 mod_lti: Refactor content-item and make it work using JS
* Rebase and resolve conflicts from initial patch.
* Reorganise contentitem and contentitem_return pages.
* Add capability checks for contentitem and contentitem_return pages.
* Move the building of Content-Item selection request to a local
  lib function.
* Move contentitem_return processing logic to a local lib function.
* Fix type settings update. Content-item checkbox does not get
  checked/unchecked on load.
* Fix  tool settings update. Disabled content-item checkbox gets unchecked when
  tool settings form is submitted.
* Add "Select content" button on load which launches the content item
  selection dialogue.
* Move hardcoded HTML and JS to mustache templates and AMD modules.
* Use standard YUI dialog for displaying the Content-Item selection page.
* Added processing for the following Content-Item properties:
  - text
  - icon
* On ContentItem selection, fill out form with the configuration data retrieved,
  instead of automatically saving the tool and redirecting to the course page.
* Removed section- and sectionreturn-related code since we're not automatically
  adding the tool on ContentItem selection.
* On mod_lti_mod_form, enable configuration fields if they support ContentItem
  selection.
* New form-field module for setting fields using JS
* Change types_config table's 'value' column from char(255) to text
2016-09-23 16:29:19 +08:00
Eloy Lafuente (stronk7) 0fba5b440d MDL-55327 mod_lesson: better convert back to plain response_editor 2016-09-22 19:17:47 +02:00
Andrew Nicols dd193ba2ea Merge branch 'wip-MDL-55327-master-fix' of git://github.com/abgreeve/moodle 2016-09-22 15:51:04 +08:00
Simey Lameze 981356b23d MDL-54802 mod_quiz: Add validation to require passing grade greater than 0
This commit adds a form validation to prevent the creation of quizzes
using zero or null grade to pass when using require passing grade.
2016-09-22 08:48:11 +08:00
Andrew Nicols 41ff0ee58b MDL-55982 mod_forum: Allow discussion view in locked blog 2016-09-22 08:22:13 +08:00
Adrian Greeve f4eef5fb25 MDL-55327 mod_lesson: Fix for copying essay and match.
Matching and essay questions would display errors when
being duplicated.
2016-09-21 18:04:08 +08:00
Eloy Lafuente (stronk7) 6cc077e90f Merge branch 'MDL-55982-master' of git://github.com/andrewnicols/moodle 2016-09-21 03:04:36 +02:00
Andrew Nicols 0f3bbfd4f8 MDL-55982 mod_forum: Add time-based discussion locking
This patch adds support for time-based locking of discussions.
Discussions are automatically locked after a user-definable period of
inactivity. After this time, only those with the the relevant capability
are able to add replies.

This has been designed to add support for other types of discussion locking
at a later date with relative ease.
2016-09-21 09:03:42 +08:00
Juan Leyva fad980b26f MDL-55785 mod_glossary: Check user can create new entries 2016-09-20 10:52:53 +01:00
Juan Leyva f0e1808fc4 MDL-55785 mod_glossary: New Web Service mod_glossary_add_entry 2016-09-20 10:52:53 +01:00
Juan Leyva e6de11d7b7 MDL-55785 mod_glossary: Move edit.php code to new lib function
Most of the code that was in mod/glossary/edit.php has been moved to
mod/glossary/lib.php:glossary_edit_entry
2016-09-20 10:48:41 +01:00
Juan Leyva 114eaf519d MDL-55740 assign: Add assignment WS to the mobile service
* mod_assign_submit_grading_form
* mod_assign_get_participant to the mobile service
2016-09-20 10:31:50 +01:00
Andrew Nicols 5a766a9e21 MDL-55327 mod_lesson: Whitespace fix 2016-09-20 11:19:28 +08:00
Andrew Nicols 25804281f1 Merge branch 'wip-MDL-55327-master' of git://github.com/abgreeve/moodle 2016-09-20 11:15:54 +08:00
Adrian Greeve 329b68c9ca MDL-55327 mod_lesson: Behat test for page duplication. 2016-09-20 10:36:13 +08:00
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