84334 Commits

Author SHA1 Message Date
Jun Pataleta
1e324a4a88 Merge branch 'MDL-58749-master-enfix' of git://github.com/mudrd8mz/moodle 2017-05-04 14:45:08 +08:00
Andrew Nicols
6628153eb3 Merge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle 2017-05-04 14:33:27 +08:00
Andrew Nicols
641af8d17c Merge branch 'MDL-58803-master-fix' of git://github.com/junpataleta/moodle 2017-05-04 14:11:23 +08:00
David Monllao
03262b0469 Merge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle 2017-05-04 13:32:59 +08:00
Andrew Nicols
28bf0a03a7 MDL-56675 cachestore_memcached: Check all connected servers for support 2017-05-04 13:11:07 +08:00
Jun Pataleta
e8d39b3926 MDL-58803 calendar: Require calendar/lib.php 2017-05-04 13:03:55 +08:00
David Monllao
175a51c472 Merge branch 'wip-MDL-58594-v2' of https://github.com/marinaglancy/moodle 2017-05-04 12:38:04 +08:00
Cameron Ball
eeb27f03bd
MDL-58736 core_calendar: Revert calendar_get_events to 3.2 implementation
We modified calendar_get_events in a non backwards compatible way
so instead of fixing that, an easier approch is to simply revert
it to the 3.2 implementation. This should be fine since the way
to get events is going to change in an upcomming release, and we
had to swap all occurences of calendar_get_events in core with
calendar_get_legacy_events to make sure the calendar and overview match.
2017-05-04 12:19:35 +08:00
Andrew Nicols
2e3c23b25f Merge branch 'MDL-58707-master' of git://github.com/jleyva/moodle 2017-05-04 11:42:38 +08:00
Andrew Nicols
f8633212ee Merge branch 'MDL-58803-master' of git://github.com/junpataleta/moodle 2017-05-04 11:07:37 +08:00
Andrew Nicols
edf1ea10ca Merge branch 'MDL-58431-master' of git://github.com/jleyva/moodle 2017-05-04 11:01:39 +08:00
David Monllao
bde7f06ce8 Merge branch 'MDL-58497-master' of git://github.com/ankitagarwal/moodle 2017-05-04 10:58:36 +08:00
David Monllao
5abd0f6e6f Merge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle 2017-05-04 10:56:29 +08:00
Andrew Nicols
680ad78cf0 Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle 2017-05-04 10:14:41 +08:00
Jake Dallimore
5529b4701a MDL-58684 portfolio: use file id instead of stored_file 2017-05-04 10:00:54 +08:00
Jun Pataleta
c9d775fc92 MDL-58803 calendar: Use fully qualified name for call to rrule_manager 2017-05-04 08:58:11 +08:00
Andrew Nicols
b1517237ad Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle 2017-05-04 08:49:48 +08:00
David Mudrák
ee9e7ee31d MDL-58749 lang: Change "inline text" to "online text" in qtype_essay
This change has been agreed by Helen and Tim in MDL-49208.
2017-05-03 22:07:01 +02:00
Helen Foster
06d0aa4432 MDL-58749 lang: Merge English strings from the en_fix language pack
Significant string changes:

* errorinvalidbyhour,core_calendar - correcting number from 59 to 23
* cron_help,core_admin - updated recommendation to run cron every minute
* tour1_content_end, tour1_content_welcome, tour2_content_end,
  tour2_content_welcome all in tool_usertours - removing reference to
  3.2
* invalidsesskey,core_error and invalidsesskey,mod_wiki - more
  understandable error message
* pluginname_help and pluginnamesummary in qtype_essay - explaining that
  the question type can be used for file uploads
* formatnoinline, mustattach and mustrequire in qtype_essay - changing
  the word 'inline' to 'online'
2017-05-03 22:05:51 +02:00
Eloy Lafuente (stronk7)
c30bddcfb4 Merge branch 'MDL-58754-master' of git://github.com/andrewnicols/moodle 2017-05-03 19:32:45 +02:00
Eloy Lafuente (stronk7)
91edf89d86 Merge branch 'MDL-58788-master' of git://github.com/danpoltawski/moodle 2017-05-03 18:44:38 +02:00
Dan Poltawski
c201e4df40 Merge branch 'MDL-58772' of git://github.com/aolley/moodle 2017-05-03 16:50:29 +01:00
Dan Poltawski
9a5f5ed56b Merge branch 'MDL-35913-master' of git://github.com/jleyva/moodle 2017-05-03 14:15:11 +01:00
Dan Poltawski
a724a97f25 Merge branch 'MDL-58434-master' of git://github.com/jleyva/moodle 2017-05-03 14:01:59 +01:00
Dan Poltawski
a1646c1869 Merge branch 'MDL-50670_master' of git://github.com/markn86/moodle 2017-05-03 13:30:43 +01:00
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
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
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