David Monllao
132106bfef
Merge branch 'MDL-61153-master' of git://github.com/mihailges/moodle
2018-02-12 10:55:28 +01:00
David Monllao
0abe3fe373
Merge branch 'MDL-61375_master' of git://github.com/markn86/moodle
2018-02-12 09:40:31 +01:00
David Monllao
f40d707dbf
Merge branch 'mod-lti-fix-test-with-hardcoded-url' of https://github.com/peikk0/moodle
2018-02-12 09:20:50 +01:00
Nicolas Dunand
a0b2b76613
MDL-61344 mod_assign: Show additional files when adding submission
2018-02-12 07:40:57 +01:00
Andrew Nicols
1e41e6ddd9
Merge branch 'MDL-61135-master' of git://github.com/ryanwyllie/moodle
2018-02-12 11:34:56 +08:00
Pierre Guinoiseau
a6529e04e6
MDL-61379 mod_lti: fix a test comparing a hardcoded URL from fixtures
...
The hardcoded URL from tests/fixtures/ims_cartridge_basic_lti_link.xml
didn't match if TEST_EXTERNAL_FILES_HTTPS_URL was defined, the test
needs to compare with the exact same URL instead of a generated one.
2018-02-12 13:44:45 +13:00
Marina Glancy
015e612a5f
MDL-61150 xmldb: correct path to schema in install.xml
2018-02-11 23:07:18 +01:00
Eloy Lafuente (stronk7)
dd9368b43d
MDL-61150 xmldb: Fix wrong PATH attributes in core
2018-02-11 22:53:58 +01:00
Eloy Lafuente (stronk7)
7fcc62c633
MDL-61413 mod_lti: Use sql_compare_text() for comparing TEXTs
2018-02-11 02:16:39 +01:00
Mark Nelson
fb77b89fd8
MDL-61375 mod_chat: specify the 'eventtype' to avoid duplicate rows
2018-02-09 14:46:11 +08:00
Ryan Wyllie
d04f42254b
MDL-61135 mod_quiz: add behat test for tag filtering in qbank modal
2018-02-08 02:44:18 +00:00
Ryan Wyllie
e6743b4b80
MDL-61135 mod_quiz: remove YUI question bank dialogue
2018-02-08 02:44:17 +00:00
Ryan Wyllie
fff033322a
MDL-61135 mod_quiz: add tag condition to question bank form
2018-02-08 02:44:17 +00:00
Ryan Wyllie
171d7919b3
MDL-61135 mod_quiz: add question bank AMD modal
2018-02-08 02:44:16 +00:00
Ryan Wyllie
f33dc783f1
MDL-61135 mod_quiz: add question bank fragment
2018-02-08 02:44:16 +00:00
Eloy Lafuente (stronk7)
496e80e1f5
MDL-52832 quiz: sql fixing couple of incorrect group by uses
2018-02-06 18:30:11 +01:00
David Monllao
7416d00ad2
Merge branch 'MDL-52832-master' of https://github.com/lucaboesch/moodle
2018-02-06 12:18:27 +01:00
Andrew Nicols
e742f93303
Merge branch 'MDL-61132-master' of git://github.com/rezaies/moodle
2018-02-06 14:33:41 +08:00
Eloy Lafuente (stronk7)
5bdda5e535
Merge branch 'MDL-61168-master' of git://github.com/junpataleta/moodle
2018-02-05 20:17:34 +01:00
Andrew Nicols
a88658fbf0
Merge branch 'MDL-51189-master' of git://github.com/rezaies/moodle
2018-02-05 15:43:47 +08:00
Shamim Rezaie
3b8f3198de
MDL-61132 Quiz: "Random" question from "Top" categories
...
* Support for adding ranodm questions from "Top" categories
2018-02-05 11:58:57 +11:00
Jun Pataleta
5c7351a263
MDL-61168 mod_assign: Truncate only the online text submission
2018-02-02 09:20:57 +08:00
Luca Bösch
bcf4a7f076
MDL-52832 quiz: timeclose in activities block looks after overrides.
2018-02-01 22:52:19 +01: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