Andrew Nicols
7c8f4f6b70
Merge branch 'MDL-35987-master' of git://github.com/FMCorz/moodle
2016-05-30 13:38:52 +08:00
David Monllao
485de12199
Merge branch 'MDL-53425-master-delete-by-chunks' of git://github.com/junpataleta/moodle
2016-05-30 13:35:24 +08:00
Mark Nelson
e0d60498d8
MDL-54763 tool_lp: fixed typo in HTML tag
2016-05-30 13:31:31 +08:00
Andrew Nicols
e67da0d792
MDL-54567 backup: Fixtures for legacy grade value rewrite
2016-05-30 13:22:04 +08:00
Frederic Massart
2a64b641e6
MDL-54567 backup: Process the calculations_freeze item upon restore
2016-05-30 13:22:03 +08:00
Cameron Ball
cd29373c35
MDL-37138 chat: Use blanktarget option for chat text
2016-05-30 13:18:02 +08:00
Cameron Ball
64e8311939
MDL-37138 message: Use blanktarget option for message text
2016-05-30 13:18:01 +08:00
Cameron Ball
bf9974870b
MDL-37138 weblib: Add blanktarget option to format_text
2016-05-30 13:17:59 +08:00
David Monllao
edf842a462
Merge branch 'MDL-48248-master' of git://github.com/FMCorz/moodle
2016-05-30 13:02:34 +08:00
Frederic Massart
31031e98c7
MDL-29905 question: Auto remove stale questions upon category deletion
2016-05-30 12:26:09 +08:00
Eric Merrill
54640aba8a
MDL-29905 question: Try to delete unused hidden/random questions
...
Before going to display the warning about moving in use questions,
try to delete unused Random qtype questions, as well as 'hidden'
questions (these are questions that were deleted from the category),
but were in use at the time.
2016-05-30 12:25:21 +08:00
Jun Pataleta
4eba620ae3
MDL-53425 blocklib: Perform deletion of block instances by chunk
2016-05-30 11:22:47 +08:00
David Monllao
571f30b376
Merge branch 'MDL-54721-master' of git://github.com/FMCorz/moodle
2016-05-30 11:15:20 +08:00
David Monllao
3300393d05
Merge branch 'MDL-43887-master' of git://github.com/cameron1729/moodle
2016-05-30 11:08:46 +08:00
David Monllao
5baf32c038
Merge branch 'MDL-51806_master' of https://github.com/snake/moodle
2016-05-30 10:51:33 +08:00
Jake Dallimore
f747f5a0d5
MDL-51806 mod_workshop: Add locale support for grade values.
2016-05-30 10:25:26 +08:00
David Monllao
0196f0101c
Merge branch 'wip-MDL-45427-master' of git://github.com/abgreeve/moodle
2016-05-30 10:19:24 +08:00
Marina Glancy
bc6a7431a2
MDL-54065 gradebook: correctly display module icon
2016-05-30 10:07:40 +08:00
Stephen Bourget
18875f811a
MDL-54655 Behat: Tests for the online_users block
2016-05-27 18:21:25 -04:00
Tim Hunt
31c07476db
MDL-54756 moodle_url: remove dangerous trim from make_file_url
...
This was a regression caused by MDL-50268. It broke qtype_stack.
2016-05-27 19:55:25 +01:00
Tim Hunt
f027922e4f
MDL-54605 quiz regrading: incorrect DB query
...
There were two issues. With groups, the $params array was wrong
due to PHP + vs array_merge sillyness.
Also, the first column in the SQL was not necessarily unique,
so we need to use a recordset rather than get_records.
2016-05-27 08:11:32 +01:00
Adrian Greeve
0cf8082a8f
MDL-49852 mod_assign: Unit tests for activity completion.
2016-05-27 14:10:55 +08:00
Cameron Ball
e6e69969c1
MDL-43887 formslib: Allow not set date field
...
Previously if the date field was not enabled it would
be treated as having value 0. A bug would allow this 0
to pass through and save the date as 1 January 1970
2016-05-27 01:52:57 +08:00
AMOS bot
867181ab19
Automatically generated installer lang files
2016-05-27 00:04:40 +08:00
Frederic Massart
6e91817178
MDL-54721 report_competency: Do not ignore the first user selection
2016-05-26 17:54:52 +08:00
Jake Dallimore
7eafbbf7fa
MDL-53392 mod_assign: Remove old Grade Max warning string references
2016-05-26 17:16:53 +08:00
Steve Bader
9569b01cc9
MDL-49852 mod_assign: Fix group assignment completion tracking
...
Fixes completion tracking for group assignments where either only
one student is required to click Submit when submitting the
assignment for grading, all students are required to submit,
or no students are required to click submit (meaning that simply
uploading submits for grading).
2016-05-26 16:03:03 +08:00
Cameron Ball
bb30944f49
MDL-54010 roles: Specify encoding for escaped export data
2016-05-26 10:31:28 +08:00
Nigel Cunningham
d50a9a9d30
MDL-54010 roles: Fix missing HTMLspecialchars in role export code.
...
Role name and description fields are currently not escaped when
exporting a role. This results in an unusable file when characters
such as ampersands are used in a name or description. Fix this by
using htmlspecialchars on both fields.
Signed-off-by: Nigel Cunningham <nigelc@catalyst-au.net>
2016-05-26 10:31:28 +08:00
Stephen Bourget
71b1761337
MDL-54577 Behat: Add tests for messages block
2016-05-26 10:21:07 +08:00
Marina Glancy
c0e3e9da37
MDL-54116 block_comments: warnings when commenting outside of a course
2016-05-26 10:19:31 +08:00
Stephen Bourget
f2778cc5d6
MDL-54116 block_comments: behat test
2016-05-26 10:19:31 +08:00
Eloy Lafuente (stronk7)
6a74e76fb8
weekly on-sync release 3.2dev
2016-05-26 02:15:53 +02:00
Eloy Lafuente (stronk7)
ea051ef170
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2016-05-26 02:15:50 +02:00
Jakub Kania
10186fe83d
MDL-53851 news block: Display news from all the accessible groups
2016-05-25 16:54:45 +02:00
David Monllao
3f59e20eeb
Merge branch 'MDL-54059-master' of git://github.com/andrewnicols/moodle
2016-05-25 16:17:44 +08:00
Adrian Greeve
43c762ef10
MDL-45427 mod_data: Inserting tags into templates.
...
Allows tags to be inserted into the editor without
having to touch Atto at all.
2016-05-25 15:24:41 +08:00
Frederic Massart
9a601adc9e
MDL-35987 qtype_multianswer: Prevent restore failure due to bad sequence
2016-05-25 12:23:50 +08:00
Andrew Nicols
c366cb08cf
MDL-54059 testing: Add grunt test
2016-05-25 10:44:36 +08:00
Andrew Nicols
a24aff4edf
MDL-54059 testing: Simplify travis output
2016-05-25 10:44:01 +08:00
Frederic Massart
b8f414c29f
MDL-48248 enrol_manual: Ensure that the default value is always selected
2016-05-25 10:16:59 +08:00
Stephen Bourget
1633ec89ad
MDL-54002 Behat: tests for recent blogs block
2016-05-24 12:42:31 -04:00
AMOS bot
0fcfcd8327
Automatically generated installer lang files
2016-05-25 00:04:41 +08:00
Frederic Massart
7c9968bd9f
MDL-24064 admin: Remove unused code to bulk enrol users
2016-05-24 18:48:06 +08:00
Cameron Ball
4ca7fdd26e
MDL-46721 assign: Make blind marking participant numbers match
...
Previously emails were setting the "From" header to the incorrect
participant number.
2016-05-24 18:19:54 +08:00
Andrew Nicols
979d5c0603
Merge branch 'MDL-54715-master' of git://github.com/marinaglancy/moodle
2016-05-24 14:53:24 +08:00
Marina Glancy
3e9437f412
MDL-54715 core_question: fixed bug when importing questions with tags
...
Thanks to WangYang for original patch
2016-05-24 14:37:53 +08:00
David Monllao
4024b94d17
Merge branch 'MDL-54675-forum-highlight' of https://github.com/brendanheywood/moodle
2016-05-24 14:20:13 +08:00
David Monllao
7b7b990e43
Merge branch 'MDL-54582' of git://github.com/timhunt/moodle
2016-05-24 11:17:08 +08:00
Brendan Heywood
d0d6902a72
MDL-54675 forum: Fixed bug with multiple adjacent hash anchors
2016-05-24 13:07:07 +10:00