Commit graph

20132 commits

Author SHA1 Message Date
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
Juan Leyva
4c776cae2d MDL-59243 mod_workshop: Move submission creation to API 2017-09-06 13:57:11 +02:00
Juan Leyva
b1ed7279e0 MDL-60025 mod_book: Return correct values for chapters update time
Instead returning the time when the chapter was created or modified we
were returning the time when the book was created or modified.
2017-09-06 12:37:21 +02:00
Juan Leyva
20da60a3b7 MDL-60018 mod_chat: Fix chatmethod field type in get_chats_by_courses WS 2017-09-06 12:15:56 +02:00
David Knuplesch
3729ff0ff4 MDL-55358 mod_lti: Add LIS Group Variable 2017-09-06 11:27:17 +02:00
David Mudrák
6806a3734a MDL-59983 lang: Fix Forum behat scenarios to use the new strings 2017-09-05 11:01:10 +02:00
Helen Foster
7698619bc6 MDL-59983 lang: Merge English strings from the en_fix language pack
Significant string changes:

* mobileappenabled, setuplink and setuplink_desc in tool_mobile -
  improved wording
* getmoodleonyourmobile and custommenuitems_desc in tool_mobile -
  improved wording
2017-09-05 11:01:09 +02:00
Adrian Greeve
e5e47a4bdf MDL-55849 mod_assign: Behat update for group submission reopening. 2017-09-04 09:23:32 +08:00
Adrian Greeve
75c21e7e77 MDL-55849 mod_assign: Reopening assignments only increases by one.
Group assignments when being reopened will only increase the
attempt total by one.
2017-09-04 09:23:32 +08:00
Matt Porritt
4e921569d0 MDL-59459 Golbal Search: Increase file indexing coverage
Increase the scope of the files that are detected and
indexed by Moodle's Global Search. This includes intro
and content areas of search areas. The use case here is
in a description for an activity there is a file added
that contains more information about the activity.
It would an advantage to be able to search this content
as well. It would also allow search engine plugins to be
able to index non text files such as images.
2017-09-02 10:28:17 +10:00
John Okely
8812040612 MDL-56646 mod_assign: Improve grade fix strings 2017-08-31 14:39:54 +08:00
John Okely
5ded13e65a MDL-56646 mod_assign: Make rescale behat more specific 2017-08-31 14:39:54 +08:00
Eloy Lafuente (stronk7)
9533cf3419 Merge branch 'MDL-59779_master' of git://github.com/dmonllao/moodle 2017-08-30 01:09:20 +02:00
Connor Sheremeta
d50c3db5c7 MDL-54540 lti: Add allowfullscreen attribute to LTI IFrames 2017-08-29 13:31:18 -06:00
Dan Poltawski
08220d64f6 Merge branch 'MDL-59195_assign_comment_permissions' of git://github.com/davosmith/moodle 2017-08-29 11:54:07 +01:00
Andrew Nicols
350ef63246 Merge branch 'MDL-56646-master' of https://github.com/xow/moodle 2017-08-29 15:51:01 +08:00
John Okely
465b75ed1f MDL-56646 assign: Fix negative grades in restore 2017-08-29 07:23:01 +00:00
John Okely
7323c473cc MDL-56646 assign: Add ability to fix errant grades 2017-08-29 07:23:01 +00:00
Jun Pataleta
33b46e54bb Merge branch 'MDL-59885-master' of git://github.com/cameron1729/moodle 2017-08-29 14:48:04 +08:00
Ankit Agarwal
e4f7cfe19f MDL-59198 lti: Make params LTI2 compatible
LTI2 recommends to include both upper case and lower case of custom params.
This patch makes our implementation confer to that standard.
2017-08-29 11:42:09 +05:30
David Monllao
edee629d1a MDL-59030 analytics: Expand community of inquiry mods public API 2017-08-29 06:19:37 +02:00
John Okely
2d1075e321 MDL-56646 assign: use ASSIGN_GRADE_NOT_SET constant 2017-08-28 06:58:44 +00:00
John Okely
e04be435e0 MDL-56646 assign: Don't rescale any negative grades 2017-08-28 06:58:43 +00:00
John Okely
64b52095e5 MDL-56646 assign: Behat test rescaling after viewing student 2017-08-28 06:58:43 +00:00
Jun Pataleta
2e4c8b3862 MDL-59478 mod_scorm: Fix setting of default completion rule 2017-08-25 20:04:26 +08:00
Andrew Nicols
8cb6a55147 Merge branch 'MDL-53848_form_hideif' of git://github.com/davosmith/moodle 2017-08-23 09:56:00 +08:00
Andrew Nicols
474c7ee757 Merge branch 'MDL-36985-master' of https://github.com/snake/moodle 2017-08-22 14:37:55 +08:00
Andrew Nicols
8df7bfff0d Merge branch 'MDL-59893-master' of https://github.com/snake/moodle 2017-08-22 13:32:53 +08:00
Jake Dallimore
f3c2afd0e8 MDL-36985 core_files: added option to remove draft files on save
text areas can now specify $options['removeorphaneddrafts'] when saving
their data using file_postupdate_standard_editor(). If set to true,
this option clears all user drafts which are not referenced in the text
2017-08-22 13:15:30 +08:00
Jake Dallimore
859e62e7fa MDL-59893 assign: don't prefix file links when downloading as folders
Change to download_rewrite_pluginfile_urls() ensuring prefix isn't
added to file links when downloading with the  downloadasfolders
user preference set to true. Links to files in onlinetext now work
when downloading as folders.
2017-08-22 12:56:45 +08:00
Jake Dallimore
a15dfc6682 MDL-59893 assign: fixes for groupname prefix when downloading
assign->download_submissions():
- groupname now only added to zip file name if not empty, fixing a
double hyphen bug in the file name.
assign->download_rewrite_pluginfile_urls():
- groupname is now correctly determined using get_submission_group()
instead of using groups_get_activity_group() which fails when there
is no active activity group set. Uses the same logic that
download_submission() uses to prefix file names. Fixes a bug where an
empty groupname prefix was generated, resulting in broken links.
2017-08-22 12:56:28 +08:00
Jun Pataleta
f8de8cb314 Merge branch 'MDL-59204_master_v2' of git://github.com/markn86/moodle 2017-08-22 12:46:23 +08:00
Andrew Nicols
51483e4a4e Merge branch 'MDL-57246-33-forumredirect' of git://github.com/roperto/moodle 2017-08-22 12:26:42 +08:00