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

18321 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
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
8bdd97a35a MDL-54872 mod_assign: Allocate Unique IDs before tests 2016-09-14 09:20:33 +08: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
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
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
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
Andrew Nicols
c42c23557e MDL-53634 forum: Switch digest selection to inplace_editable 2016-08-26 15:05:05 +08:00
Helen Foster
b61b927356 MDL-55661 lang: Merge English strings from the en_fix language pack 2016-08-25 14:38:07 +02:00
David Monllao
fa90f52986 MDL-55127 mod_data: Search entries fixes 
- If the database contains has than 4 valid fields all fields from the 4th one
  to the last one will be merged into the 4th one so we index all entry contents
- get_content_value now receives the whole data_content record as fields may need
  other values than just the content to prepare the value
- phpunit database generator changes to separate checkboxes from radio buttons options
  and to separate multimenu options from menu options
 2016-08-25 16:50:15 +08:00
Marina Glancy
92c9be1978 MDL-55708 mod_assign: display formatted acitvity names 2016-08-25 09:53:29 +08:00
Damyon Wiese
43b0df2601 MDL-55668 assign: Don't link to user profile if blind marking is enabled 2016-08-24 11:21:31 +01:00
David Monllao
70003837db MDL-55127 mod_data: Adding missing required classes 2016-08-24 13:57:44 +08:00
Andrew Nicols
f42288ea62 MDL-54113 assign: Open files in new window 
Open files in a new window when viewing to ensure that the form change
checker does not warn about the page reloading.
 2016-08-24 11:33:09 +08:00
Dan Poltawski
7c085e1a2d Merge branch 'wip-MDL-55127_master' of https://github.com/dg711/moodle 2016-08-23 11:12:46 +01:00
Andrew Nicols
f71df007d1 MDL-46654 mod_forum: Reduce complexity of closure 2016-08-23 16:17:07 +08:00
Dan Poltawski
3f92140fc8 Merge branch 'wip-mdl-46514' of https://github.com/rajeshtaneja/moodle 2016-08-23 08:59:24 +01:00