Commit Graph

89847 Commits

Author SHA1 Message Date
Stephen Bourget 455835809d MDL-55715 calendar: Only update events from the current subscription
The iCal import should only update calendar events from the current
subscription not any subscription that contains the same event.
2016-12-13 21:36:08 -05:00
Andrew Nicols 374d7af2eb Merge branch 'wip-mdl-57380' of https://github.com/rajeshtaneja/moodle 2016-12-14 09:55:34 +08:00
Rajesh Taneja b3a2a33f07 MDL-57380 behat: Check for list tags and text
after list tag span can be added on few browsers
like chrome 51.0, so test if text starts with
list tag and contains text
2016-12-14 09:37:35 +08:00
Andrew Nicols 428e18ed2b Merge branch 'MDL-55062_master' of git://github.com/markn86/moodle 2016-12-14 09:26:10 +08:00
Stephen Bourget 71cfa70a0e MDL-55568 chat: chat_refresh_events should only create published events 2016-12-13 18:52:33 -05:00
Eloy Lafuente (stronk7) 6296803878 Merge branch 'MDL-55809-master' of https://github.com/xow/moodle 2016-12-13 20:05:15 +01:00
Dan Poltawski a7471c40b4 Merge branch 'MDL-57125-master' of git://github.com/lameze/moodle 2016-12-13 16:34:52 +00:00
Dan Poltawski ae2bf1626c Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle 2016-12-13 14:55:50 +00:00
Eloy Lafuente (stronk7) ab73c1ddbb Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle 2016-12-13 12:00:46 +01:00
Henning Bostelmann a2a1a58683 MDL-55575 mod_glossary: Allow viewing all entries on one page 2016-12-13 11:43:29 +01:00
Eloy Lafuente (stronk7) bd31523a30 Merge branch 'MDL-55720' of https://github.com/ak4t0sh/moodle 2016-12-13 11:41:35 +01:00
Dan Poltawski 2956ca50fa Merge branch 'MDL-57250_master' of git://github.com/markn86/moodle 2016-12-13 10:25:07 +00:00
Dan Poltawski ba78bd4f56 Merge branch 'MDL-56859-master' of https://github.com/snake/moodle 2016-12-13 09:45:15 +00:00
Dan Poltawski 92e20a1fa5 Merge branch 'MDL-57074-master' of https://github.com/snake/moodle 2016-12-13 09:26:10 +00:00
Dan Poltawski 8791d254af Merge branch 'wip-MDL-57216-master' of git://github.com/abgreeve/moodle 2016-12-13 09:04:04 +00:00
Dan Poltawski b7f0ab491c Merge branch 'MDL-57182-master' of https://github.com/snake/moodle 2016-12-13 08:47:33 +00:00
Dan Poltawski 0183338c38 Merge branch 'wip-MDL-57257-master' of git://github.com/abgreeve/moodle 2016-12-13 08:45:50 +00:00
Marina Glancy ba9a471d59 MDL-56912 feedback: empty multichoice questions do not submit 2016-12-13 15:00:41 +08:00
Andrew Nicols 01c7c3d8fb Merge branch 'MDL-57213-master-2' of git://github.com/junpataleta/moodle 2016-12-13 13:06:18 +08:00
Mark Nelson f85800f305 MDL-55062 tool_uploaduser: prevent defaults when not selected 2016-12-13 12:34:42 +08:00
Jun Pataleta 8aedc03754 MDL-57213 navigation: Load all my course categories into navigation tree
* Load all of the relevant course categories of the courses that a user
  is enrolled in.
2016-12-13 11:42:11 +08:00
Andrew Nicols 08f96ac9d7 Merge branch 'MDL-57056_master' of https://github.com/nadavkav/moodle 2016-12-13 10:37:38 +08:00
Jan Dageförde 76a83260c5 MDL-57257 lesson: Validate type of numerical answer 2016-12-13 10:32:49 +08:00
Andrew Nicols 106c8026d1 Merge branch 'MDL-57222_master' of git://github.com/markn86/moodle 2016-12-13 10:25:30 +08:00
Eloy Lafuente (stronk7) d8e57b7d7a Merge branch 'wip-mdl-57328' of https://github.com/rajeshtaneja/moodle 2016-12-13 02:29:58 +01:00
Eloy Lafuente (stronk7) 7c0313e414 Merge branch 'master_MDL-57324' of git://github.com/danmarsden/moodle 2016-12-13 02:01:56 +01:00
Jake Dallimore fa30dd8c6e MDL-57182 navigation: fix login failures display in page footer.
A bug introduced with MDL-45893 meant that the failure count was being
reset, causing the footer code to be skipped. This patch fixes that
bug and adds behat tests covering the displayloginfailures feature.
2016-12-13 07:19:58 +08:00
Eloy Lafuente (stronk7) 00759c909c Merge branch 'MDL-57319-master' of git://github.com/danpoltawski/moodle 2016-12-12 16:23:14 +01:00
Dan Poltawski e36d9b3ead Merge branch 'MDL-56525' of https://github.com/ak4t0sh/moodle 2016-12-12 14:08:34 +00:00
Matt Davidson 6be2b79b9c MDL-56810 unoconv: task fails if user removed
If the user is removed from a course after a submission has been made,
the task will crash and never continue.  This removes submissions from
the cron task if the user isn't enrolled in the course.
2016-12-12 08:22:51 -05:00
Dan Poltawski 6d23f14a94 Merge branch 'MDL-55782-master-test' of git://github.com/ryanwyllie/moodle 2016-12-12 13:17:48 +00:00
Dan Poltawski 5304258829 Merge branch 'wip-mdl-52796' of https://github.com/rajeshtaneja/moodle 2016-12-12 13:00:51 +00:00
Dan Poltawski 5eeb5e89a9 Merge branch 'MDL-57198' of git://github.com/phager-at/moodle 2016-12-12 12:46:39 +00:00
Dan Poltawski 394fd5f92e Merge branch 'wip-MDL-57299-master' of git://github.com/abgreeve/moodle 2016-12-12 12:39:52 +00:00
Dan Poltawski 4d8c059cfa Merge branch 'wip-mdl-57325' of https://github.com/rajeshtaneja/moodle 2016-12-12 12:23:22 +00:00
Dan Poltawski daab2b520f Merge branch 'wip-mdl-57314' of https://github.com/rajeshtaneja/moodle 2016-12-12 12:21:31 +00:00
Dan Poltawski 1483c172ed Merge branch 'wip-mdl-57343' of https://github.com/rajeshtaneja/moodle 2016-12-12 12:21:09 +00:00
Dan Poltawski 1b846b8ed6 Merge branch 'MDL-57171-master-2' of git://github.com/junpataleta/moodle 2016-12-12 10:31:16 +00:00
Dan Poltawski 444017ca7e Merge branch 'MDL-56566' of https://github.com/bostelm/moodle 2016-12-12 09:20:05 +00:00
Dan Poltawski dc81fdeb3e Merge branch 'MDL-55906-grading-table-filters-not-reset-master' of https://github.com/ilya-catalyst/moodle 2016-12-12 09:06:38 +00:00
Andrew Nicols c8c3df53bb Merge branch 'MDL-46714-master-nadav' of git://github.com/FMCorz/moodle 2016-12-12 12:51:19 +08:00
Nadav Kavalerchik bb13339a2e MDL-46714 Calendar: Properly order Date & Time fields in RTL mode 2016-12-12 12:38:04 +08:00
Mark Nelson 3b5b35a326 MDL-57222 mod_assign: show validation message on visible element 2016-12-12 11:55:18 +08:00
Simey Lameze 1f8d39893f MDL-57125 comment: prevent js execution if there are no comments 2016-12-12 11:34:42 +08:00
Rajesh Taneja 7c1116dbbb MDL-57343 behat: Ensure we wait enough for page to be fully loaded 2016-12-12 10:37:59 +08:00
Ramindu Deshapriya f1a5cb1fde MDL-52796 behat: Behat feature to test reset wiki page, tags & comments 2016-12-12 10:26:59 +08:00
Rajesh Taneja ac6cacdfb1 MDL-57344 behat: Update master to use 3.33.0 behat extension tag 2016-12-12 09:23:33 +08:00
Bram Tassyns ddedf10e98 MDL-56859 SCORM: player shouldn't display TOC while loading 2016-12-12 09:09:31 +08:00
Jake Dallimore c5b70d12f9 MDL-57074 Filepicker: Fix alias and link icons in RTL mode
Fixed alignment of the images in RTL mode. Also fixed a z-index problem
in which the icons were displayed above the open drawer on narrow
screens.
2016-12-12 08:24:16 +08:00
AMOS bot 8c83affb21 Automatically generated installer lang files 2016-12-10 00:03:49 +08:00