Commit graph

83941 commits

Author SHA1 Message Date
Andrew Nicols
6e1523c38b MDL-57822 feedback: Correct page param for nonrespondents WS 2017-03-29 11:20:57 +08:00
Marina Glancy
4ead659398 MDL-58364 course: fix error in drag&drop activities 2017-03-29 11:14:14 +08:00
Eloy Lafuente (stronk7)
5d267581fb Merge branch 'MDL-57918-master' of git://github.com/jleyva/moodle 2017-03-29 01:27:19 +02:00
Eloy Lafuente (stronk7)
d858278a58 Merge branch 'MDL-49409-master' of git://github.com/jleyva/moodle 2017-03-29 01:25:59 +02:00
David Monllao
d4a8fb899a Merge branch 'MDL-58177-master' of https://github.com/sammarshallou/moodle 2017-03-28 23:16:42 +02:00
David Monllao
46c6d0df5a Merge branch 'MDL-57822_master' of git://github.com/dmonllao/moodle 2017-03-28 22:57:15 +02:00
David Monllao
92c1ed4f85 Merge branch 'MDL-58230_master' of git://github.com/dmonllao/moodle 2017-03-28 22:55:34 +02:00
Juan Leyva
bb66bc4a89 MDL-57822 mod_feedback: New WS mod_feedback_get_non_respondents 2017-03-28 22:52:03 +02:00
Juan Leyva
52f57996f4 MDL-58230 mod_feedback: New WS mod_feedback_get_finished_responses 2017-03-28 22:50:36 +02:00
Juan Leyva
1104a9fa44 MDL-58399 webservice: Return additional file fields for repositories
We should be detecting when we are treating files that are linked to
external repositories.
For doing that we'd need to return some additional fields via Web
Services:
- isexternalfile
- mimetype (google docs files use an special one)
- repositorytype (the repository plugin name)
2017-03-28 20:23:16 +02:00
Dan Poltawski
f98ad251ae Merge branch 'MDL-55139' of git://github.com/stronk7/moodle 2017-03-28 18:33:19 +01:00
Dan Poltawski
a1355e53e8 Merge branch 'MDL-58264' of https://github.com/darrencocco/moodle 2017-03-28 18:02:40 +01:00
AMOS bot
e5eb821020 Automatically generated installer lang files 2017-03-29 00:04:57 +08:00
David Monllao
842217de6c Merge branch 'MDL-58070-visible-reword' of https://github.com/DSI-Universite-Rennes2/moodle 2017-03-28 17:46:00 +02:00
David Monllao
618336bf88 MDL-58079 enrol: Move new test to existing test case 2017-03-28 17:34:28 +02:00
David Monllao
6d8b31d3c9 Merge branch 'MDL-58079_master' of https://github.com/kiklop74/moodle 2017-03-28 17:30:40 +02:00
David Monllao
17dda0c4cf Merge branch 'MDL-57965-gzip_svg' of https://github.com/DSI-Universite-Rennes2/moodle 2017-03-28 17:14:23 +02:00
Dan Poltawski
54e9302b5f Merge branch 'MDL-58227-master' of git://github.com/jleyva/moodle 2017-03-28 16:02:07 +01:00
Dan Poltawski
6ba920575f Merge branch 'master' of https://github.com/fwsl/moodle 2017-03-28 12:07:29 +01:00
Dan Poltawski
702be5ee47 Merge branch 'MDL-58160' of git://github.com/aolley/moodle 2017-03-28 11:34:33 +01:00
Dan Poltawski
c7c96ddc7c Merge branch 'wip-MDL-58092-master' of git://github.com/marinaglancy/moodle 2017-03-28 10:56:00 +01:00
Dan Poltawski
313aa61610 Merge branch 'MDL-58257' of https://github.com/ak4t0sh/moodle 2017-03-28 10:50:57 +01:00
Dan Poltawski
ed8ab587be Merge branch 'MDL-38278-pptx-et-al-presentation-group' of https://github.com/lucaboesch/moodle 2017-03-28 10:15:22 +01:00
Luca Bösch
5ee4e09334 MDL-38278 core_files: Populating presentation group some more.
Now all filetypes with icon 'powerpoint' and 'impress', i.e.
pps, ppt, pptx, pptm, potx, potm, ppam, ppsx, ppsm, odp, otp, sxi, sti
are all attributed to the "presentation" group.

Signed-off-by: Luca Bösch <luca.boesch@bfh.ch>
2017-03-28 10:50:34 +02:00
John Okely
fb73f60a36 MDL-58361 media: Make core_meda_manager constructor private 2017-03-28 12:11:14 +08:00
John Okely
2553d67c74 MDL-58361 media: Remove media manager subclass from unit test 2017-03-28 12:11:14 +08:00
AMOS bot
e3e6f92151 Automatically generated installer lang files 2017-03-28 00:06:19 +08:00
Jakob
6a36b8526e MDL-37765 course: Add capability to ignore availability restrictions.
Allow a role to view activities without addressing the restriction rules.
2017-03-27 08:37:27 -07:00
Tony Butler
23990a0a80 MDL-55459 assignfeedback_editpdf: Make comments collapsible in editor 2017-03-27 15:13:37 +01:00
David Monllao
3ecbebc816 Merge branch 'MDL-58329-master' of git://github.com/jleyva/moodle 2017-03-27 15:47:55 +02:00
Juan Leyva
448a488642 MDL-58329 mod_lesson: New WS function mod_lesson_get_lesson 2017-03-27 14:48:28 +02:00
Juan Leyva
a0558b5607 MDL-58329 mod_lesson: Refactor to use new exporter
Refactor existing WS to use the new summary_exporter
2017-03-27 14:42:11 +02:00
David Monllao
76e4853585 Merge branch 'MDL-57760-master' of git://github.com/jleyva/moodle 2017-03-27 13:39:44 +02:00
David Monllao
7cf5c3d54c Merge branch 'MDL-57762-master' of git://github.com/jleyva/moodle 2017-03-27 13:31:29 +02:00
David Monllao
e8be22337d Merge branch 'MDL-57759-master' of git://github.com/jleyva/moodle 2017-03-27 13:21:35 +02:00
Juan Leyva
2db90397f1 MDL-57759 mod_lesson: Handle offline attempts in view and WS
- Notify the user if there are previous offline attempts
- Set the offline attempts and return additional information via Web
Services
2017-03-27 13:10:01 +02:00
Juan Leyva
c6f9f06146 MDL-57759 mod_lesson: New settings for allowing offline attempts 2017-03-27 13:10:00 +02:00
David Monllao
49ba56cf38 Merge branch 'MDL-57757-master' of git://github.com/jleyva/moodle 2017-03-27 11:50:35 +02:00
David Monllao
aad9ea040c Merge branch 'MDL-57754-master' of git://github.com/jleyva/moodle 2017-03-27 11:43:44 +02:00
Mike Olsen
7782e6610b
MDL-58311 cache: Add password support for redis
add password support for redis connects in cache and session
2017-03-27 10:31:45 +01:00
Juan Leyva
635721f5c1 MDL-57762 mod_lesson: Implement the check_updates callback 2017-03-27 10:51:42 +02:00
Juan Leyva
707d50d1c8 MDL-57760 mod_lesson: New WS mod_lesson_get_pages_possible_jumps 2017-03-27 10:47:07 +02:00
Dan Poltawski
a6c34f3298 Merge branch 'MDL-57510-master' of git://github.com/ankitagarwal/moodle 2017-03-27 09:41:27 +01:00
Juan Leyva
87e472bd15 MDL-57759 mod_lesson: Handle offline attempts in view and WS
- Notify the user if there are previous offline attempts
- Set the offline attempts and return additional information via Web
Services
2017-03-27 10:41:09 +02:00
Juan Leyva
d874370b20 MDL-57759 mod_lesson: New settings for allowing offline attempts 2017-03-27 10:41:08 +02:00
Juan Leyva
79d5e88215 MDL-57757 mod_lesson: New WS mod_lesson_get_user_attempt 2017-03-27 10:37:21 +02:00
Juan Leyva
49e353782f MDL-57757 mod_lesson: Move user report code to function 2017-03-27 10:37:20 +02:00
Juan Leyva
899b000d99 MDL-57754 mod_lesson: New Web Service mod_lesson_get_attempts_overview 2017-03-27 10:34:45 +02:00
Juan Leyva
7d5564d959 MDL-57754 mod_lesson: Move overview report code to function
Move the table and statistics generation to a new function
2017-03-27 10:34:44 +02:00
Damyon Wiese
6f418b0759 MDL-58369 icons: Fix mapping for scorm icons 2017-03-27 16:14:58 +08:00