86767 Commits

Author SHA1 Message Date
Jake Dallimore
6e186498fd Merge branch 'MDL-59686-master' of git://github.com/lameze/moodle 2017-10-26 10:16:21 +08:00
Simey Lameze
3c2b703e00 MDL-59686 form: fix autosave support for editor field 2017-10-26 09:03:31 +08:00
Jun Pataleta
75909e3c92 Merge branch 'MDL-59938-master' of git://github.com/andrewnicols/moodle 2017-10-26 11:22:30 +13:00
Jun Pataleta
2a1f7a4442 Merge branch 'MDL-60571-manualgrading-savegotonextpage-styled' of https://github.com/lucaboesch/moodle 2017-10-26 10:02:27 +13:00
David Monllao
7851132177 Merge branch 'MDL-60516-master' of git://github.com/andrewnicols/moodle 2017-10-25 15:16:21 +02:00
David Monllao
4f7a80341e Merge branch 'MDL-59942-master' of git://github.com/andrewnicols/moodle 2017-10-25 15:14:54 +02:00
David Monllao
3b4e9a9fc8 Merge branch 'wip_MDL-60250_master' of git://github.com/gjb2048/moodle 2017-10-25 15:12:23 +02:00
David Monllao
507335e2de Merge branch 'MDL-60538-master' of https://github.com/mihailges/moodle 2017-10-25 15:08:49 +02:00
David Monllao
5b93dc8539 Merge branch 'MDL-60560-master' of git://github.com/andrewnicols/moodle 2017-10-25 15:06:49 +02:00
David Monllao
d12e409784 Moodle release 3.4beta v3.4.0-beta 2017-10-25 11:14:22 +02:00
David Monllao
b34460c669 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-10-25 11:14:20 +02:00
Andrew Nicols
2600f32927 Merge branch 'MDL-60506-master-fix1' of git://github.com/lameze/moodle 2017-10-25 12:45:56 +08:00
Andrew Nicols
8ef00034f5 Merge branch 'MDL-36580' of https://github.com/stronk7/moodle 2017-10-25 12:45:55 +08:00
Jake Dallimore
19fa690c3f MDL-60429 calendar: fix for updating event course and group
The property courseid and groupid might not be set, so if updating,
use the existing value if a new value wasn't specified.
2017-10-25 12:45:54 +08:00
Jake Dallimore
e3a247849b Merge branch 'MDL-60561-master' of git://github.com/andrewnicols/moodle 2017-10-25 12:45:53 +08:00
Jake Dallimore
c00e73dfe0 Merge branch 'MDL-60545_master' of git://github.com/markn86/moodle 2017-10-25 12:45:52 +08:00
Jake Dallimore
bbb9e17133 Merge branch 'MDL-60429-master' of git://github.com/lameze/moodle 2017-10-25 12:45:52 +08:00
Andrew Nicols
6ee00de11b Merge branch 'MDL-36580' of https://github.com/stronk7/moodle 2017-10-25 12:45:51 +08:00
Mihail Geshoski
994ccb7845 MDL-60538 lesson: check if max attempts exceeded, use new lang string 2017-10-25 09:00:20 +08:00
Eloy Lafuente (stronk7)
984470d8a1 MDL-36580 backup: Avoid PHP notice restoring old backups
Before this implementation, both resourcekey and password
were not being included in the backups, so old backups are
missing them. To keep upwards compatibility and avoid a PHP
Notice (undefined property), existence is checked via isset(),
that is the usual way all over the restore process.
2017-10-24 22:49:10 +02:00
AMOS bot
809babbbd4 Automatically generated installer lang files 2017-10-25 00:05:34 +08:00
Luca Bösch
1003e7e57e MDL-60571 quiz: Manual grading Save and go to next page button styled 2017-10-24 12:11:51 +01:00
Andrew Nicols
acd146fe7c MDL-59938 calendar: Only show repeat information if repeating event 2017-10-24 16:00:36 +08:00
Andrew Nicols
79dff18711 MDL-59942 calendar: Add missing attribute to narrow day link 2017-10-24 15:35:31 +08:00
Simey Lameze
6428642adb MDL-60429 calendar: update group and course id for repeated events 2017-10-24 13:46:40 +08:00
Andrew Nicols
349d379616 MDL-60561 calendar: Increase event limit for calendar
It's quite common to have more than 50 events in a calendar month, but
we do not want to change the default value when the API is called in
other ways.
2017-10-24 13:31:05 +08:00
Simey Lameze
7a963e924c MDL-60506 enrol: remove unwanted hidden elements 2017-10-24 13:18:58 +08:00
Mark Nelson
05ce018002 MDL-60545 core_calendar: ensure 'All courses' shows accurate data 2017-10-24 13:17:14 +08:00
Andrew Nicols
80e4426aeb MDL-60516 calendar: Update mini calendar on course change 2017-10-24 10:43:01 +08:00
Andrew Nicols
9eced5050b MDL-60560 calendar: Correct type of JS event on update 2017-10-24 09:45:27 +08:00
Andrew Nicols
2a31e628f1 MDL-57477 session: Comment tidyup 2017-10-24 08:12:02 +08:00
Andrew Nicols
79d3a1bc1e Merge branch 'MDL-57477' of https://github.com/appalachianstate/moodle 2017-10-24 08:04:54 +08:00
Fred Woolard
bd035b98fd MDL-57477 core: If memcached 3.x mimic 2.2.0 lock acquisition behavior 2017-10-23 13:45:47 -04:00
David Monllao
bd3824519b Merge branch 'MDL-60422_master' of git://github.com/markn86/moodle 2017-10-23 17:42:06 +02:00
David Monllao
fc4e7883fb Merge branch 'MDL-60527-action-menu-links-missing-spaces-attributes' of https://github.com/lucaboesch/moodle 2017-10-23 16:55:35 +02:00
Andrew Nicols
4c250a5b79 MDL-60489 javascript: Add missing promise fails 2017-10-23 20:26:57 +08:00
Andrew Nicols
44317628a7 Merge branch 'MDL-60489-master' of git://github.com/ryanwyllie/moodle 2017-10-23 20:07:33 +08:00
Gareth J Barnard
6d5f9d1218 MDL-60250 theme_bootstrapbase: Calendar popover misplaced in RTL langs. 2017-10-23 11:15:25 +01:00
Eloy Lafuente (stronk7)
47d9736445 Merge branch 'm34_MDL-59100_MySQL8_INFORMATION_SCHEMAs_Need_Lowercasing' of https://github.com/scara/moodle 2017-10-23 12:10:25 +02:00
Mark Nelson
72c4cacfa3 MDL-60422 core_calendar: do not lose track of the selected course 2017-10-23 17:18:28 +08:00
Ryan Wyllie
946f9d0a4e MDL-60489 javascript: add animations to modal setBody 2017-10-23 07:57:03 +00:00
Jake Dallimore
ab94608ffb Merge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle 2017-10-23 14:28:51 +08:00
Andrew Nicols
2f5284f5fb Merge branch 'MDL-60506-master' of git://github.com/lameze/moodle 2017-10-23 13:37:09 +08:00
Jake Dallimore
141c4adbb6 Merge branch 'MDL-42834_master' of git://github.com/markn86/moodle 2017-10-23 13:25:35 +08:00
Damyon Wiese
032bda879c Merge branch 'MDL-52653-master' of http://github.com/damyon/moodle 2017-10-23 13:14:03 +08:00
Simey Lameze
92109e732d MDL-60506 enrol: use optional_param_array to handle cohorts array 2017-10-23 12:54:09 +08:00
Simey Lameze
b5a1ef52e0 MDL-60506 enrol: use optional_param_array to handle users array 2017-10-23 12:48:11 +08:00
John Okely
7eb50b3290 MDL-42834 admin: Remove wwwroot if used with moodle_url 2017-10-23 12:25:36 +08:00
John Okely
672f483670 MDL-42834 admin: Removal of httpswwwroot 2017-10-23 12:25:36 +08:00
John Okely
cd1eb7ce9c MDL-42834 admin: Upgrade script and warning for loginhttps sites 2017-10-23 12:25:36 +08:00