Commit graph

91972 commits

Author SHA1 Message Date
Jun Pataleta
f8b5fcd304 Merge branch 'MDL-64274-master' of git://github.com/ryanwyllie/moodle 2018-12-05 14:56:21 +08:00
Ryan Wyllie
a2bce0d0d8 MDL-64274 message: deleteMessages in message_repository return promise 2018-12-05 14:43:21 +08:00
Jake Dallimore
ccf5f09103 Merge branch 'MDL-64198-master' of https://github.com/lucaboesch/moodle 2018-12-05 14:30:16 +08:00
Roger Barras
fcebc9b042 MDL-60267 user: Fix set default data for the user profile field 2018-12-05 14:15:48 +08:00
Marina Glancy
4bfcadbaa1 MDL-64324 core_form: randomly generate id attribute on forms
otherwise there are id collisions in forms loaded in AJAX requests
2018-12-04 18:42:05 +01:00
Eloy Lafuente (stronk7)
cb7f6a6f99 weekly on-sync release 3.7dev
Amended to keep it on-sync with 3.6.1 emergency release
2018-12-04 17:46:09 +01:00
Luca Bösch
c21b42e76a MDL-64198 course: set formatted modulename for togglecompletion js. 2018-12-04 14:35:06 +01:00
Michael Aherne
11361acfb5 MDL-64216 privacy: Split query to use indexes. 2018-12-04 13:01:07 +00:00
Eloy Lafuente (stronk7)
0465a942c3 weekly on-sync release 3.7dev 2018-12-04 13:06:15 +01:00
Jake Dallimore
8108bc0b5e Merge branch 'MDL-63223-master' of git://github.com/bmbrands/moodle 2018-12-04 12:06:13 +08:00
Jun Pataleta
a939ad80ba Merge branch 'MDL-64307_master' of git://github.com/markn86/moodle 2018-12-04 12:03:39 +08:00
Mark Nelson
7c8ba89d5e MDL-64307 core_message: do not include disabled conversations in count 2018-12-04 11:48:16 +08:00
Mark Nelson
7bb22a298c MDL-64307 core: set all individual conversations to enabled 2018-12-04 11:45:47 +08:00
Jun Pataleta
6b3931e783 Merge branch 'MDL-64206_master' of git://github.com/markn86/moodle 2018-12-04 10:53:03 +08:00
Damyon Wiese
41c8df2583 Merge branch 'MDL-64286' of https://github.com/timhunt/moodle 2018-12-03 15:46:40 +08:00
Damyon Wiese
e67feef907 Merge branch 'MDL-64155-master' of git://github.com/vmdef/moodle 2018-12-03 15:26:08 +08:00
Jake Dallimore
9f79c2dbd6 Merge branch 'MDL-63459' of https://github.com/timhunt/moodle 2018-12-03 14:21:31 +08:00
Mark Nelson
4b0cf053dc MDL-64206 core: updated FB logo URL 2018-12-03 12:20:51 +08:00
Andrew Nicols
0178ee5594 Merge branch 'MDL-64300' of git://github.com/stronk7/moodle 2018-12-03 08:28:06 +08:00
Andrew Nicols
feee85a6c1 Merge branch 'MDL-64299' of git://github.com/stronk7/moodle 2018-12-03 07:53:38 +08:00
Eloy Lafuente (stronk7)
f47c8f3525 MDL-64300 upgrade: add 3.6.0 separation line to all upgrade scripts 2018-12-02 18:36:40 +01:00
Eloy Lafuente (stronk7)
5471eb1758 MDL-64299 backup: Bump release to 3.7 2018-12-02 18:21:52 +01:00
Eloy Lafuente (stronk7)
2cea0bd6c6 weekly back-to-dev release 3.7dev 2018-12-02 00:25:11 +01:00
Eloy Lafuente (stronk7)
2c608daca7 NOBUG: Change travis.yml back to master 2018-12-02 00:18:46 +01:00
Eloy Lafuente (stronk7)
cb628a9a08 Moodle release 3.6 2018-12-02 00:18:46 +01:00
Eloy Lafuente (stronk7)
0cbcd08946 NOBUG: Change travis.yml to MOODLE_36_STABLE 2018-12-02 00:18:45 +01:00
Eloy Lafuente (stronk7)
5ff115743c Moodle release 3.6rc3 2018-11-30 18:02:17 +01:00
Eloy Lafuente (stronk7)
ea8c34da48 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-11-30 18:02:15 +01:00
Tim Hunt
a3796190a6 MDL-64286 qtype_gapselect: removed unneeded line of code
The extended Behat test show the qtype works fine without it.
2018-11-30 12:33:54 +00:00
David Monllao
823fc75421 Merge branch 'MDL-64282' of git://github.com/stronk7/moodle 2018-11-30 13:02:47 +01:00
Jun Pataleta
b5e4b37aae Merge branch 'MDL-64000-master' of git://github.com/andrewnicols/moodle 2018-11-30 16:13:38 +08:00
Andrew Nicols
84dad5bffa MDL-64000 usertours: Add final step to new tours
AMOS BEGIN
  CPY [tour_2_title_end,tool_usertours],[tour_final_step_title,tool_usertours]
AMOS END
2018-11-30 16:04:33 +08:00
Jun Pataleta
9101a01fb8 Merge branch 'MDL-64000-master' of git://github.com/andrewnicols/moodle 2018-11-30 13:46:09 +08:00
Elizabeth Dalton
fbb219617b MDL-64000 usertours: Add tours for key 3.6 features
Tours originally written by Elizabeth Dalton, Mangled a little by Andrew
Nicols and Sander Bangma, and language tweaks by Helen Foster.

AMOS BEGIN
 CPY [pluginname,block_recentlyaccessedcourses],[tour3_title_recentcourses,tool_usertours]
 CPY [pluginname,block_myoverview],[tour3_title_overview,tool_usertours]
 CPY [groupmessages,core_message],[tour4_title_groupconvo,tool_usertours]
 CPY [favourites,moodle,core_message],[tour4_title_starred,tool_usertours]
AMOS END

Co-authored-by: Andrew Nicols <andrew@nicols.co.uk>
Co-authored-by: Sander Bangma <sander@moodle.com>
Co-authored-by: Helen Foster <helen@moodle.org>
2018-11-30 13:23:53 +08:00
Jun Pataleta
dad4bcf90c Merge branch 'MDL-64214-master' of git://github.com/junpataleta/moodle 2018-11-30 09:53:34 +08:00
Damyon Wiese
afd5c94dbf MDL-64283 competency: Correct numbering in tests 2018-11-30 09:30:50 +08:00
Jun Pataleta
85354cb79e MDL-64214 calendar: Populate the groups select box on page load 2018-11-30 09:25:42 +08:00
AMOS bot
74afdef07d Automatically generated installer lang files 2018-11-30 00:07:31 +00:00
Eloy Lafuente (stronk7)
bcd85def5c MDL-64282 versions: main version bump 2018-11-29 18:28:33 +01:00
Eloy Lafuente (stronk7)
085353b315 MDL-64282 versions: bump all versions and requires near release
version = 2018120300 release version
requires= 2018112800 current rc2 (week7roll1) version
2018-11-29 18:24:08 +01:00
Víctor Déniz Falcón
0eac5cf446 MDL-64155 block_recentlyaccessedcourses: considering enrolment status 2018-11-29 15:37:17 +00:00
Victor Deniz
fdf2abf871 MDL-64155 core: get_recent_courses considers enrolment status 2018-11-29 15:37:17 +00:00
Víctor Déniz Falcón
87173da483 MDL-64155 core: use favourite API to generate SQL 2018-11-29 15:37:17 +00:00
Jun Pataleta
98fada12c4 Merge branch 'MDL-64228-master' of git://github.com/jleyva/moodle 2018-11-29 20:51:52 +08:00
Damyon Wiese
1a368ec351 Merge branch 'MDL-64264_master' of git://github.com/markn86/moodle 2018-11-29 14:46:55 +08:00
Jun Pataleta
d71865419b Merge branch 'MDL-64227-master' of git://github.com/damyon/moodle 2018-11-29 14:07:26 +08:00
Simey Lameze
9cf58f070d MDL-64214 calendar: fix failing unit tests 2018-11-29 13:59:36 +08:00
Simey Lameze
b13fe83adb MDL-64214 core_calendar: fix event types form element handling 2018-11-29 13:59:32 +08:00
Mark Nelson
44b92ecdfc MDL-64264 core_message: use non-deprecated WS for deletion
Also fixed typo in function name.
2018-11-29 12:41:57 +08:00
Damyon Wiese
dda38f91ab Merge branch 'MDL-64245-master-fix-1' of git://github.com/ryanwyllie/moodle 2018-11-29 11:04:38 +08:00