Damyon Wiese
3192438075
Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle
2017-11-10 13:47:05 +08:00
Andrew Nicols
41b7375c07
MDL-60763 core_calendar: Deprecate calendar_get_upcoming
2017-11-10 13:45:32 +08:00
Jun Pataleta
cb04dcf4ce
Merge branch 'MDL-60771-master' of git://github.com/lameze/moodle
2017-11-10 18:03:49 +13:00
Jun Pataleta
c3925187ed
Merge branch 'MDL-60758_master' of git://github.com/dmonllao/moodle
2017-11-10 17:21:15 +13:00
Damyon Wiese
4ceece6ea1
Merge branch 'MDL-60749-master' of git://github.com/sarjona/moodle
2017-11-10 12:05:46 +08:00
Jun Pataleta
cfbc820e1b
Merge branch 'MDL-60766-master' of git://github.com/ryanwyllie/moodle
2017-11-10 17:02:41 +13:00
Simey Lameze
fbbcf45ef2
MDL-60771 mod_scorm: typecast score to integer
2017-11-10 12:00:17 +08:00
Andrew Nicols
6e2d8c121b
Merge branch 'MDL-52838-master' of git://github.com/damyon/moodle
2017-11-10 11:38:13 +08:00
Damyon Wiese
6b2a9a6fb8
Merge branch 'MDL-60765-master' of git://github.com/andrewnicols/moodle
2017-11-10 10:55:09 +08:00
Andrew Nicols
fb5bbf1424
MDL-60765 theme: Make inplace-autocomplete rule more specific
...
This change was intended to fix an issue with the autocomplete in RTL,
but was applied to all inplace-editables.
2017-11-10 10:29:11 +08:00
Damyon Wiese
ce225e1c5e
MDL-52838 workshop: Each criterion > 0 levels
...
Add validation to the edit assessment form so each criterion in a rubric requires at least one level.
2017-11-10 10:22:27 +08:00
Ryan Wyllie
08b7558483
MDL-60766 block_calendar_upcoming: stop summary modal not logged in
...
Stopped the JS from running on the block when the user is not logged in
because it attempts to load a summary modal when an event is clicked on
which results in a failed call to a webservice.
2017-11-10 02:20:32 +00:00
Andrew Nicols
9dead25fd5
MDL-60763 core_calendar: Revert removal of calendar_get_upcoming
...
This reverts part of commit 522b84be04
2017-11-10 10:11:42 +08:00
Ryan Wyllie
eac88b955f
MDL-60766 block_calendar_month: hide nav when not logged in
2017-11-10 02:07:50 +00:00
Jake Dallimore
f5b63fc829
Merge branch 'MDL-60760_master' of git://github.com/dmonllao/moodle
2017-11-10 09:32:17 +08:00
Andrew Nicols
6996fbaa0e
MDL-60763 core_calendar: Revert removal of calendar_get_upcoming
...
Revert "MDL-60092 core_calendar: remove unused calendar_get_upcoming method"
This reverts commit 4259387ebb
2017-11-10 08:11:36 +08:00
David Monllao
20305a8a8f
MDL-60758 tool_analytics: Skip guess start if higher than guess end
2017-11-09 17:11:34 +01:00
David Monllao
5da020169e
MDL-60760 tool_analytics: No onlycli link for managers
2017-11-09 17:05:08 +01:00
Sara Arjona
2f673d8b6a
MDL-60749 scorm: Remove from files when downloading
2017-11-09 10:15:03 +01:00
Sara Arjona
4bcb0a9a1d
MDL-60550 user: Add more restrictions in keyword searches
...
Original patch provided by Tim Schroeder.
2017-11-09 16:29:29 +08:00
David Monllao
a4e0b7468c
Merge branch 'MDL-60718-master' of git://github.com/sarjona/moodle
2017-11-09 09:27:01 +01:00
David Monllao
7fdcdc04ff
Merge branch 'MDL-60615-master' of git://github.com/damyon/moodle
2017-11-09 08:48:48 +01:00
Damyon Wiese
bef5a8ca10
Merge branch 'MDL-60752-master' of git://github.com/andrewnicols/moodle
2017-11-09 15:08:11 +08:00
Damyon Wiese
246698e779
MDL-60615 imscc: string to array fix
...
Sloppy typing in the imscc converter is causing errors on php7.1
Variable is initialised as a string and then used as an array.
2017-11-09 15:05:36 +08:00
Jake Dallimore
4f3262fede
Merge branch 'MDL-60753_master' of git://github.com/markn86/moodle
2017-11-09 14:47:23 +08:00
Andrew Nicols
f169f4fd21
MDL-60752 lti: Compare text in types_config properly
2017-11-09 14:25:51 +08:00
Mark Nelson
d48d1ba19a
MDL-60753 report_competency: fixed dialogue failing to show
2017-11-09 14:11:24 +08:00
Jun Pataleta
7a571b813a
Merge branch 'MDL-60628-master' of git://github.com/lameze/moodle
2017-11-09 17:08:46 +13:00
Simey Lameze
754016ab33
MDL-60628 calendar: amend web service unit test
2017-11-09 11:43:49 +08:00
Simey Lameze
10c17dcc10
MDL-60628 calendar: support category events on get_calendar_events ws
2017-11-09 11:29:07 +08:00
Andrew Nicols
5518a32de5
Merge branch 'MDL-60579-master-fix2' of https://github.com/damyon/moodle
2017-11-09 11:18:14 +08:00
Damyon Wiese
56f05f23c6
MDL-60579 user: Don't lose text filters
...
When replacing a group filter with a different group filter - don't forget all the current text filters that have
been applied.
2017-11-09 11:06:30 +08:00
Damyon Wiese
bb869f05e8
MDL-60579 user: Move defines into library
...
Entry page user/index.php was defining constants that were used by the renderer.
This means the renderer was tied to user/index.php.
2017-11-09 11:06:30 +08:00
Andrew Nicols
7cf4331a6f
MDL-60579 user: Correct PARAM type for filters
...
Damyon pointed out during the integration of this fixset, that the
PARAM type is incorrect.
2017-11-09 10:07:13 +08:00
Andrew Nicols
762f8dc1db
MDL-60579 user: Add missing case breaks
2017-11-09 09:07:34 +08:00
Andrew Nicols
a997dc9da5
MDL-60579 user: Correct search for strings
2017-11-09 09:07:21 +08:00
Andrew Nicols
446b21b512
MDL-60579 user: Check filter strings have correct part count
2017-11-09 09:07:02 +08:00
Andrew Nicols
3968d2ca7e
MDL-60579 user: Prevent behat from interacting til setup complete
2017-11-09 09:05:22 +08:00
Sara Arjona
0c0d460e8b
MDL-60718 analytics: Avoid duplicates for users with 2 enrolments
2017-11-08 19:12:59 +01:00
David Monllao
ed0e2cea00
Merge branch 'MDL-60732-master' of git://github.com/damyon/moodle
2017-11-08 17:48:07 +01:00
David Monllao
7effd6dd79
Merge branch 'MDL-60720-master' of https://github.com/sammarshallou/moodle
2017-11-08 17:27:15 +01:00
David Monllao
29adfbc3c8
Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle
2017-11-08 15:56:25 +01:00
David Monllao
4e73acf3cf
Merge branch 'MDL-60579-master' of https://github.com/mihailges/moodle
2017-11-08 12:16:20 +01:00
David Monllao
fcafb22c22
MDL-60733 oauth: Remove outdated comment
2017-11-08 12:04:31 +01:00
David Monllao
6463a047a2
Merge branch 'MDL-60733-master' of git://github.com/damyon/moodle
2017-11-08 12:03:43 +01:00
David Monllao
ccf7578373
Moodle release 3.4rc2
2017-11-08 09:47:39 +01:00
David Monllao
68ba214c65
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-11-08 09:47:38 +01:00
Damyon Wiese
a471bc4971
MDL-60732 core_user: Show group filters
...
Always show the group filters, even if the course is in NO_GROUPS mode.
2017-11-08 16:45:42 +08:00
Damyon Wiese
b6319f70bd
Merge branch 'MDL-60590-master' of git://github.com/andrewnicols/moodle
2017-11-08 15:46:44 +08:00
Damyon Wiese
d3882ea4a3
MDL-60733 core: B/C for google_oauth
...
The google_oauth class extends oauth2client which was modified to send "Accept" headers.
The "Accept" headers break picasa and could break any other plugin that was using google_oauth.
2017-11-08 15:41:53 +08:00
