Commit graph

1150 commits

Author SHA1 Message Date
Jun Pataleta
e8d39b3926 MDL-58803 calendar: Require calendar/lib.php 2017-05-04 13:03:55 +08:00
Dan Poltawski
b2a57a53f8 Merge branch 'wip-MDL-58661-master' of git://github.com/marinaglancy/moodle 2017-05-03 10:39:51 +01:00
Jun Pataleta
4d771e8099 Merge branch 'MDL-58535-master' of git://github.com/damyon/moodle 2017-05-03 16:41:38 +08:00
Mark Nelson
685daf1aed MDL-58650 core_message: always use 'popup' processor for messages 2017-05-02 15:46:48 +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
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
Marina Glancy
8559427687 MDL-58661 filepicker: correct size for alias icons 2017-04-27 14:40:13 +08:00
Dan Poltawski
13e58982bb Merge branch 'MDL-58617-master' of git://github.com/lameze/moodle 2017-04-20 07:19:17 +01:00
Simey Lameze
f3dacc3860 MDL-58617 core_output: add mapping for dashboard on user menu 2017-04-20 13:56:13 +08:00
David Monllao
ce85011f5a Merge branch 'MDL-58280-master' of git://github.com/damyon/moodle 2017-04-20 12:05:42 +08:00
Damyon Wiese
0b1a14aef9 MDL-58280 fileconverter_googledrive: More helpful errors
Detect some config errors and give a better error message.
2017-04-20 11:28:06 +08:00
Damyon Wiese
9fe3363301 MDL-58280 fileconverter_googledrive: Is born. 2017-04-20 10:49:17 +08:00
Marina Glancy
7f53e8aa22 MDL-58267 completion: allow to set default activity completion
Part of MDL-58138 epic
2017-04-19 08:54:35 +08:00
David Monllao
d0d0a7b482 Merge branch 'MDL-58560-master' of https://github.com/xow/moodle 2017-04-13 11:38:37 +02:00
Andrew Nicols
20026ab3c1 Merge branch 'MDL-58356-master' of git://github.com/damyon/moodle 2017-04-13 12:10:45 +08:00
Andrew Nicols
28b966a5f9 Merge branch 'MDL-39913-master-new-validation' of https://github.com/xow/moodle 2017-04-13 08:44:15 +08:00
Damyon Wiese
c698b85ae8 MDL-58560 icons: Better mapping for t/move 2017-04-11 10:56:27 +08:00
David Monllao
696bfb490b Merge branch 'mdl-58489' of https://github.com/Dagefoerde/moodle 2017-04-10 16:55:46 +02:00
David Monllao
538dbf37e1 Merge branch 'MDL-58492-master-famarkers' of git://github.com/mudrd8mz/moodle 2017-04-10 11:10:04 +02:00
Andrew Nicols
17cc2842a7 Merge branch 'MDL-58359-master' of git://github.com/damyon/moodle 2017-04-10 13:35:36 +08:00
Jun Pataleta
9be24e45b7 Merge branch 'MDL-58357-master' of git://github.com/damyon/moodle 2017-04-10 13:26:21 +08:00
Andrew Nicols
3de074e4bf Merge branch 'MDL-58311_master' of https://github.com/sk-unikent/moodle 2017-04-10 12:00:59 +08:00
Damyon Wiese
d84b7f7f5c MDL-58359 icons: Revert the icons for completion
We are missing one for "auto-completion not yet completed" etc.
2017-04-10 11:47:08 +08:00
Damyon Wiese
1a10c79f67 MDL-58356 icons: Revert file type icons 2017-04-10 11:36:51 +08:00
David Mudrák
f7cfa26ec4 MDL-58492 icons: Fix fontawesome for i/marker and i/marked icons
These combo icons are used to mark something the current element. They
are supposed to be used in places like the course outline to
mark/highlight a section as the current one. Also workshop uses them to
switch to a phase (mark it as the current one).
2017-04-07 14:35:16 +02:00
Jonathon Fowler
4e5a22df7a MDL-39913 filetypes: mimetypes remediation
Going by http://www.iana.org/assignments/media-types/media-types.xhtml.
Disambiguated the Office 2007 types, Apple iWorks and other types
changes by tonyjbutler.
2017-04-07 16:02:00 +08:00
Jan Dageförde
eb4ab7c4b8
MDL-58489 core: Fix unreachable HTTP error handling 2017-04-07 09:50:15 +02:00
Mark Nelson
90b735b169 MDL-12689 core: fixed incorrect use of the term 'depreciated' 2017-04-05 11:12:07 +08:00
Jake Dallimore
170a8b3ec4 Merge branch 'MDL-58368-master' of git://github.com/damyon/moodle 2017-04-05 09:33:45 +08:00
Eloy Lafuente (stronk7)
aa2b5b214d Merge branch 'wip-MDL-57769-master' of https://github.com/marinaglancy/moodle 2017-04-05 01:31:08 +02:00
Eloy Lafuente (stronk7)
4c9919fb15 Merge branch 'MDL-55326-master' of git://github.com/andrewnicols/moodle 2017-04-04 19:01:57 +02:00
Dan Poltawski
1e4e5c52d7 Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle 2017-04-04 17:07:41 +01:00
Dan Poltawski
14286ebd4a MDL-55611 calendar: remove duplicated 'scheduled task stuff' 2017-04-04 17:02:07 +01:00
Mark Nelson
23a29de7ee MDL-58424 core_calendar: moved logic from api.php to lib.php
Also moved related PHPUnit tests.

Part of MDL-55611 epic.
2017-04-04 11:01:52 +01:00
Damyon Wiese
d37945c37a MDL-58220 repository_onedrive: standard plugin
Add this plugin to the standard plugin list.
2017-04-04 11:18:27 +08:00
David Monllao
fcada374ac Merge branch 'MDL-12689_m33v4' of https://github.com/sbourget/moodle 2017-04-04 00:08:50 +02:00
Stephen Bourget
037273d87e MDL-12689: convert auth plugins to use settings.php 2017-04-03 10:50:09 -04:00
Damyon Wiese
14cfd280d3 MDL-58220 oauth2: Sanity check user pictures 2017-04-03 13:43:27 +08:00
Damyon Wiese
7f15866006 MDL-58220 oauth2: Use email as default username
And give better error messages.
2017-04-03 13:43:27 +08:00
Damyon Wiese
9165e83831 MDL-58220 unittests: Fix errors found in unittests 2017-04-03 13:43:26 +08:00
Damyon Wiese
d9fbe3146c MDL-58220 oauth2: Use the same list of user fields
Authentication has a hard coded list of valid internal user fields - but they are in a class variable. We need them
in oauth user_field_mapping so we need to move them to a central place and call them from oauth2 and auth.
2017-04-03 13:43:26 +08:00
Damyon Wiese
68ecf7635b MDL-58220 oauth2: tighten the param types
These come from external sources - but still should not contain crazy stuff.
2017-04-03 13:43:26 +08:00
Damyon Wiese
7949b3b2ac MDL-58220 oauth2: Remove is_system_account_setup_supported
This was left from an earlier branch but no longer useful.
2017-04-03 13:43:26 +08:00
Damyon Wiese
5b0b35c096 MDL-58220 oauth2: Add is_configured to issuer
Saves repeated checks for clientid and clientsecret.
2017-04-03 13:43:25 +08:00
Damyon Wiese
8d90d29460 MDL-58220 oauth2: Use iputils to check domain
Allows wild cards and more strict checking against spec.
2017-04-03 13:43:25 +08:00
Damyon Wiese
4a32445dc9 MDL-58220 oauth2: use PARAM_RAW_TRIMMED
Client ID and secret and copy/pasted from elsewhere so trim them.
2017-04-03 13:43:25 +08:00
Damyon Wiese
13b449f4a5 MDL-58220 oauth2: cibot cleanups 2017-04-03 13:43:25 +08:00
Damyon Wiese
99e3c347f9 MDL-58220 oauth2: Minor cleanups
Fixes spotted by Jun in peer review.
2017-04-03 13:43:25 +08:00
Damyon Wiese
28b592d5a6 MDL-58338 oauth2: Force email confirmation
New accounts and linking a login to an existing account MUST go through email verification.
We cannot trust the emails we get from oauth providers have been confirmed.

Part of MDL-58220
2017-04-03 13:43:25 +08:00
Damyon Wiese
fa78244d17 MDL-58220 oauth2: Fix unit tests and add more 2017-04-03 13:43:25 +08:00