Eloy Lafuente (stronk7)
eafcaa4e41
Merge branch 'MDL-59696-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE
2017-09-07 11:01:06 +02:00
David Monllao
aed06e3b9d
MDL-59768 unittest: Remove references to unexisting method
2017-09-07 11:01:05 +02:00
David Monllao
064739b3df
Merge branch 'wip-MDL-59768-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE
2017-09-07 11:01:05 +02:00
David Monllao
e9e0083e30
Merge branch 'MOODLE_33_STABLE-MDL-59799' of https://github.com/jojoob/moodle into MOODLE_33_STABLE
2017-09-07 11:01:04 +02:00
David Monllao
35f2a315a0
Merge branch 'wip-MDL-59815-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE
2017-09-07 11:01:03 +02:00
Jun Pataleta
e3cd9de694
MDL-59696 templates: Remove form-group div for url-select template
...
* Removed the div with the class 'form-group' that's enclosing the
select element and friends. It's not needed since the urlselect template
is an inline form.
* Also, for completeness, I added the helpicon data for the template's
context.
2017-09-04 10:12:06 +08:00
Tobias Garske
29786b259a
MDL-59898 access: Added Icon references.
2017-09-04 09:55:59 +08:00
Johannes Burk
55a0d1d09a
MDL-59799 course: Include course/lib.php before using move_courses().
2017-09-01 16:45:49 +02:00
Marina Glancy
fceada2c4e
MDL-59768 tasks: schedule task only if it is not scheduled
2017-08-31 14:34:59 +08:00
Peter Spicer
84dc1b0d17
MDL-59815 access: Fix definition of risks for user:delete.
2017-08-30 11:38:21 +08:00
Andrew Nicols
bd90cb526f
Merge branch 'MDL-35290-33' of https://github.com/snake/moodle into MOODLE_33_STABLE
2017-08-29 13:15:01 +08:00
Jun Pataleta
7d753e1403
Merge branch 'MDL-59855-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE
2017-08-29 11:45:42 +08:00
Jun Pataleta
8ab8763d47
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:19:32 +08:00
Jan Dageförde
c9e2c1b44c
MDL-59855 oauth2: Fix PHPDoc type hints
2017-08-29 11:19:32 +08:00
Jake Dallimore
67fa4b55b9
MDL-35290 files: File manager reports files which can't be read
2017-08-29 11:14:46 +08:00
Jun Pataleta
6223245206
Merge branch 'MDL-59869-33' of git://github.com/Dagefoerde/moodle into MOODLE_33_STABLE
2017-08-29 10:43:29 +08:00
Jun Pataleta
41c4762440
Merge branch 'wip-MDL-59708-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE
2017-08-28 15:02:11 +08:00
Jan Dageförde
18264ac63d
MDL-59869 oauth2: Fix notification method
2017-08-26 15:41:56 +02:00
Jan Dageförde
a671402655
MDL-59869 oauth2: Send expiry notification on exceptions, too
2017-08-26 15:41:56 +02:00
Eloy Lafuente (stronk7)
ab5d142ff3
Merge branch 'MDL-59790-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE
2017-08-23 11:35:43 +02:00
Andrew Nicols
e7294cf68e
Merge branch 'MDL-57412-33' of https://github.com/xow/moodle into MOODLE_33_STABLE
2017-08-23 16:56:54 +08:00
John Okely
a73d721669
MDL-57412 upgrade: Set linkcoursesections to 1 if boost in use
2017-08-23 15:08:14 +08:00
Simey Lameze
50fa49c852
MDL-59790 core: fix tooltip for pie chart
2017-08-23 12:28:10 +08:00
Jun Pataleta
19c75ebc5f
Merge branch 'MDL-59784-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
2017-08-23 10:48:00 +08:00
Andrew Nicols
d7b6c78b7d
MDL-59784 core: Check for non-promises rather than string
...
If a malformed value was passed, it may be that we can still display it.
We should not assume that, if a string is not passed, that we are
dealing with a promise.
2017-08-23 10:30:29 +08:00
Eloy Lafuente (stronk7)
a35a27e819
Merge branch 'MDL-59784-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
2017-08-22 12:28:44 +02:00
Andrew Nicols
69c4972afb
Merge branch 'MDL-59826-33' of https://github.com/snake/moodle into MOODLE_33_STABLE
2017-08-22 15:57:27 +08:00
Jun Pataleta
214ddb8c0f
MDL-59836 core_amd: Use only one input event handler
...
* We have duplicate input event handlers for the autocomplete element
which are both firing when the input element's value is being set.
In case an AJAX handler is defined for the autocomplete suggestions,
this causes the autocomplete suggestions so show "No suggestions" first
and then load the results from the AJAX handler a little bit later.
2017-08-18 11:37:07 +08:00
Jake Dallimore
5fe2965cab
MDL-59826 output: make context_header() aware of page context.
...
There are times, such as when viewing a user profile within a course,
when user_can_view_profile() should be passed a course to force it to
restrict its capability checks to only the supplied course. This change
makes sure that core_renderer->context_header() calls this correctly.
2017-08-18 11:32:16 +08:00
Andrew Nicols
1896e257aa
MDL-59784 core: Modal factory should listen before fetching templates
2017-08-18 11:17:04 +08:00
Andrew Nicols
5607739ed7
MDL-59784 core: Modal should accept title as a promise
2017-08-18 11:17:04 +08:00
Andrew Nicols
6fd7ea810b
MDL-59784 core: Refactor addblock to listen earlier
2017-08-18 09:37:45 +08:00
Eloy Lafuente (stronk7)
9aed01738e
Merge branch 'MDL-59667-33-2' of git://github.com/ryanwyllie/moodle into MOODLE_33_STABLE
2017-08-15 13:13:12 +02:00
Andrew Nicols
e01475d537
Merge branch 'MDL-59746-33' of git://github.com/Dagefoerde/moodle into MOODLE_33_STABLE
2017-08-15 13:40:44 +08:00
gthomas2
c83f37600a
MDL-59708 file: Add CUD callbacks, backport of MDL-57476
2017-08-15 09:46:48 +08:00
Ryan Wyllie
1bda7d963a
MDL-59667 form: stop datepicker from rendering outside viewport
...
Stop the date picker panel from being rendered outside of the
viewport, for example when being displayed in a modal.
2017-08-15 01:25:50 +00:00
Jun Pataleta
8a5e5ce049
Merge branch 'MDL-59740_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE
2017-08-14 13:48:16 +08:00
Eloy Lafuente (stronk7)
14b7a15960
Merge branch 'MDL-59741-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
2017-08-14 02:36:51 +02:00
Jan Dageförde
cc85a41175
MDL-59746 oauth2: urlencode parameters for post requests
2017-08-07 22:23:46 +02:00
Eloy Lafuente (stronk7)
e9cd408e25
Merge branch 'MDL-59506-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
2017-08-07 19:55:26 +02:00
Dan Poltawski
587a8af21c
Merge branch 'MDL-59172-33' of https://github.com/snake/moodle into MOODLE_33_STABLE
2017-08-07 16:20:14 +01:00
David Monllao
a8f61169c6
Merge branch 'MDL-59642-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
2017-08-07 14:41:40 +02:00
Mark Nelson
f925fa4d6b
MDL-59740 core_form: add ability to specify if a button is primary
2017-08-07 17:38:18 +08:00
Juan Leyva
c7ebab9725
MDL-59741 auth: Always check the type of iconurls
...
We need to check always if iconurl is an instance of moodle_url to
avoid Web Services returning iconurls from identity providers to fail.
2017-08-07 11:03:01 +02:00
David Monllao
f36eb9d982
Merge branch 'MDL-59644-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE
2017-08-07 09:34:42 +02:00
David Monllao
e8f932a0fd
Merge branch 'wip-MDL-59055-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE
2017-08-07 09:22:00 +02:00
Andrew Nicols
05f9a38375
Merge branch 'MDL-59698-33' of git://github.com/damyon/moodle into MOODLE_33_STABLE
2017-08-07 12:56:27 +08:00
Marina Glancy
299e5de1a7
MDL-59055 grades: provide backward-compatibility of changes
2017-08-07 10:09:40 +08:00
Marina Glancy
a4f645775a
MDL-59055 grades: fix bug displaying item id instead of grade
...
Thanks to Marcelo Santos for initial patch
2017-08-07 10:09:40 +08:00
Andrew Nicols
5f295e2ce8
MDL-59506 core_lock: use a null lock during install
...
Use a different lock factory during installation which does not actually
lock at all.
2017-08-07 10:00:39 +08:00