Commit graph

23673 commits

Author SHA1 Message Date
Andrew Nicols
c46ae2fbc1 Merge branch 'MDL-58361-master' of https://github.com/xow/moodle 2017-04-05 15:04:44 +08:00
Andrew Nicols
941cb7ce3c Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle 2017-04-05 14:22:39 +08: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
67aaf4eeda MDL-55611 upgrade.txt: remove duplicated note 2017-04-04 17:32:13 +01:00
Dan Poltawski
6ebb0947f0 MDL-55611 upgrade: bump redirect_if_major_update_required 2017-04-04 17:08:35 +01: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
Tim Hunt
2524990d09 MDL-58486 user_prefs: always update $USER cache when applicable
set_user_preference and unset_user_preference let you pass the user to
set preferences for as an id. Previously, if you passed $USER->id there,
those methods did not update the Cache in $USER, which was surprising,
and not easy to debug.

Now, we always update the preference cache in $USER if the preference is
being changed for the current user.
2017-04-04 16:20:26 +01:00
Jun Pataleta
e6661428ad MDL-57607 upgrade: Add post-upgrade adhoc task for refreshing mod events
Insert an ad-hoc task into the task_adhoc table that updates existing calendar
events to convert them to action-type events, where applicable.

Part of MDL-55611 epic.
2017-04-04 11:01:54 +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
Mark Nelson
10515e152d MDL-58424 core: undeprecated calendar_* functions
Part of MDL-55611 epic.
2017-04-04 11:01:52 +01:00
Mark Nelson
e1cd93ce20 MDL-58423 core_calendar: moved \core_calendar\event class
Part of MDL-55611 epic.
2017-04-04 11:01:49 +01:00
Jun Pataleta
966cbed632 MDL-58386 core: Fixed CI issues
Part of MDL-55611 epic.
2017-04-04 11:01:46 +01:00
Andrew Nicols
569d091b03 MDL-58333 core_calendar: Make WS available to Mobile
Part of MDL-55611 epic.
2017-04-04 11:01:43 +01:00
Cameron Ball
200f979c4c MDL-58087 core_calendar: Keep legacy implementation of calendar_get_events
The new implementation of calendar_get_events (i.e., \core_calendar\api::get_events)
has a subtly different behaviour. So we need to maintain the existing implementation
in deprecatedlib.

Part of MDL-55611 epic.
2017-04-04 11:01:41 +01:00
Marina Glancy
125c4c4cb8 MDL-57961 course: change wording of module availability
renamed Visible to Availability and added help strings

AMOS BEGIN
 CPY [availability,core_moodle],[modvisible,core_moodle]
 CPY [availability,core_moodle],[modvisiblewithstealth,core_moodle]
 CPY [availability,core_moodle],[modvisiblehiddensection,core_moodle]
 CPY [show,core_moodle],[modshow,core_moodle]
 CPY [hide,core_moodle],[modhide,core_moodle]
AMOS END
2017-04-04 17:05:57 +08:00
Daniel Thee Roperto
745212bda0 MDL-58479 documentation: fixed phpdoc for notice(). 2017-04-04 16:20:41 +10:00
Dan Poltawski
ab8aa88214 Merge branch 'MDL-55941-initialbar-ux' of https://github.com/ilya-catalyst/moodle 2017-04-04 06:56:26 +01:00
Dan Poltawski
dda4dcaffb Merge branch 'MDL-58220-master-fix1' of http://github.com/damyon/moodle 2017-04-04 06:54:07 +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
Andrew Nicols
a9bca28400 Merge branch 'wip-MDL-41809-master' of git://github.com/marinaglancy/moodle 2017-04-04 10:43:41 +08:00
David Monllao
fcada374ac Merge branch 'MDL-12689_m33v4' of https://github.com/sbourget/moodle 2017-04-04 00:08:50 +02:00
Dan Poltawski
a29cd3138c Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle 2017-04-03 17:59:34 +01:00
Stephen Bourget
037273d87e MDL-12689: convert auth plugins to use settings.php 2017-04-03 10:50:09 -04:00
Dan Poltawski
ece14dab98 MDL-37765 install: Fix missinf field definition 2017-04-03 13:45:59 +01:00
Dan Poltawski
3ca68f24f7 Merge branch 'MDL-58220-master' of git://github.com/damyon/moodle 2017-04-03 12:41:56 +01:00
Dan Poltawski
02eaa42f23 Merge branch 'MDL-37765-MASTER' of https://github.com/jacac/moodle 2017-04-03 09:13:55 +01:00
Juan Leyva
8446ba3641 MDL-50970 core_block: New Web Service core_block_get_course_blocks 2017-04-03 09:27:53 +02: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
9c2baf096b MDL-58220 unittests: Fix randomly failing unit test
The scheduled task unit tests does not handle 'R' fields properly. We don't need it here.
2017-04-03 13:43:26 +08:00
Damyon Wiese
9165e83831 MDL-58220 unittests: Fix errors found in unittests 2017-04-03 13:43:26 +08:00
Damyon Wiese
1a911be57b MDL-58220 oauth2: Fix docs in test file
(and remove unused global $SESSION).
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
f59d81f487 MDL-58220 block_login: Update icon rendering of idp list 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
d5bb9f1ffc MDL-58334 repositories: Offline downloads
Support an optional param for offline downloads for repositories supporting external links (googledrive and skydrive).

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
Damyon Wiese
092304a3de MDL-58220 oauth2: Cibot fixes
Missing phpdocs.
2017-04-03 13:43:25 +08:00
Damyon Wiese
c21a66e40a MDL-58220 auth_oauth2: Restrict logins to a set of domains
This is set on the issuer, so you can have different lists for each oauth2 provider.
2017-04-03 13:43:25 +08:00