20488 Commits

Author SHA1 Message Date
Andrew Nicols
67196d5080 Merge branch 'MDL-60950-master' of git://github.com/damyon/moodle 2018-06-19 11:36:59 +08:00
Damyon Wiese
994d0da35e MDL-60950 assign: Update incompatible unit test
Maintain compatibility with unit test changes after MDL-55609.
2018-06-19 10:56:53 +08:00
Damyon Wiese
c957707106 MDL-60950 assign: Rename class
testable_assign was renamed to mod_assign_testable_assign
2018-06-19 10:53:51 +08:00
Damyon Wiese
07d237840e MDL-60950 assign: Robust filtering of grading table
For assignments with gradetype set to none, we need special handling when generating the query to filter submissions that need grading.
2018-06-19 10:09:42 +08:00
Damyon Wiese
a5ff898f90 MDL-60950 assign: Test for the requires grading filter
This test covers when the requires grading filter is applied, but the
assignment has no grade and the feedbackcomments plugin is disabled.
2018-06-19 10:09:42 +08:00
Eloy Lafuente (stronk7)
eeb0597493 Merge branch 'MDL-62571_master' of git://github.com/markn86/moodle 2018-06-19 01:49:05 +02:00
Sara Arjona
1d76dd714c MDL-62449 scorm: Move related data to data in the privacy export 2018-06-18 10:42:26 +02:00
Sara Arjona
cd3ef1fbc4 MDL-62449 scorm: Add SCORM data to privacy export (name, description) 2018-06-18 10:42:26 +02:00
Damyon Wiese
43c8e1f596 MDL-62643 assign: Skip empty online text files
Online text assignment submissions with no text entered into the editor should not
create a blank html document for providing feedback.
2018-06-15 14:07:08 +08:00
Ed Basset
1764defb5a MDL-36424 wiki: set group so subwiki tabs/pages display correctly 2018-06-14 17:33:18 +02:00
Eloy Lafuente (stronk7)
d0f9d0ef4d Merge branch 'MDL-62446-master' of git://github.com/lameze/moodle 2018-06-12 18:21:40 +02:00
David Monllao
bcb4a27dd6 Merge branch 'MDL-55609-master' of git://github.com/andrewnicols/moodle 2018-06-12 10:07:35 +02:00
Andrew Nicols
01d0c0cb49 Merge branch 'MDL-62628-master' of git://github.com/mihailges/moodle 2018-06-12 09:49:18 +08:00
Mark Nelson
4626c848c2 MDL-62571 mod_forum: fixed redirection URLs 2018-06-11 18:29:58 +08:00
Jun Pataleta
64818f403d MDL-61484 mod_chat: Add CHAT_SESSION_GAP constant 2018-06-11 15:59:13 +08:00
Jun Pataleta
d7b236fa5e MDL-61484 mod_chat: Fix chat_get_sessions logic 2018-06-11 15:59:06 +08:00
Jun Pataleta
70175dbe8f MDL-61484 mod_chat: More unit tests for chat
* For chat_get_sessions()
* Fix externallib test
2018-06-11 15:48:41 +08:00
Simey Lameze
424441471d MDL-62446 mod_glossary: optimize provider code 2018-06-08 10:25:45 +08:00
Simey Lameze
98d24a4824 MDL-62446 mod_glossary: improve privacy unit tests 2018-06-08 10:04:38 +08:00
Mihail Geshoski
6f48461344 MDL-62628 resource: Folder name formatting issue when displayed inline 2018-06-08 08:35:29 +08:00
Jun Pataleta
959d5fadc6 Merge branch 'MDL-46513_master' of git://github.com/markn86/moodle 2018-06-06 11:16:34 +02:00
Jun Pataleta
43cc39bbc2 Merge branch 'MDL-62225-master' of https://github.com/lucisgit/moodle 2018-06-06 11:16:31 +02:00
Jun Pataleta
d585953dfe Merge branch 'MDL-62586-master' of git://github.com/bmbrands/moodle 2018-06-06 11:16:28 +02:00
Orzu Ionut
403f553623 MDL-61670 assign: show uploaded files timestamp
Amended to fix commit message. Rename variable to lower.
2018-06-06 11:16:22 +02:00
David Monllao
b321d231ff Merge branch 'MDL-42366-master' of https://github.com/lucisgit/moodle 2018-06-04 13:17:07 +02:00
Andrew Nicols
b762445485 MDL-55609 mod_assign: Deprecate base_test 2018-06-01 07:31:50 +08:00
Andrew Nicols
a6b8fc7830 MDL-55609 assignfeedback_comments: Remove shared setUp 2018-06-01 07:30:32 +08:00
Andrew Nicols
a41bf00517 MDL-55609 mod_assign: Move fixture to folder 2018-06-01 07:30:32 +08:00
Andrew Nicols
757d5b7cdc MDL-55609 mod_assign: Remove shared setUp for all tests 2018-06-01 07:30:32 +08:00
Tony Butler
8e64242131 MDL-62225 assignfeedback_editpdf: Add alt text for nav button shortcuts 2018-05-30 15:58:18 +01:00
Tony Butler
166ac972c3 MDL-42366 assignfeedback_editpdf: Improve meaningfulness of cursor image
Various improvements to make the cursor image more accurately reflect
the currently selected editing tool or action:
 * Replace crosshair with default cursor for read-only student view
 * Use currently selected stamp image as cursor when using stamp tool
 * Use text cursor for text higlighter tool and improve its accuracy
 * Use default cursor for select tool (as indicated by its button icon)
2018-05-30 14:50:34 +01:00
Bas Brands
b1a74e40ff MDL-62586 Themes: use Boostrap media compontent for author display 2018-05-29 09:27:04 +02:00
Eloy Lafuente (stronk7)
00977e984e MDL-62478 upgrade: add 3.5.0 separation line to all upgrade scripts 2018-05-28 13:15:48 +02:00
Mark Nelson
88e16674b2 MDL-46513 mod_chat: pass has_capability result to fullname function 2018-05-28 15:11:25 +08:00
Jun Pataleta
6a7a11a7b3 Merge branch 'MDL-61832-master' of https://github.com/lucaboesch/moodle 2018-05-28 09:21:48 +08:00
Andrew Nicols
407f5d053c MDL-62543 mod_forum: Add RSS Unit tests 2018-05-28 08:53:45 +08:00
Andrew Nicols
daad84d150 Merge branch 'MDL-62543-master' of git://github.com/tobiasreischmann/moodle 2018-05-28 08:53:41 +08:00
Luca Bösch
ed38521b1d MDL-61832 lesson: don't hide lesson page editing options 2018-05-24 15:45:30 +02:00
Tobias Reischmann
82b50d3187
MDL-62543 forum: Switched the usage of the deleted flag for rss
The deleted flag was introduced through the Privacy API and was used
for post selection for the rss feed. In there it was used in the
wrong way, which lead to the exclusion of all non deleted posts instead
of excluding all deleted ones.
This commit fixes this problem.
2018-05-23 14:05:28 +02:00
Jake Dallimore
b345895a9d Merge branch 'MDL-61932-master' of git://github.com/junpataleta/moodle 2018-05-23 10:01:08 +08:00
Jun Pataleta
d980528873 MDL-61932 mod_glossary: Fetch the correct front page section 1 ID 2018-05-22 17:15:58 +08:00
Andrew Nicols
630081dd91 MDL-62516 mod_forum: Only delete files for requested user 2018-05-21 14:12:17 +08:00
Jun Pataleta
266eccfde6 MDL-61932 mod_glossary: Display site-level glossaries on section 1
* Glossary activities created on the front page by importing
entries are being added to section 0, but the front page only shows
activities on section 1.
2018-05-17 16:02:36 +08:00
David Monllao
36960958ad Merge branch 'MDL-62456_master' of git://github.com/markn86/moodle 2018-05-16 08:56:33 +02:00
Andrew Nicols
798f0f1da9 Merge branch 'wip-MDL-62147-master-4' of git://github.com/marinaglancy/moodle 2018-05-16 14:27:19 +08:00
Jun Pataleta
6c32ea4631 Merge branch 'MDL-62463-master' of git://github.com/andrewnicols/moodle 2018-05-16 14:22:05 +08:00
Andrew Nicols
39da8c1a35 MDL-62463 mod_glossary: Fix SQL query
The query was doing:
WHERE c.id ... AND ... OR ... OR ...

Which equates to:
WHERE (c.id ... AND ...) OR ... OR ...

Adding parens to:
WHERE (c.id ... AND (... OR ... OR ...))
2018-05-16 13:51:32 +08:00
Marina Glancy
d1620c57f9 MDL-62147 privacy: corrections to tables, temporary tables 2018-05-16 12:57:19 +08:00
Mark Nelson
ad7f143897 MDL-62456 mod_lti: add missing add_external_location_link call 2018-05-16 12:22:34 +08:00
David Monllao
85218c28e9 Merge branch 'MDL-62228_master' of git://github.com/markn86/moodle 2018-05-15 13:31:07 +02:00