Dan Poltawski
93c253d303
Merge branch 'MDL-58794-master' of git://github.com/junpataleta/moodle
2017-05-03 13:19:19 +01:00
Dan Poltawski
be7c4e4cac
Merge branch 'MDL-58798-master' of git://github.com/junpataleta/moodle
2017-05-03 12:17:13 +01:00
Dan Poltawski
2e04d92718
Merge branch 'MDL-58692-master-authcfgnames' of git://github.com/mudrd8mz/moodle
2017-05-03 11:17:45 +01:00
David Mudrák
31bd102316
MDL-58692 auth: Improve the migration of auth setting names
...
Some auth plugins used to have a mix of the legacy style of plugin names
in config_plugins table (such as 'auth/mnet') and the new correct
style (such as 'auth_mnet'). Attempting to rename the setting plugin via
low level SQL UPDATE could lead to duplicate key violation.
The patch introduces a new helper function to safely migrate the old
settings to the new ones, eventually informing the admin about the
values mismatch.
2017-05-03 12:02:43 +02:00
Dan Poltawski
b2a57a53f8
Merge branch 'wip-MDL-58661-master' of git://github.com/marinaglancy/moodle
2017-05-03 10:39:51 +01:00
Dan Poltawski
69cdead3d1
MDL-58788 docs: Note new behat compatibility page
2017-05-03 10:35:48 +01:00
Cameron Ball
26aedd4abf
MDL-58514 mod_assign: Apply consistent logic for overrides
...
Previously the assign submission page was using "lenient" logic
for overrides when more than one group override applied to a user
(i.e., use the earliest "open" date and the latest "due" date)
when really it should be using the sortorder as per the assign
grading table.
2017-05-03 16:59:22 +08:00
Jun Pataleta
4d771e8099
Merge branch 'MDL-58535-master' of git://github.com/damyon/moodle
2017-05-03 16:41:38 +08:00
Jake Dallimore
d59415222d
Merge branch 'MDL-58650_master' of git://github.com/markn86/moodle
2017-05-03 15:56:55 +08:00
Marina Glancy
5900513f75
MDL-58688 calendar: use modinfo to check module availability
2017-05-03 15:07:43 +08:00
Jun Pataleta
428f7864a1
MDL-58794 core_course: Use a simpler future timestamp for test
2017-05-03 14:52:38 +08:00
Jun Pataleta
37c47e32bc
MDL-58798 theme_boost: Override font size for big icon fonts
2017-05-03 14:44:33 +08:00
Marina Glancy
99fbcc7bd4
MDL-58670 blog: respect capability to search entries
2017-05-03 10:49:01 +08:00
Marina Glancy
b7fcd09582
MDL-58635 blogs: check edited blog belongs to current user
2017-05-03 10:49:01 +08:00
Andrew Hancox
dca8394630
MDL-58172 mod_choice: Make export choice respect id fields
2017-05-03 10:49:01 +08:00
David Monllao
932bc91cb4
on-demand release 3.3beta+
2017-05-03 10:28:52 +08:00
David Monllao
03f4f26608
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-05-03 10:28:51 +08:00
Andrew Nicols
77f1729eec
MDL-56675 cachestore_memcached: Disable store if not purgeable
...
If the store is shared and the getAllKeys function is broken due to an
incompatability between libmemcached and memcached >= 1.4.23, then it is
not possible to purge the cache, and we cannot support the plugin.
This patch adjusts the isready check to additionally check if the
combination of libmemcached and memcached is affected by this issue.
2017-05-03 09:24:23 +08:00
Andrew Nicols
d98d245ba0
MDL-58746 core: Simplify environment check
2017-05-03 08:32:24 +08:00
Juan Leyva
91357e7c36
MDL-58434 mod_lesson: Display invalid responses in detailed report
...
In the detailed statistics view for one user attempt, the user response
for numerical question types was not being displayed.
This was only happening for incorrect responses.
2017-05-02 19:56:47 +02:00
AMOS bot
aac25da7fd
Automatically generated installer lang files
2017-05-03 00:05:36 +08:00
Marina Glancy
98b3fa4c63
MDL-50670 course: correctly apply defaults for format options
2017-05-02 16:06:46 +08:00
Mark Nelson
685daf1aed
MDL-58650 core_message: always use 'popup' processor for messages
2017-05-02 15:46:48 +08:00
Andrew Nicols
458e5f66c2
MDL-58754 competency: Change query for DISTINCT COUNT
2017-05-02 14:48:35 +08:00
Ankit Agarwal
9e218b9282
MDL-58776 tags: Add bootstrap classes to buttons
2017-05-02 12:12:06 +05:30
Damyon Wiese
8eb128120a
MDL-58535 oauth: Make the refreshtoken protected
...
It is set in subclasses so it should be protected (it was working regardless).
2017-05-02 12:21:36 +08:00
Damyon Wiese
f942de3c8a
MDL-58535 repository_onedrive: Use correct user
...
If the file was copied to a system account, we need to use the system oauth when accessing it.
2017-05-02 11:45:57 +08:00
Adam Olley
0fb1335924
MDL-58772 mod_feedback: Dont overwrite anonymous entries
...
The feedback module lets you alternate between responses being anonymised and
not anonymised. When the module is in anonymous mode, its possible for a single
user to make multiple responses.
However when the activity is switched to non-anon mode, if a user leaves a
follow up feedback, one of their previously anonymous responses is used, so
their new response stays anonymous and their old anon response is lost.
This change lets them leave a new non-anonymised feedback entry and retains all
previous anonymous responses instead of incorrectly reusing one of their anon
ones at random.
2017-05-02 12:49:33 +09:30
Ryan Wyllie
f31240ebdf
MDL-58518 block_myoverview: use user's midnight for sort by courses
2017-05-02 02:53:26 +00:00
Ryan Wyllie
405f8491e5
MDL-58518 calendar: ignore events from courses user not enrolled in
2017-05-02 02:53:25 +00:00
Andrew Nicols
4270ebea38
Merge branch 'MDL-57704-master' of https://github.com/xow/moodle
2017-05-02 10:35:46 +08:00
Damyon Wiese
3ba79ff19a
MDL-58535 oauth2: Don't rely on the return scopes
...
MS makes a big mess of returning scopes from oauth requests. They only return the custom MS scopes like
User.Read and they never return non-MS scopes (like openid, profile, email).
2017-05-02 10:03:58 +08:00
John Okely
087662037b
MDL-57704 ltiprovider: Don't force SSLv3
2017-05-02 09:33:18 +08:00
Andrew Nicols
db2c66e700
Merge branch 'wip-MDL-58665-master' of git://github.com/marinaglancy/moodle
2017-05-02 09:00:07 +08:00
Stephen Vickers
1768b85f09
MDL-58770 mod_lti: Strip HTML from parameters
...
Remove HTML tags from parameters which should be plain text.
2017-05-01 21:15:37 +01:00
Marina Glancy
bb9d5f7f1b
MDL-55468 mod_feedback: revive export analysis to excel
2017-05-01 14:28:55 +01:00
Dan Poltawski
f0572ad21f
Merge branch 'MDL-58760-master-pixescape' of git://github.com/mudrd8mz/moodle
2017-05-01 11:25:39 +01:00
Marina Glancy
0302548806
MDL-58594 backup: setting locked by permission can not be overriden
2017-05-01 17:04:04 +08:00
Marina Glancy
50d845e3ed
MDL-58665 dashboard: use bigger course object for completion
...
class completion_info will make an extra DB query to retrieve the course if course->enablecompletion is not present
2017-05-01 16:59:07 +08:00
Marina Glancy
cd477f8c3e
MDL-58665 mod_scorm: cache times in modinfo for performance
2017-05-01 16:59:04 +08:00
Ankit Agarwal
bb40a28d9b
MDL-58497 forum: Show correct itemcount on action events
2017-05-01 13:48:30 +05:30
Damyon Wiese
13d21db324
MDL-58535 repository_onedrive: Use the weblink
...
The permission has it's own weblink which is different from the link on the original doc.
2017-05-01 16:15:36 +08:00
Damyon Wiese
c0a4efdce2
MDL-58535 repository_onedrive: Better error
...
When OneDrive has never been initialised the Graph API returns an error. Detect this and
direct the user to log in to OneDrive.
2017-05-01 16:15:36 +08:00
Damyon Wiese
8381b05d49
MDL-58535 repository_onedrive: Integration review fixes
...
Fixes for some missing imports and unused variables.
2017-05-01 16:15:36 +08:00
Damyon Wiese
68c6fd20a7
MDL-58535 onedrive: Fix upload to system account
...
This was failing for personal accounts (but was fine for business).
2017-05-01 16:15:35 +08:00
Damyon Wiese
c593a0b001
MDL-58535 assign: Always pass file serving options.
...
This allows the mobile app to pass offline=1 in urls to files to force export/download of the source file
for controlled links.
2017-05-01 16:15:35 +08:00
Damyon Wiese
536ed579b9
MDL-58535 repository_onedrive: Controlled link fixes
...
It is impossible to reliable copy a file between users without downloading and uploading the file.
This sucks but it's true...
2017-05-01 16:15:35 +08:00
Andrew Nicols
2a87d81c5a
Merge branch 'MDL-58732-master' of git://github.com/ryanwyllie/moodle
2017-05-01 15:22:53 +08:00
Jake Dallimore
c7fe56a79b
Merge branch 'MDL-58167-master' of git://github.com/lameze/moodle
2017-05-01 14:51:43 +08:00
Jun Pataleta
e85579693b
Merge branch 'MDL-58632-master' of https://github.com/xow/moodle
2017-05-01 14:26:37 +08:00