88300 Commits

Author SHA1 Message Date
AMOS bot
4f7bacba82 Automatically generated installer lang files 2018-03-20 00:05:59 +00:00
AMOS bot
bef37b42dc Automatically generated installer lang files 2018-03-20 00:05:58 +00:00
Eloy Lafuente (stronk7)
b2d941c16f Merge branch 'MDL-61529-master' of https://github.com/bmbrands/moodle 2018-03-20 00:27:48 +01:00
Luca Bösch
d6076942e3 MDL-58179 lesson: Avoid using span with class "label" 2018-03-19 21:13:11 +01:00
Eloy Lafuente (stronk7)
0fe1ed29d9 Merge branch 'MDL-61615-master' of git://github.com/rezaies/moodle 2018-03-19 11:21:48 +01:00
Simey Lameze
bbd655b4a8 MDL-61410 question: merge course and question tags 2018-03-19 11:45:55 +08:00
Simey Lameze
1796eb181b MDL-61410 question: fix unit tests failures 2018-03-19 11:45:55 +08:00
Simey Lameze
13596866e7 MDL-61410 question: support course tags on import 2018-03-19 11:45:55 +08:00
Simey Lameze
2ee6e02e21 MDL-61410 question: unit tests for question_sort_tags 2018-03-19 11:45:55 +08:00
Simey Lameze
3bf5fcf277 MDL-61410 question: change logic on xml format 2018-03-19 11:45:55 +08:00
Simey Lameze
6307622b28 MDL-61410 question: move tag sorting logic to a new function 2018-03-19 11:45:55 +08:00
Simey Lameze
3a7005c964 MDL-61410 question: support course tags on export 2018-03-19 11:45:55 +08:00
Andrew Nicols
24f5828309 Merge branch 'MDL-61265-master' of git://github.com/sarjona/moodle 2018-03-19 10:51:27 +08:00
Andrew Nicols
89b8efb09b Merge branch 'MDL-58179-master' of https://github.com/lucaboesch/moodle 2018-03-19 10:22:14 +08:00
Andrew Nicols
db98868d22 Merge branch 'MDL-61154_master' of git://github.com/dmonllao/moodle 2018-03-19 10:09:29 +08:00
Andrew Nicols
d7a6e531ee Merge branch 'MDL-61514-master' of git://github.com/rezaies/moodle 2018-03-19 09:01:19 +08:00
Eloy Lafuente (stronk7)
20f808165b MDL-61678 phpunit: Bump to current / latest 6.5.x before major release 2018-03-18 23:40:02 +01:00
Tim Hunt
d9b80a5e69 MDL-61605 quiz report: add missing index/key
Thanks to Patryk Szuta for the suggestion
2018-03-18 20:40:43 +00:00
Martin Gauk
c4172077df MDL-61519 calendar: do not iterate through all categories
Replace calls to \coursecat::get_all() or cache the results.
2018-03-16 14:30:55 +00:00
Luca Bösch
2ffd2afdba MDL-52989 mod_lesson: Fix cluster_jump returning a cluster page id. 2018-03-16 13:44:44 +01:00
cescobedo
00a7511580 MDL-61451 message_area: core/auto_rows remove set height to 1px 2018-03-16 13:06:02 +01:00
Sara Arjona
9390fc5829 MDL-61265 enrol: Add default numsections for external db 2018-03-16 11:32:09 +01:00
Bas Brands
c8842113a7 MDL-61529 core: update lib scssphp to version 0.7.5 2018-03-16 10:36:40 +01:00
David Monllao
63f2c0c664 MDL-61154 analytics: No escaping for text format url 2018-03-16 09:27:07 +01:00
Luca Bösch
ef2b45a977 MDL-58179 lesson: Avoid using span with class "label" 2018-03-16 08:52:21 +01:00
Jake Dallimore
b63a3b04b1 weekly release 3.5dev 2018-03-16 10:08:46 +08:00
Eloy Lafuente (stronk7)
ed0b6f0da4 MDL-61656 report_security: fix role name 2018-03-16 02:24:59 +01:00
Eloy Lafuente (stronk7)
a717d5dc33 Merge branch 'MDL-61570-master' of git://github.com/andrewnicols/moodle 2018-03-16 01:15:16 +01:00
Eloy Lafuente (stronk7)
2b28ed2371 Merge branch 'MDL-61566-master' of git://github.com/andrewnicols/moodle 2018-03-16 00:29:34 +01:00
Eloy Lafuente (stronk7)
7394da46e2 Merge branch 'MDL-61571-master' of git://github.com/andrewnicols/moodle 2018-03-15 23:48:24 +01:00
Jake Dallimore
e1a527c0d4 Merge branch 'wip-MDL-61477-master-behat' of https://github.com/marinaglancy/moodle 2018-03-15 16:44:02 +08:00
Marina Glancy
c3b548479b MDL-61477 auth_email: behat tests for sign up 2018-03-15 16:23:06 +08:00
Shamim Rezaie
c185e4fe21 MDL-61589 Questions: Top question category naming improvement
Display the context name next to the top question category name.
2018-03-15 18:47:25 +11:00
Jake Dallimore
17b284b937 Merge branch 'wip-MDL-61477-master-manager' of git://github.com/marinaglancy/moodle 2018-03-15 11:38:14 +08:00
Marina Glancy
acb3b78804 MDL-61477 auth_email: add sitepolicyhandler to the config WS 2018-03-15 11:32:59 +08:00
Marina Glancy
1727c939ba MDL-61477 admin: sitepolicy handler API
- Define sitepolicy handler manager class, base class and the core handler
- Allow to set a plugin as sitepolicyhandler that implements the sitepolicy API
- Modify web services to return information from the 3rd party handler instead of core if needed
2018-03-15 11:32:55 +08:00
David Mudrák
0bdc578567 MDL-61477 admin: Allow plugins to act as alternate policy handlers
The patch introduces a new site setting 'sitepolicyhandler' that can be
either empty or contain a plugin component name. If it is empty, the
site policy feature keeps working as before and the core keeps the
control over it.

If a plugin is specified, it is expected to implement the callback
'site_policy_handler' in its lib.php file. The callback should return a
URL to a script where the user can accept the site policies. The plugin
itself is responsible for setting the 'policyagreed' flag in the users
table. The callback may return an empty value, in which case the user
can continue using the site without being redirected.

The patch adds support for a new pre-config flag NO_SITEPOLICY_CHECK.
This constant should be defined and set to true if we should not check
the user's policyagreed status during the require_login().

This is for pages where the user actually accepts the site policies and
helps to avoid the redirect loop.
2018-03-15 09:31:41 +08:00
Dan Marsden
37ddc231f8 MDL-58080 mod_scorm: add immutable header for scorm content files. 2018-03-15 12:50:38 +13:00
Eloy Lafuente (stronk7)
a2fc9a4772 Merge branch 'MDL-61600-master' of git://github.com/dpalou/moodle 2018-03-14 14:43:25 +01:00
Eloy Lafuente (stronk7)
30d1b7d1a7 Merge branch 'MDL-61620_master' of git://github.com/dmonllao/moodle 2018-03-14 13:39:17 +01:00
David Monllao
6dca3ddc71 MDL-61620 output: New action_menu options 2018-03-14 11:38:08 +01:00
Eloy Lafuente (stronk7)
37c9154c25 Merge branch 'MDL-61398-master' of git://github.com/andrewnicols/moodle 2018-03-14 11:22:17 +01:00
Eloy Lafuente (stronk7)
4b183d2258 Merge branch 'MDL-61475-master-v3' of git://github.com/snake/moodle 2018-03-14 11:00:57 +01:00
Dani Palou
f72ca3ce29 MDL-61600 recaptcha: Create a script to display recaptcha 2018-03-14 10:31:09 +01:00
Eloy Lafuente (stronk7)
b244de5612 Merge branch 'MDL-61526-master' of git://github.com/rezaies/moodle 2018-03-14 10:30:51 +01:00
Andrew Nicols
aeb144359d Merge branch 'MDL-61465-master-2' of git://github.com/ryanwyllie/moodle 2018-03-14 14:55:34 +08:00
Andrew Nicols
04d6ba8638 Merge branch 'MDL-43362-master' of git://github.com/Kathrin84/moodle 2018-03-14 13:18:14 +08:00
Andrew Nicols
d7ff2fc28b Merge branch 'MDL-60398-master' of git://github.com/mihailges/moodle 2018-03-14 10:33:03 +08:00
Jake Dallimore
4ba1a7a1e6 Merge branch 'MDL-61307-master' of git://github.com/andrewnicols/moodle 2018-03-14 09:41:00 +08:00
Jake Dallimore
a57960ee11 MDL-61475 mod_choice: perf improvement when exporting personal data
Instead of creating an array containing all record information and then
writing, we know write periodically during the recordset iteration, thus
alleviating any memory concerns associated with the array approach.
2018-03-14 09:36:03 +08:00