19943 Commits

Author SHA1 Message Date
Andrew Nicols
a88658fbf0 Merge branch 'MDL-51189-master' of git://github.com/rezaies/moodle 2018-02-05 15:43:47 +08:00
David Monllao
e57392fabe Merge branch 'MDL-57394-master' of git://github.com/jleyva/moodle 2018-02-01 10:33:17 +08:00
Eloy Lafuente (stronk7)
74c0b5fe91 Merge branch 'MDL-44612-master' of git://github.com/junpataleta/moodle 2018-02-01 10:33:17 +08:00
Juan Leyva
bf7a643f8a MDL-57394 mod_chat: New WS mod_chat_get_session_messages 2018-01-30 14:30:51 +01:00
Juan Leyva
2971d8421c MDL-57394 mod_chat: Move get session messages code to new function 2018-01-30 14:21:13 +01:00
Juan Leyva
26b4e8580d MDL-57394 mod_chat: New WS mod_chat_get_sessions 2018-01-30 13:52:05 +01:00
Juan Leyva
9b82171b18 MDL-57394 mod_chat: Move get sessions code to new function
To avoid code duplication when creating new web services we need to
move code to a function chat_get_sessions.
2018-01-30 13:52:05 +01:00
Jun Pataleta
ab9ee20ec7 MDL-44612 mod_glossary: Test importing of glossary entries
* And check that the importing of entries is reflected in the recent
activity block.
2018-01-24 16:38:54 +08:00
Jun Pataleta
a52f3d9d0b MDL-44612 mod_forum: Confirm forum post listing in recent activity block 2018-01-24 16:38:54 +08:00
Eloy Lafuente (stronk7)
b878578d90 Merge branch 'MDL-61252-master' of git://github.com/andrewnicols/moodle 2018-01-23 02:13:10 +01:00
Andrew Nicols
caa9cb7124 MDL-61252 mod_quiz: Fix ambiguous behat check 2018-01-23 08:21:22 +08:00
Shamim Rezaie
ce8c0126a9 MDL-51189 Quiz: Edit overrides when quiz is not available to students
The $active variable should simply be used to dim the text, nothing more.
2018-01-23 10:52:19 +11:00
Eloy Lafuente (stronk7)
447cf62409 Merge branch 'MDL-58006-master' of git://github.com/zig-moodle/moodle 2018-01-22 19:57:33 +01:00
Eloy Lafuente (stronk7)
863d7ca5aa Merge branch 'MDL-60181-master' of git://github.com/mihailges/moodle 2018-01-22 12:30:44 +01:00
Mihail Geshoski
11342dbcf8 MDL-60181 glossary: Glossary rating is displayed wrongly 2018-01-22 13:51:58 +08:00
Zig Tan
1a9e8542c5 MDL-58006 assign: Reset blindmarking assignments to hidden
Fix to reset blindmarking assigments to hidden as part of Course reset with behat test
2018-01-22 11:35:52 +08:00
Eloy Lafuente (stronk7)
a610100586 Merge branch 'MDL-61077' of git://github.com/timhunt/moodle 2018-01-22 02:26:04 +01:00
Kevin Wiliarty
a0b9bf4998 MDL-61175 mod_assign: roll grade-by reminder on restore 2018-01-18 08:36:34 -05:00
Eloy Lafuente (stronk7)
b678f3309d Merge branch 'MDL-58711-master' of git://github.com/jleyva/moodle 2018-01-17 10:55:23 +01:00
Juan Leyva
ddeabbc53a MDL-58711 mod_assign: Fix draft and submission counting 2018-01-17 09:49:46 +01:00
Eloy Lafuente (stronk7)
87f6dfdedc Merge branch 'MDL-58711-master' of git://github.com/jleyva/moodle 2018-01-17 02:27:22 +01:00
Andrew Nicols
5705fd0907 Merge branch 'MDL-60549-master' of https://github.com/davidknu/moodle 2018-01-16 10:08:26 +08:00
Eloy Lafuente (stronk7)
d2d919e478 Merge branch 'MDL-61162-master' of git://github.com/junpataleta/moodle 2018-01-15 22:57:12 +01:00
Eloy Lafuente (stronk7)
b3b79085e6 Merge branch 'MDL-51885-master' of git://github.com/ankitagarwal/moodle 2018-01-15 19:09:52 +01:00
Tim Hunt
bccad386b0 MDL-61077 question stats: make calculations more robust 2018-01-15 16:07:57 +00:00
David Monllao
f4a30c5fdf Merge branch 'MDL-41090_rebased' of https://github.com/andrewhancox/moodle 2018-01-15 15:52:29 +01:00
Andrew Hancox
f3d9872aa3 MDL-41090 questions: Allow embedding files in response comments 2018-01-15 11:19:06 +00:00
David Monllao
e3d292301e Merge branch 'MDL-55382-master' of git://github.com/damyon/moodle 2018-01-15 10:05:05 +01:00
David Monllao
5d89d24bea Merge branch 'MDL-61010-master' of git://github.com/andrewnicols/moodle 2018-01-15 09:53:48 +01:00
Juan Leyva
ff626f7bb1 MDL-58711 mod_assign: Handle groups in get_submission_status 2018-01-11 15:03:08 +01:00
David Knuplesch
cc3c33f8ba MDL-60549 lti: support for moving embedded lti into separate tab 2018-01-10 12:08:44 +01:00
Juan Leyva
01a79b4e86 MDL-60908 mod_quiz: Return question state only when configured
The question state should be returned following the quiz review options
settings.
2018-01-09 16:54:32 +08:00
Andrew Nicols
a52fc1f7a8 Merge branch 'wip-MDL-60415-master' of git://github.com/abgreeve/moodle 2018-01-09 14:30:34 +08:00
David Knuplesch
a2701db412 MDL-60415 mod_lti: avoid confusing error-message 2018-01-09 14:00:37 +08:00
Jun Pataleta
f9b3597e21 Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle 2018-01-09 09:52:47 +08:00
Andrew Nicols
08ac68de3e MDL-61068 mod_forum: Fix neighbour test dates 2018-01-09 09:08:40 +08:00
Eloy Lafuente (stronk7)
d8ef541bbc Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle 2018-01-08 19:56:24 +01:00
Eloy Lafuente (stronk7)
7110a3eed6 Merge branch 'MDL-61046-master-enfix' of git://github.com/mudrd8mz/moodle 2018-01-08 10:05:39 +01:00
Andrew Nicols
b3f7f6d096 Merge branch 'MDL-57786-master' of git://github.com/zig-moodle/moodle 2018-01-08 15:16:06 +08:00
Ankit Agarwal
84fe42d8b6 MDL-51885 lang: Remove strings deprecated in 3.1 2018-01-08 12:44:07 +05:30
Andrew Nicols
7d6d0788f2 Merge branch 'MDL-43042-master' of git://github.com/mihailges/moodle 2018-01-08 15:12:51 +08:00
Andrew Nicols
0b4304b6e3 Merge branch 'MDL-53985-master' of git://github.com/damyon/moodle 2018-01-08 12:39:19 +08:00
Jun Pataleta
0552bc77ba MDL-61162 mod_forum: Remove unnecessary forum creation step 2018-01-08 11:00:08 +08:00
Andrew Nicols
098f4337d2 MDL-61068 mod_forum: Round timed posts to nearest 60 seconds
This slightly reduces the effectiveness of the DB query cache, but gives
us correct results every time.
2018-01-05 16:43:02 +08:00
Mihail Geshoski
7b319d20a8 MDL-43042 lesson: Confusing feedback order in multiple answer questions 2018-01-05 15:03:14 +08:00
Helen Foster
700522badd MDL-61046 lang: Merge English strings from the en_fix language pack
Significant string changes:

* pluginname_desc, enrol_category - improved explanation
* pathtopythondesc, core_admin - mentioning Python version
* configdeleteunconfirmed, core_admin - setting applies to more than
  just email-based self-registration
2018-01-04 11:30:54 +01:00
David Monllao
b5e7264543 Merge branch 'MDL-61107' of git://github.com/timhunt/moodle 2018-01-02 08:34:39 +01:00
Zig Tan
e5d9af8c56 MDL-57786 mod_assign: Fix word count for online text submissions 2018-01-02 13:10:37 +08:00
Zig Tan
6976c8e1b5 MDL-56945 assign: Add 'View all submissions' link to PDF feedback/grader 2017-12-29 09:47:40 +08:00
David Monllao
ce37a8cc7e MDL-51089 mod_quiz: Hide first page last node 2017-12-28 10:15:08 +01:00