Commit Graph

89847 Commits

Author SHA1 Message Date
Tim Hunt 06b4ab81a8 MDL-61045 quiz settings: add back missing disabledIf
This got broken in Moodle 2.1 by MDL-20636.
2017-12-15 13:11:57 +00:00
Julien Boulen 6c519fe4d7 MDL-60036 block_online_users: complete string about online users
- add 3 varations of "x online users" string
- change string format from "x minutes: x online users" to "x online users (x minutes)"
- factorize some duplicated code
2017-12-15 09:36:04 +01:00
Damyon Wiese b6fdcd6071 MDL-55382 assign: Sort editpdf quick list 2017-12-15 14:57:13 +08:00
Jun Pataleta 409da21320 MDL-61042 mod_lesson: Initialise pageid variable 2017-12-15 17:36:16 +13:00
Damyon Wiese 3c016111bd MDL-53985 assign: Do not remove annotations
When an assignment submission is reverted to a draft, the timemodified on
the submission should not be modified. Changing the timemodified causes the
editpdf code to assume the pdf is stale, and forces all annotations to be removed.
2017-12-15 11:50:43 +08:00
Jun Pataleta d766bbc5b9 MDL-58888 mod_choice: Sort choice_get_my_response() results by optionid 2017-12-15 15:55:48 +13:00
Jun Pataleta 3af40cc62e MDL-58888 mod_choice: Verify sorting when testing multiple selections
* Improve test_choice_get_my_response() to verify the sorting of the
  responses returned by choice_get_my_response().
* Fix correct usage of choice_get_my_response().
2017-12-15 15:53:11 +13:00
Zig Tan e0d0f411cf MDL-54967 backup: Fix IMS CC import URL decoding for XML format
HTML encoding special characters to avoid XML compatibility issues during
Course backup restoration and avoid double encoding.
2017-12-15 09:19:31 +08:00
Stephen Bourget 57422d7158 MDL-43648 course: Allow start /end dates to have times 2017-12-14 19:48:31 -05:00
Jun Pataleta 07a46481fe MDL-61040 mod_choice: Save my choice button needs some space 2017-12-15 13:06:14 +13:00
Jun Pataleta af6c39045e MDL-60938 mod_choice: Fix rendering of users for choice results 2017-12-15 12:52:16 +13:00
Matteo Scaramuccia e8be9e7646 MDL-60793 core_ddl: Added the new MySQL 8 reserved words 2017-12-14 22:46:48 +01:00
Luca Bösch e00e36fa4f MDL-31521 questions: Allow more than one unit with multiplier equal to 1 2017-12-14 22:34:19 +01:00
Luca Bösch f987df174f MDL-34389 course: switch to subcategory w/ course:changecategory perms 2017-12-14 22:32:23 +01:00
Eloy Lafuente (stronk7) 95b7be7f05 weekly release 3.5dev 2017-12-14 14:47:29 +01:00
Eloy Lafuente (stronk7) 10e52ed009 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-12-14 14:47:27 +01:00
Dmitrii Metelkin 124f314d22 MDL-19667 report: Add a new capability to view user outline report 2017-12-14 16:16:04 +11:00
AMOS bot ebb250fefb Automatically generated installer lang files 2017-12-14 00:06:01 +00:00
Mark Nelson 464ddd07d5 MDL-43466 mod_assign: improve submission help text
Thanks go to Rajneel Totaram for the report.
2017-12-13 15:38:45 +08:00
Marina Glancy 10c71d8a2f MDL-31436 registration: do not send false in update request 2017-12-13 13:51:25 +08:00
Damyon Wiese ff3e43eeb0 MDL-61022 recyclebin: Verify groups are restored 2017-12-13 13:34:07 +08:00
Ryan Wyllie e236dc1446 MDL-60858 feedback: update behat tests for lang string change 2017-12-13 05:07:19 +00:00
Ryan Wyllie 85ce9b535b MDL-60858 feedback: remove ellipsis from form lang strings
Remove the trailing ellipsis from the complete_the_form and
continue_the_form lang strings.
2017-12-13 03:37:00 +00:00
Mitsuhiro Yoshida 97627d2783 MDL-60858 feedback: add button style for "Answer the questions" link. 2017-12-13 03:36:04 +00:00
Damyon Wiese 23611c3757 Merge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle 2017-12-13 11:30:46 +08:00
Ryan Wyllie 08a7915551 MDL-60964 calendar: lazy load context for calendar_event
Stop loading the context in the constructor if it hasn't been provided.
There is no need to load it by default. We should lazily load it when it
is required.
2017-12-13 03:20:00 +00:00
Adrian Greeve 01957f1a69 MDL-60161 filelib: Unit test for duplicate curl headers. 2017-12-13 11:07:58 +08:00
Carson Tam 7d4a3d1d07 MDL-60161 class curl in filelib: Cleaned up doc block. 2017-12-13 11:07:58 +08:00
Carson Tam a2b66c7833 MDL-60161 class curl in filelib: Avoid duplicate params in http header 2017-12-13 11:07:58 +08:00
Simey Lameze 3bf572411a MDL-56932 theme_boost: fix quiz max mark input height 2017-12-13 10:21:17 +08:00
Jun Pataleta 3cd76cbecc MDL-2051 mod_choice: Show info how choice results will be published 2017-12-13 14:36:03 +13:00
Davo Smith 8fc3d41139 MDL-61016 form: fix handling disabledIf + hideIf with same dependency 2017-12-12 14:53:33 +00:00
Simey Lameze cadeb8d21c MDL-60061 mod_scorm: add unit tests for drag/drop 2017-12-12 15:15:09 +08:00
Simey Lameze f808e0432a MDL-60061 mod_scorm: add support for drag/drop events
AMOS BEGIN
	CPY [openafterclose,mod_choice],[openafterclose,mod_scorm]
AMOS END
2017-12-12 15:15:09 +08:00
Jun Pataleta 4ea790da9b Merge branch 'MDL-60759_master' of git://github.com/dmonllao/moodle 2017-12-12 20:14:03 +13:00
Jun Pataleta 29c4106e2f Merge branch 'MDL-58200-master' of git://github.com/damyon/moodle 2017-12-12 19:13:32 +13:00
Jun Pataleta 24131d08c0 Merge branch 'MDL-59970-master' of git://github.com/damyon/moodle 2017-12-12 18:52:49 +13:00
Andrew Nicols 6d326b17d8 Merge branch 'MDL-59866' of https://github.com/marcusboon/moodle 2017-12-12 13:46:07 +08:00
Andrew Nicols 2f920d9be8 Merge branch 'wip-MDL-56864-master' of git://github.com/marinaglancy/moodle 2017-12-12 13:36:32 +08:00
Damyon Wiese 8cdfa8692b Merge branch 'MDL-59438-master' of git://github.com/rezaies/moodle 2017-12-12 13:05:22 +08:00
Damyon Wiese a34a305d53 Merge branch 'MDL-44660-master' of https://github.com/lucaboesch/moodle 2017-12-12 12:49:46 +08:00
Marcus Boon f8e2383bdd MDL-59866 session: Add retry for redis sessions
There is an edge case whereby redis will fail
to accept connections on the first try but
retrying the connection seems to make it work

Included in this commit:
* Retry functionality in the session init
2017-12-12 14:42:04 +10:00
Damyon Wiese a576da555e Merge branch 'MDL-60861-master' of git://github.com/ankitagarwal/moodle 2017-12-12 12:38:11 +08:00
Tyler Bannister e53a38c666 MDL-60653 Navigation: Fixed loose string comparison.
The previous comparison would sometimes evaluate to true when the
navigation key was not a string.
2017-12-12 12:32:27 +08:00
Damyon Wiese 233c91e7d0 Merge branch 'master_MDL-60979' of https://github.com/danmarsden/moodle 2017-12-12 12:27:12 +08:00
Damyon Wiese 59be445c15 Merge branch 'MDL-58058-master' of git://github.com/lameze/moodle 2017-12-12 11:59:50 +08:00
Damyon Wiese 302104af4b Merge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle 2017-12-12 11:39:20 +08:00
Damyon Wiese 80b6f3b059 Merge branch 'MDL-60945' of https://github.com/NeillM/moodle 2017-12-12 11:31:16 +08:00
Jun Pataleta 9244faa3a4 Merge branch 'MDL-59766-master' of git://github.com/damyon/moodle 2017-12-12 16:26:34 +13:00
Damyon Wiese 6b58bb56cb Merge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle 2017-12-12 11:15:03 +08:00