Commit graph

19764 commits

Author SHA1 Message Date
Andrew Nicols
86345473ec Merge branch 'MDL-59241-master' of git://github.com/jleyva/moodle 2017-10-02 15:52:40 +08:00
Andrew Nicols
39195b6aed Merge branch 'MDL-58790' of git://github.com/timhunt/moodle 2017-10-02 15:39:26 +08:00
Juan Leyva
b1e896cf2a MDL-59247 mod_workshop: New WS mod_workshop_get_assessment 2017-10-02 09:37:15 +02:00
Juan Leyva
30b54b823a MDL-59246 mod_workshop: New WS get_submission_assessments 2017-10-02 09:36:36 +02:00
Juan Leyva
6e2f4866b0 MDL-59242 mod_workshop: New WS mod_workshop_get_submission 2017-10-02 09:35:06 +02:00
Juan Leyva
3f08cfc530 MDL-59241 mod_workshop: New WS mod_workshop_get_submissions 2017-10-02 09:33:48 +02:00
ddelblanco
4325a4d23a MDL-60276 LTI Content Item: does not populate tool url when https 2017-09-28 09:54:35 -07:00
Eloy Lafuente (stronk7)
4da0f10286 Merge branch 'MDL-59931_master' of https://github.com/ctam/moodle 2017-09-27 01:16:10 +02:00
Tim Hunt
5cbb7bf887 MDL-58790 quiz editing: translate hard-coded new heading string 2017-09-26 11:17:27 +01:00
Juan Leyva
9a62cd02db MDL-60233 mod_assign: Avoid HTML in the item field of external warnings
The item field is defined as PARAM_TEXT (no HTML tags allowed except
for multilang).
Using the s that add quotes to HTML characters we avoid potential Web
Services invalid parameters errors.
2017-09-26 12:12:50 +02:00
Andrew Nicols
2d79d62249 Merge branch 'MDL-60197_master' of git://github.com/markn86/moodle 2017-09-26 09:56:54 +08:00
Andrew Nicols
9eeb4a55f4 Merge branch 'master' of https://github.com/ConnorSheremeta/moodle 2017-09-26 08:16:08 +08:00
Carson Tam
43f122d32c MDL-59931 mod_quiz: Fixing incorrect pagination count. 2017-09-25 12:46:52 -07:00
Shamim Rezaie
f061709e62 MDL-57228 quiz editing: unit test for the move case 2017-09-25 12:54:05 +01:00
Tim Hunt
6c73dd9593 MDL-57228 quiz: fix editing when there are one-question sections
Fix based on a patch by Joost van der Borg <j.van.der.borg@ssr.nl>.
2017-09-25 12:16:12 +01:00
Eloy Lafuente (stronk7)
4d35a19007 MDL-45366 behat: automate MDLQA-2425
It covers all the original cases and more:
- chapters up and down.
- subchapters up and down within chapter and out from chapter.
- 2nd up and before last down behaviors.
2017-09-25 04:15:05 +02:00
Mark Nelson
141530b9dd MDL-60197 mod_data: not always necessary to show 'select all/none' link 2017-09-21 17:51:23 +08:00
Nadav Kavalerchik
ad4cba91a4 MDL-60182 Glossary: Fix print icon label in RTL mode 2017-09-20 12:09:05 +03:00
Dan Poltawski
ecf8920afd Merge branch 'master_MDL-57886' of https://github.com/danmarsden/moodle 2017-09-19 13:40:12 +01:00
Ryan Wyllie
c35613ff28 MDL-59922 mod_choice: allow editing of open and close events 2017-09-19 08:21:53 +00:00
Mark Nelson
866939c3cc MDL-60130 mod_*: removed unused 'tagtitle' string 2017-09-19 14:54:39 +08:00
Dan Poltawski
f5cc5b321d Merge branch 'MDL-60018-master' of git://github.com/jleyva/moodle 2017-09-19 07:27:48 +01:00
Eloy Lafuente (stronk7)
db7083c4c4 Merge branch 'MDL-60105_master' of git://github.com/dmonllao/moodle 2017-09-19 01:55:12 +02:00
Eloy Lafuente (stronk7)
0238520084 Merge branch 'MDL-59244-master' of git://github.com/jleyva/moodle 2017-09-19 01:36:56 +02:00
Eloy Lafuente (stronk7)
5c45e6038c Merge branch 'MDL-59245-master' of git://github.com/jleyva/moodle 2017-09-19 01:33:08 +02:00
Dan Marsden
58496fe703 MDL-57886 plagiarism: Pass raw unformatted content to get_links. 2017-09-14 14:48:07 +12:00
Matt Clarkson
41dfbb6235 MDL-60105 mod_folder: Set timemodified on change
Changes to the folder contents were not resulting in the
timemodied of the folder activity being set. This prevented
global search from picking up the changes.
2017-09-13 13:51:49 +02:00
Eloy Lafuente (stronk7)
c06e187aaf Merge branch 'MDL-59243-master' of git://github.com/jleyva/moodle 2017-09-13 12:09:52 +02:00
Juan Leyva
4834e127eb MDL-59243 mod_workshop: Return creation status in create_submission WS 2017-09-13 11:41:28 +02:00
Eloy Lafuente (stronk7)
2c821c1b82 Merge branch 'wip-MDL-59775-master' of git://github.com/marinaglancy/moodle 2017-09-12 11:44:47 +02:00
David Monllao
0500bc49f1 Merge branch 'MDL-57407-master' of git://github.com/jleyva/moodle 2017-09-12 10:33:30 +02:00
Jun Pataleta
d887e98b56 Merge branch 'MDL-59243-master' of git://github.com/jleyva/moodle 2017-09-12 16:29:43 +08:00
Eloy Lafuente (stronk7)
69cfd26e15 Merge branch 'MDL-59478-master' of git://github.com/junpataleta/moodle 2017-09-12 00:21:48 +02:00
Eloy Lafuente (stronk7)
f20f9448f7 Merge branch 'MDL-60025-master' of git://github.com/jleyva/moodle 2017-09-11 23:50:36 +02:00
Dan Poltawski
743c937dae Merge branch 'MDL-59459_Increase_file_indexing_coverage' of https://github.com/mattporritt/moodle 2017-09-11 14:01:40 +01:00
Jun Pataleta
eca853c8eb Merge branch 'MDL-59977_master' of git://github.com/markn86/moodle 2017-09-11 17:18:16 +08:00
Jun Pataleta
dd6e17c3b6 Merge branch 'wip-MDL-55849-master' of git://github.com/abgreeve/moodle 2017-09-11 13:26:50 +08:00
Mark Nelson
93b47710ac MDL-59977 core: do not directly check 'viewparticipant' capability 2017-09-11 12:44:27 +08:00
Marina Glancy
a2502f6581 MDL-59775 mod_feedback: use vertical forms 2017-09-11 11:00:51 +08:00
Juan Leyva
84c50d1cc4 MDL-57407 mod_glossary: Return ratings in external functions 2017-09-08 13:49:12 +02:00
Juan Leyva
26d8bceac2 MDL-57407 mod_data: Return ratings in mod_data_get_entry 2017-09-08 13:49:10 +02:00
Juan Leyva
b7ce46df3f MDL-57407 mod_forum: Return ratings in external functions
External function get_forum_discussion_posts now returns ratings.
2017-09-08 13:49:09 +02:00
David Knuplesch
3b3535c7ea MDL-55358 mod_lti: Add group variable Moodle.Person.userGroupIds 2017-09-08 11:00:52 +02:00
Eloy Lafuente (stronk7)
95fc1e720c Merge branch 'MDL-59983-master-enfix' of git://github.com/mudrd8mz/moodle 2017-09-07 10:58:35 +02:00
Marina Glancy
a39d2976fe MDL-59972 mod_feedback: escape subject when showing the contact form 2017-09-07 10:53:34 +02:00
Eloy Lafuente (stronk7)
d74bb0971e Merge branch 'MDL-59198-master' of git://github.com/ankitagarwal/moodle 2017-09-07 10:50:18 +02:00
Juan Leyva
bde5631d66 MDL-59244 mod_workshop: New WS mod_workshop_delete_submission 2017-09-06 15:51:55 +02:00
Juan Leyva
e1fcba9973 MDL-59244 mod_workshop: Move event triggering to API
Event triggering when a submission is deleted is now inside the
delete_submission function.
2017-09-06 15:51:54 +02:00
Juan Leyva
c1698a37e3 MDL-59245 mod_workshop: New WS mod_workshop_update_submission 2017-09-06 15:50:16 +02:00
Juan Leyva
c2cf2450ac MDL-59243 mod_workshop: New WS mod_workshop_add_submission 2017-09-06 14:00:17 +02:00