87136 Commits

Author SHA1 Message Date
David Monllao
d6170fe7f8 Merge branch 'MDL-60436' of https://github.com/NeillM/moodle 2017-11-20 13:26:01 +01:00
David Monllao
007dd71c17 Merge branch 'MDL-56253-master' of https://github.com/lucaboesch/moodle 2017-11-20 12:55:28 +01:00
David Monllao
c39071d32a Merge branch 'MDL-60823-master' of git://github.com/lameze/moodle 2017-11-20 12:06:42 +01:00
Jake Dallimore
4a9268b6e7 Merge branch 'MDL-60708-master' of git://github.com/jleyva/moodle 2017-11-20 17:54:56 +08:00
David Monllao
087b3303a5 Merge branch 'MDL-60842-master' of git://github.com/lameze/moodle 2017-11-20 10:27:58 +01:00
Juan Leyva
d995cd47fb MDL-60708 mod_workshop: Return author feedback for submission
The feedback and grade information for submission should be returned
for teachers in the evaluation and closed phases.
2017-11-20 10:07:57 +01:00
Simey Lameze
2dc93a3769 MDL-60842 calendar: do not load all course fields 2017-11-20 16:49:45 +08:00
Jun Pataleta
3e6dabadaa Merge branch 'MDL-60187_master' of git://github.com/markn86/moodle 2017-11-20 21:33:00 +13:00
Damyon Wiese
1d59696017 Merge branch 'MDL-60810_master' of git://github.com/markn86/moodle 2017-11-20 15:57:00 +08:00
Damyon Wiese
f1c9b8de47 Merge branch 'MDL-60809-master' of git://git.cameron1729.xyz/moodle 2017-11-20 15:29:53 +08:00
Damyon Wiese
e590227922 Merge branch 'MDL-60806-master' of git://github.com/lameze/moodle 2017-11-20 15:23:42 +08:00
Jakob Ackermann
4d5a33e424 MDL-60187 mod_lti: Do not create a grade item when grades are disabled.
If the privacy option "Accept grades from the tool" is disabled, the
module should not appear in the gradebook when edited inline or when
recover grades is running during enrolment.
2017-11-20 15:13:24 +08:00
Jake Dallimore
8ee2d9c3d4 Merge branch 'MDL-60824-master-profilefield' of git://github.com/mudrd8mz/moodle 2017-11-20 15:04:08 +08:00
Luca Bösch
c6c480f786 MDL-56253 grade: have coursemodule name pass filters. 2017-11-20 06:32:11 +01:00
Damyon Wiese
18c02e9f28 Merge branch 'MDL-27886-master' of git://github.com/tobiasreischmann/moodle 2017-11-20 13:25:37 +08:00
Simey Lameze
5e8e87aaee MDL-60806 core_calendar: return hidden categories 2017-11-20 12:06:47 +08:00
Jake Dallimore
268e772a8a Merge branch 'MDL-60835-master' of git://github.com/crazyserver/moodle 2017-11-20 11:27:46 +08:00
Jun Pataleta
4768fa336a Merge branch 'master_MDL-60253' of https://github.com/CengageEng/moodle 2017-11-20 13:21:30 +13:00
Jun Pataleta
1508fa23d2 Merge branch 'MDL-55808_master' of git://github.com/juancs/moodle 2017-11-20 10:34:55 +13:00
Neill Magill
7251472c83 MDL-60436 blocks: Unit test for dashboard block positioning 2017-11-17 14:40:30 +00:00
Neill Magill
667e6ebc20 MDL-60436 blocks: Improve performance of block loading 2017-11-17 14:40:01 +00:00
Damyon Wiese
5f8407d5da Merge branch 'MDL-60773-master' of https://github.com/snake/moodle 2017-11-17 14:11:12 +08:00
Andrew Nicols
78162bf5cf MDL-60773 core: Add pendingJS checks for autocomplete interactions 2017-11-17 13:52:04 +08:00
Simey Lameze
1a765e32b0 MDL-60823 calendar: use first day of week on prepadding calc 2017-11-17 11:02:39 +08:00
David Mudrák
88f4b6c75d MDL-60824 profile: Fix handling of to-be-created user id
The script user/editadvanced.php uses special value of userid = -1 for
the case when a new user is being created. Such a value passes the
non-empty check and would lead to "invaliduser" error.
2017-11-16 22:14:16 +01:00
Pau Ferrer Ocaña
15ead7a176 MDL-60835 completion: Add overrideby field to completion status WS 2017-11-16 16:35:43 +01:00
Cameron Ball
d3e980c4ea
MDL-60809 xmlrpc: Include filelib when making xmlrpc call 2017-11-16 14:46:36 +08:00
Jake Dallimore
4275ea4a43 weekly on-sync release 3.5dev 2017-11-16 11:13:29 +08:00
Jake Dallimore
e767ba20fc Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-11-16 11:13:28 +08:00
David Monllao
9304ba2212 Merge branch 'MDL-60789-master' of git://github.com/sarjona/moodle 2017-11-15 10:35:30 +01:00
Damyon Wiese
a571aa9b85 Merge branch 'wip-MDL-59876-master' of git://github.com/abgreeve/moodle 2017-11-15 10:35:30 +01:00
Mark Nelson
2ce6578835 MDL-60810 auth_db: removed rubbish content in string 2017-11-15 15:00:35 +08:00
Adrian Greeve
2c97abeff2 MDL-59876 core_user: Add required library for function.
The external service create_users has a function call to
useredit_update_user_preference() that requires editlib.php
2017-11-15 11:43:19 +08:00
AMOS bot
231127ce6c Automatically generated installer lang files 2017-11-15 00:05:16 +00:00
Damyon Wiese
aece25138f Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle 2017-11-14 16:40:59 +08:00
Mihail Geshoski
3420d30762 MDL-60675 analytics: Apply strict comparison check 2017-11-14 16:22:36 +08:00
Sara Arjona
3dbb8dc598 MDL-60789 workshop: Check title submission maxlength 2017-11-14 08:52:31 +01:00
Jake Dallimore
55b2742724 Merge branch 'MDL-60741' of git://github.com/timhunt/moodle 2017-11-14 15:28:06 +08:00
Jun Pataleta
592c216520 Merge branch 'm34_MDL-59099_MySQL8_InnoDB_Params_Removed' of https://github.com/scara/moodle 2017-11-14 12:22:29 +13:00
Damyon Wiese
294f1dbaa3 Merge branch 'MDL-60693-backup-multilang-activities' of https://github.com/lucaboesch/moodle 2017-11-13 14:33:57 +08:00
Damyon Wiese
fee3033bc7 Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle 2017-11-13 14:11:50 +08:00
Jake Dallimore
e105a752c0 Merge branch 'MDL-60707' of git://github.com/aolley/moodle 2017-11-13 13:26:00 +08:00
Jake Dallimore
dbc56205b3 Merge branch 'MDL-60783' of git://github.com/stronk7/moodle 2017-11-13 11:26:30 +08:00
Damyon Wiese
dbf0819d92 Merge branch 'MDL-59876-master' of git://github.com/jleyva/moodle 2017-11-13 10:47:49 +08:00
Damyon Wiese
3ac10fa82a Merge branch 'MDL-60784' of git://github.com/stronk7/moodle 2017-11-13 10:37:37 +08:00
Eloy Lafuente (stronk7)
6499085f36 MDL-60784 upgrade: add 3.4.0 separation line to all upgrade scripts 2017-11-12 18:43:30 +01:00
Eloy Lafuente (stronk7)
bd8a809598 MDL-60783 backup: Bump release to 3.5 2017-11-12 17:56:17 +01:00
Luca Bösch
9ae6cd775a MDL-60693 backup: Use multilang with course activities
On backup and restore, activities are shown after passing format_string,
supporting multilang.
2017-11-12 14:58:18 +01:00
Eloy Lafuente (stronk7)
0164f50e80 weekly back-to-dev release 3.5dev 2017-11-11 19:41:57 +01:00
Eloy Lafuente (stronk7)
6821ca92ad NOBUG: Change travis.yml back to master 2017-11-11 19:31:19 +01:00