Eloy Lafuente (stronk7)
08986e0c42
Merge branch 'MDL-59685-master' of git://github.com/damyon/moodle
2017-08-30 00:36:07 +02:00
Connor Sheremeta
d50c3db5c7
MDL-54540 lti: Add allowfullscreen attribute to LTI IFrames
2017-08-29 13:31:18 -06:00
Eloy Lafuente (stronk7)
a4cdbff86c
MDL-59713 forms: prevent php warning when 'optional' option is missing
2017-08-29 20:12:41 +02:00
David Monllao
10658a1cb4
MDL-59279 analytics: Include more info about the dataset
2017-08-29 16:26:41 +02:00
Dan Poltawski
e517eb100c
Merge branch 'MDL-59951-master' of git://github.com/damyon/moodle
2017-08-29 14:32:43 +01:00
Dan Poltawski
08220d64f6
Merge branch 'MDL-59195_assign_comment_permissions' of git://github.com/davosmith/moodle
2017-08-29 11:54:07 +01:00
Dan Poltawski
253ea6621a
Merge branch 'MDL-59615-master' of git://github.com/damyon/moodle
2017-08-29 10:58:42 +01:00
Jun Pataleta
7f56c2679d
Merge branch 'MDL-59908-master' of git://github.com/ankitagarwal/moodle
2017-08-29 17:41:39 +08:00
Dan Poltawski
4e597bf219
Merge branch 'MDL-59688-master' of git://github.com/damyon/moodle
2017-08-29 10:24:50 +01:00
Jun Pataleta
faf83f3d41
Merge branch 'MDL-59830_master-v2' of git://github.com/markn86/moodle
2017-08-29 17:23:44 +08:00
Mark Nelson
1329ffd7b7
MDL-59830 core_user: do not show roles that can not be deleted
2017-08-29 17:12:26 +08:00
Mark Nelson
5700ad902a
MDL-59801 core_user: add missing class variable declaration
...
Also minor fix to PHPDocs.
2017-08-29 16:28:56 +08:00
Andrew Nicols
350ef63246
Merge branch 'MDL-56646-master' of https://github.com/xow/moodle
2017-08-29 15:51:01 +08:00
Jun Pataleta
b26ce53776
Merge branch 'MDL-59823-master' of git://github.com/damyon/moodle
2017-08-29 15:49:24 +08:00
Andrew Nicols
08bcea48d4
Merge branch 'MDL-59713-master-2' of git://github.com/ryanwyllie/moodle
2017-08-29 15:28:45 +08:00
Andrew Nicols
506708f196
Merge branch 'MDL-59820-master' of git://github.com/lameze/moodle
2017-08-29 15:26:46 +08:00
Jun Pataleta
b83a329ad6
Merge branch 'MDL-59822-master' of git://github.com/damyon/moodle
2017-08-29 15:25:33 +08:00
John Okely
465b75ed1f
MDL-56646 assign: Fix negative grades in restore
2017-08-29 07:23:01 +00:00
John Okely
7323c473cc
MDL-56646 assign: Add ability to fix errant grades
2017-08-29 07:23:01 +00:00
Andrew Nicols
6d2ff19051
Merge branch 'MDL-59827-master-fix1' of http://github.com/damyon/moodle
2017-08-29 15:14:20 +08:00
Damyon Wiese
b0b6ff3c18
MDL-59827 users: Typo in force_open()
...
force_open() not forceopen()
2017-08-29 15:06:43 +08:00
Andrew Nicols
27e827e181
Merge branch 'MDL-59821-master' of git://github.com/damyon/moodle
2017-08-29 14:54:33 +08:00
Jun Pataleta
33b46e54bb
Merge branch 'MDL-59885-master' of git://github.com/cameron1729/moodle
2017-08-29 14:48:04 +08:00
Andrew Nicols
3bb2900cf7
Merge branch 'MDL-59030_master' of git://github.com/dmonllao/moodle
2017-08-29 14:34:59 +08:00
David Monllao
f07d93de9d
MDL-59030 analytics: Social breadth accepting more than level 2
...
Even if core indicators are limited to level 2 we should not block
other activities from implementing up to level 5.
2017-08-29 08:28:46 +02:00
Ankit Agarwal
e4f7cfe19f
MDL-59198 lti: Make params LTI2 compatible
...
LTI2 recommends to include both upper case and lower case of custom params.
This patch makes our implementation confer to that standard.
2017-08-29 11:42:09 +05:30
Jun Pataleta
4f9dfd0f8d
Merge branch 'MDL-59628-master' of git://github.com/damyon/moodle
2017-08-29 13:49:55 +08:00
Andrew Nicols
3eb0d7db6d
Merge branch 'MDL-59827-master' of git://github.com/damyon/moodle
2017-08-29 13:21:22 +08:00
Andrew Nicols
d3e6c398f4
Merge branch 'MDL-35290-master' of https://github.com/snake/moodle
2017-08-29 13:14:22 +08:00
David Monllao
e8c2abcea6
MDL-59030 testing: Tests for core_course analytics indicators
2017-08-29 06:24:06 +02:00
David Monllao
c4aa41b1ba
MDL-59030 analytics: New analytics indicators
...
- Completion enabled
- Potential cognitive depth
- Potential social breadth
2017-08-29 06:24:04 +02:00
David Monllao
edee629d1a
MDL-59030 analytics: Expand community of inquiry mods public API
2017-08-29 06:19:37 +02:00
Damyon Wiese
26c4d2bf79
MDL-59628 forms: Get a valid zindex for datepicker
...
We have a way to determine a valid zindex when adding things to a page. Find all the moodle-has-zindex things and
choose a value bigger all of them. This needs doing in javascript whenever a thing is opened. It's not possible to
fix generically in CSS (remember the historic z-index wars).
2017-08-29 12:09:59 +08:00
Damyon Wiese
0639741307
MDL-59628 datepicker: Revert invalid zindex change
...
Revert "MDL-59382 theme: bring the date picker forward"
This reverts commit 63dd75229b
.
2017-08-29 12:09:03 +08:00
Andrew Nicols
4bdf6157d4
Merge branch 'MDL-59824-master' of git://github.com/damyon/moodle
2017-08-29 12:00:45 +08:00
Andrew Nicols
85419c5b2e
Merge branch 'MDL-59828-master' of git://github.com/damyon/moodle
2017-08-29 11:56:28 +08:00
Jun Pataleta
c5830051e5
Merge branch 'MDL-59855-master' of git://github.com/junpataleta/moodle
2017-08-29 11:43:36 +08:00
Jun Pataleta
7927138d50
MDL-59855 oauth2: More PHPDocs fixes
...
* Fix PHPDoc return type for api::get_system_account()
* Fix PHPDoc for the $contenttype parameter in \core\oauth2\rest::call()
2017-08-29 11:18:23 +08:00
Jake Dallimore
7a170fad85
MDL-35290 files: File manager reports files which can't be read
2017-08-29 11:15:30 +08:00
Jun Pataleta
909ae42d7d
Merge branch 'MDL-59869-master' of git://github.com/Dagefoerde/moodle
2017-08-29 10:40:30 +08:00
Marina Glancy
c524a6dce0
MDL-35668 filebrowser: unittests
2017-08-29 09:57:59 +08:00
Eloy Lafuente (stronk7)
c121d406e4
Merge branch 'MDL-59801-master' of git://github.com/damyon/moodle
2017-08-29 02:37:24 +02:00
Eloy Lafuente (stronk7)
f0e6ff9a8e
Merge branch 'MDL-59669-master-3' of git://github.com/ryanwyllie/moodle
2017-08-29 02:15:18 +02:00
Eloy Lafuente (stronk7)
b76caa44d5
Merge branch 'MDL-59887-master' of git://github.com/lameze/moodle
2017-08-29 01:33:49 +02:00
Eloy Lafuente (stronk7)
25f24df793
Merge branch 'MDL-59265_master' of git://github.com/dmonllao/moodle
2017-08-29 01:16:42 +02:00
Eloy Lafuente (stronk7)
685e99cabe
Merge branch 'MDL-59910-master' of git://github.com/lameze/moodle
2017-08-29 01:06:46 +02:00
Eloy Lafuente (stronk7)
1fb5f3cf4a
Merge branch 'MDL-59870-participants-th-top-vertical-aligned' of http://github.com/lucaboesch/moodle
2017-08-29 00:52:37 +02:00
Eloy Lafuente (stronk7)
cace54811d
Merge branch 'MDL-59670-master' of git://github.com/andrewnicols/moodle
2017-08-29 00:41:57 +02:00
David Monllao
f19719c198
MDL-59657 analytics: Option to restrict heavy processes to CLI
...
Default to only CLI.
2017-08-28 21:18:52 +02:00
Mark Nielsen
b757c648f3
MDL-59960 core_files: prevent mimetype update on every file update
...
Every time a file is updated, the mimetype is re-processed.
But, some mimetypes can only be detected if the file is present
on local disk. With external file systems, this could cause
the file to be downloaded unnecessarily. Instead, only update
the mimetype when the file content or the file name has changed.
2017-08-28 11:36:15 -07:00