Dan Poltawski [Tue, 4 Apr 2017 05:56:26 +0000 (06:56 +0100)]
Merge branch 'MDL-55941-initialbar-ux' of https://github.com/ilya-catalyst/moodle
Dan Poltawski [Tue, 4 Apr 2017 05:54:07 +0000 (06:54 +0100)]
Merge branch 'MDL-58220-master-fix1' of github.com/damyon/moodle
Andrew Nicols [Tue, 4 Apr 2017 03:48:50 +0000 (11:48 +0800)]
Merge branch 'master' of https://github.com/koennys/moodle
Damyon Wiese [Tue, 4 Apr 2017 03:18:27 +0000 (11:18 +0800)]
MDL-58220 repository_onedrive: standard plugin
Add this plugin to the standard plugin list.
Andrew Nicols [Tue, 4 Apr 2017 02:43:41 +0000 (10:43 +0800)]
Merge branch 'wip-MDL-41809-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 4 Apr 2017 02:41:22 +0000 (10:41 +0800)]
MDL-48771 mod_quiz: Rebase conflict fix img => .icon
Damyon Wiese [Tue, 4 Apr 2017 02:40:01 +0000 (10:40 +0800)]
MDL-58220 repo: Fix typo in FILE_CONTRLLED_LINK
Andrew Nicols [Tue, 4 Apr 2017 02:37:26 +0000 (10:37 +0800)]
Merge branch 'MDL-48771-squashed' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 4 Apr 2017 02:28:14 +0000 (10:28 +0800)]
MDL-58220 lang: Add / fix lang strings
The refactoring during integration caused some lang string errors.
Colin Chambers [Thu, 2 Feb 2017 14:36:34 +0000 (14:36 +0000)]
MDL-48771 quiz edit: delete mulitiple tidy up & Behat tests
David Monllao [Mon, 3 Apr 2017 22:27:30 +0000 (00:27 +0200)]
MDL-23919 mod_data: completionentries can be null
David Monllao [Mon, 3 Apr 2017 22:14:35 +0000 (00:14 +0200)]
MDL-12689 mod_data: Remove trailing whitespaces
David Monllao [Mon, 3 Apr 2017 22:08:50 +0000 (00:08 +0200)]
Merge branch 'MDL-12689_m33v4' of https://github.com/sbourget/moodle
David Monllao [Mon, 3 Apr 2017 22:07:24 +0000 (00:07 +0200)]
MDL-23919 mod_data: Clean illegal whitespace
Also moving upgrade step below 3.2 mark.
David Monllao [Mon, 3 Apr 2017 21:24:28 +0000 (23:24 +0200)]
Merge branch 'MDL-23919-mod_data-required-entry-completion' of https://github.com/marcusgreen/moodle
Luca Bösch [Sat, 12 Nov 2016 02:36:08 +0000 (03:36 +0100)]
MDL-48771 quiz: Select multiple questions to delete
Upon Moodle 2.8 the option to bulk delete all questions of a quiz
disappeared.
This patch adresses this and reintruduces a bulk action button.
Pushing that button shows a Delete and a Cancel button as well as
two Select all / Deselect all triggers and each and every question
gets a checkbox. The UI is slimmed down and other elements (e.g.
'Repaginate' button and so on) are hidden. Questions can be chosen
and deleted by pushing the Delete button. The bulk action button
is disabled when quiz attempts are present, just like the
'Repaginate' button.
TODO: Behat tests are lacking.
Marina Glancy [Mon, 3 Apr 2017 02:44:32 +0000 (10:44 +0800)]
MDL-23919 mod_data: small corrections to completion form element
Dan Poltawski [Mon, 3 Apr 2017 16:59:34 +0000 (17:59 +0100)]
Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle
Stephen Bourget [Mon, 3 Apr 2017 14:50:09 +0000 (10:50 -0400)]
MDL-12689: convert auth plugins to use settings.php
Eloy Lafuente (stronk7) [Mon, 3 Apr 2017 14:35:50 +0000 (16:35 +0200)]
Merge branch 'MDL-58462-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 3 Apr 2017 14:27:26 +0000 (16:27 +0200)]
Merge branch 'MDL-55459-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Mon, 3 Apr 2017 12:45:59 +0000 (13:45 +0100)]
MDL-37765 install: Fix missinf field definition
Dan Poltawski [Mon, 3 Apr 2017 11:55:07 +0000 (12:55 +0100)]
MDL-37765 block_login: fix whitespace
Dan Poltawski [Mon, 3 Apr 2017 11:41:56 +0000 (12:41 +0100)]
Merge branch 'MDL-58220-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 3 Apr 2017 08:14:46 +0000 (09:14 +0100)]
MDL-37765 version: bump
Dan Poltawski [Mon, 3 Apr 2017 08:13:55 +0000 (09:13 +0100)]
Merge branch 'MDL-37765-MASTER' of https://github.com/jacac/moodle
Andrew Nicols [Mon, 3 Apr 2017 07:38:53 +0000 (15:38 +0800)]
Merge branch 'MDL-50970-master' of git://github.com/jleyva/moodle
Juan Leyva [Fri, 31 Jul 2015 15:16:45 +0000 (17:16 +0200)]
MDL-50970 core_block: New Web Service core_block_get_course_blocks
Jun Pataleta [Mon, 3 Apr 2017 05:48:58 +0000 (13:48 +0800)]
MDL-58462 mod_data: Generate users with different names
* Give test users different first and last names.
* Declare class member variables instead of dynamically assigning them.
* Rename member variable $data to $database since it conflicts with the
private member variable PHPUnit_Framework_TestCase::$data.
* Replace setExpectedException usage with expectException().
Damyon Wiese [Fri, 31 Mar 2017 04:50:11 +0000 (12:50 +0800)]
MDL-58220 repo: Dont expect file info for any file
Some plugins do not implement the file info callback so expect and handle null in this case.
Damyon Wiese [Fri, 31 Mar 2017 03:13:43 +0000 (11:13 +0800)]
MDL-58220 oauth2: Provide template specific help links
E.g. separate pages for Microsoft / Google.
Damyon Wiese [Fri, 31 Mar 2017 02:48:15 +0000 (10:48 +0800)]
MDL-58220 oauth2: Sanity check user pictures
Damyon Wiese [Fri, 31 Mar 2017 02:36:17 +0000 (10:36 +0800)]
MDL-58220 oauth2: Cleanup on user delete
Delete the linked logins for this user account when it is deleted.
Damyon Wiese [Fri, 31 Mar 2017 02:31:53 +0000 (10:31 +0800)]
MDL-58220 oauth2: Don't login as deleted users
Also prevent sesskey error on first page of new logins.
Damyon Wiese [Fri, 31 Mar 2017 02:06:51 +0000 (10:06 +0800)]
MDL-58220 oauth2: Use email as default username
And give better error messages.
Damyon Wiese [Thu, 30 Mar 2017 07:42:41 +0000 (15:42 +0800)]
MDL-58220 onedrive: Add import from skydrive
If the skydrive repo exists - show a button on the config page for the onedrive repo to "steal" all the files
from the other repo and disable it.
Damyon Wiese [Thu, 30 Mar 2017 05:16:30 +0000 (13:16 +0800)]
MDL-58220 repository_skydrive: Add deprecation warning
Damyon Wiese [Thu, 30 Mar 2017 05:08:27 +0000 (13:08 +0800)]
MDL-58220 repository_onedrive: rename from skydrive
Update all references from skydrive to onedrive in the code / lang strings.
Damyon Wiese [Thu, 30 Mar 2017 05:01:39 +0000 (13:01 +0800)]
MDL-58220 repository_skydrive: put back existing
Restore the existing skydrive repo from integration / master.
Because we cannot upgrade cleanly - it's better not to touch the existing repo.
Damyon Wiese [Thu, 30 Mar 2017 05:01:18 +0000 (13:01 +0800)]
MDL-58220 repository: Move skydrive -> onedrive
Damyon Wiese [Thu, 30 Mar 2017 04:17:50 +0000 (12:17 +0800)]
MDL-58220 repositories: missing/disabled issuer
This makes the code checking for a missing / disabled issuer a bit cleaner.
Dan Poltawski [Wed, 29 Mar 2017 10:22:19 +0000 (11:22 +0100)]
MDL-58220 repository: prevent repo breaking when issuer doesn't exist
Damyon Wiese [Thu, 30 Mar 2017 03:45:46 +0000 (11:45 +0800)]
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.
Damyon Wiese [Wed, 29 Mar 2017 08:51:10 +0000 (16:51 +0800)]
MDL-58220 oauth2: More prominent help link
Damyon Wiese [Wed, 29 Mar 2017 08:25:52 +0000 (16:25 +0800)]
MDL-58220 tool_oauth2: Lang string fix
Damyon Wiese [Wed, 29 Mar 2017 08:24:30 +0000 (16:24 +0800)]
MDL-58220 tool_oauth2: Disable short forms
All of these forms only have one section so we should disable short forms.
Damyon Wiese [Wed, 29 Mar 2017 06:45:34 +0000 (14:45 +0800)]
MDL-58220 repository_skydrive: Remove references to google
Damyon Wiese [Wed, 29 Mar 2017 06:41:09 +0000 (14:41 +0800)]
MDL-58220 repository: More docs / comments
More docs / comments for the reference_file_selected function used by controlled links.
Damyon Wiese [Wed, 29 Mar 2017 06:28:17 +0000 (14:28 +0800)]
MDL-58220 unittests: Fix errors found in unittests
Damyon Wiese [Wed, 29 Mar 2017 05:58:59 +0000 (13:58 +0800)]
MDL-58220 skydrive: Upgrade from old settings
Upgrade the oauth2 settings to an oauth2 issuer.
Damyon Wiese [Tue, 28 Mar 2017 04:07:29 +0000 (12:07 +0800)]
MDL-58220 oauth2: Alphabetise lang strings.
Damyon Wiese [Tue, 28 Mar 2017 04:03:07 +0000 (12:03 +0800)]
MDL-58220 oauth2: Fix docs in test file
(and remove unused global $SESSION).
Damyon Wiese [Tue, 28 Mar 2017 04:01:29 +0000 (12:01 +0800)]
MDL-58220 auth: $OUTPUT -> $output
Don't use global $OUTPUT when there is a more specific renderer.
Damyon Wiese [Tue, 28 Mar 2017 03:58:45 +0000 (11:58 +0800)]
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.
Damyon Wiese [Tue, 28 Mar 2017 03:36:33 +0000 (11:36 +0800)]
MDL-58220 oauth2: tighten the param types
These come from external sources - but still should not contain crazy stuff.
Damyon Wiese [Tue, 28 Mar 2017 03:33:51 +0000 (11:33 +0800)]
MDL-58220 oauth2: quote image attributes
Damyon Wiese [Tue, 28 Mar 2017 03:31:20 +0000 (11:31 +0800)]
MDL-58220 oauth2: Change $OUTPUT to $this
Damyon Wiese [Tue, 28 Mar 2017 03:28:10 +0000 (11:28 +0800)]
MDL-58220 oauth2: Remove is_system_account_setup_supported
This was left from an earlier branch but no longer useful.
Damyon Wiese [Tue, 28 Mar 2017 03:25:04 +0000 (11:25 +0800)]
MDL-58220 oauth2: Add is_configured to issuer
Saves repeated checks for clientid and clientsecret.
Damyon Wiese [Tue, 28 Mar 2017 03:20:22 +0000 (11:20 +0800)]
MDl-58220 auth_oauth2: Skip upgrade for new plugin
Damyon Wiese [Tue, 28 Mar 2017 03:18:57 +0000 (11:18 +0800)]
MDL-58220 oauth2: Use iputils to check domain
Allows wild cards and more strict checking against spec.
Damyon Wiese [Tue, 28 Mar 2017 03:07:17 +0000 (11:07 +0800)]
MDL-58220 tool_oauth2: forms cleanup
Remove extra field length attributes and fix type of action fields.
Damyon Wiese [Tue, 28 Mar 2017 03:02:35 +0000 (11:02 +0800)]
MDL-58220 auth_oauth2: Remove allow linked logins
This was already removed - I just missed some spots.
Damyon Wiese [Tue, 28 Mar 2017 02:56:10 +0000 (10:56 +0800)]
MDL-58220 oauth2: Move help icons to table header
In the Site Administration -> Server -> OAuth 2 Services page.
Damyon Wiese [Tue, 28 Mar 2017 02:51:44 +0000 (10:51 +0800)]
MDL-58220 oauth2: Remove extra step
Show create google/facebook/office365 buttons on the main page instead
of hiding them behind a click.
Damyon Wiese [Tue, 28 Mar 2017 02:51:03 +0000 (10:51 +0800)]
MDL-58220 oauth2: use PARAM_RAW_TRIMMED
Client ID and secret and copy/pasted from elsewhere so trim them.
Damyon Wiese [Tue, 28 Mar 2017 02:27:19 +0000 (10:27 +0800)]
MDL-58220 auth_oauth: return false for non-oauth
Always return false for non-oauth logins.
Damyon Wiese [Tue, 28 Mar 2017 01:41:33 +0000 (09:41 +0800)]
MDL-58220 block_login: Update icon rendering of idp list
Damyon Wiese [Fri, 24 Mar 2017 07:34:15 +0000 (15:34 +0800)]
MDL-58220 oauth2: cibot cleanups
Damyon Wiese [Thu, 23 Mar 2017 08:53:07 +0000 (16:53 +0800)]
MDL-58220 oauth2: Minor cleanups
Fixes spotted by Jun in peer review.
Damyon Wiese [Tue, 21 Mar 2017 08:43:23 +0000 (16:43 +0800)]
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
Damyon Wiese [Tue, 21 Mar 2017 05:16:29 +0000 (13:16 +0800)]
MDL-58334 repositories: Offline downloads
Support an optional param for offline downloads for repositories supporting external links (googledrive and skydrive).
Part of MDL-58220
Damyon Wiese [Wed, 15 Mar 2017 08:29:25 +0000 (16:29 +0800)]
MDL-58220 oauth2: Fix unit tests and add more
Damyon Wiese [Wed, 15 Mar 2017 07:07:41 +0000 (15:07 +0800)]
MDL-58220 oauth2: Cibot fixes
Missing phpdocs.
Damyon Wiese [Wed, 15 Mar 2017 06:04:49 +0000 (14:04 +0800)]
MDL-58220 oauth2: More help buttons
Add help for system account connections and discovery.
Damyon Wiese [Wed, 15 Mar 2017 02:48:20 +0000 (10:48 +0800)]
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.
Damyon Wiese [Wed, 15 Mar 2017 02:13:07 +0000 (10:13 +0800)]
MDL-58220 auth_oauth2: Fix new account creation
This was not allowing new accounts to be registered.
Damyon Wiese [Tue, 14 Mar 2017 08:39:25 +0000 (16:39 +0800)]
MDL-58220 oauth2: Global enable/disable for issuers.
Damyon Wiese [Tue, 14 Mar 2017 07:41:56 +0000 (15:41 +0800)]
MDL-58220 assign: Only show write access to teachers
In filebrowser api - this is also used by repositories using controlled links.
Damyon Wiese [Tue, 14 Mar 2017 04:18:27 +0000 (12:18 +0800)]
MDL-58127 skydrive: Upgrades to new oauth2
Support for controlled links workflow.
Part of MDL-58220
Damyon Wiese [Tue, 14 Mar 2017 06:20:16 +0000 (14:20 +0800)]
MDL-58219 googledocs: Use google file extensions
Only rename on export for download.
Part of MDL-58220
Damyon Wiese [Tue, 14 Mar 2017 04:50:09 +0000 (12:50 +0800)]
MDL-58219 googledocs: Update to new model for controlledlinks
Part of MDL-58220
Damyon Wiese [Tue, 14 Mar 2017 04:17:30 +0000 (12:17 +0800)]
MDL-58219 repository: Change how controlled links work
Files are copied to the system user as soon as they are uploaded. Write access is then controlled when
serving links to the file.
Part of MDL-58220
Damyon Wiese [Fri, 10 Mar 2017 07:44:19 +0000 (15:44 +0800)]
MDL-58219 cibot: Fixes
Fixes for cibot warnings.
Part of MDL-58220
Damyon Wiese [Fri, 10 Mar 2017 07:05:52 +0000 (15:05 +0800)]
MDL-58219 oauth2: Fix unit tests because we changed the model
We added 2 fields to the model and we needed to update the tests.
I also removed some error_log from the rest client (very useful while developing)
Part of MDL-58220
Damyon Wiese [Fri, 10 Mar 2017 06:51:44 +0000 (14:51 +0800)]
MDL-58219 googledocs: Fix upgrade script nesting
Part of MDL-58220
Damyon Wiese [Fri, 10 Mar 2017 06:33:51 +0000 (14:33 +0800)]
MDL-58219 workshop: Fix unit tests
The bug is caused by the new code to freeze the files in the fileareas when switching phases.
Part of MDL-58220
Damyon Wiese [Fri, 10 Mar 2017 06:12:00 +0000 (14:12 +0800)]
MDL-58219 googledocs: Use a cache
Speed up folder operations with a simple cache.
Part of MDL-58220
Damyon Wiese [Fri, 10 Mar 2017 05:34:21 +0000 (13:34 +0800)]
MDL-58219 googledocs: Keep original name on copy
Also - only add writers to files that have been "claimed" (prevent_changes_to_external_files)
Part of MDL-58220
Damyon Wiese [Fri, 10 Mar 2017 04:51:00 +0000 (12:51 +0800)]
MDL-58219 oauth2: Fix token upgrade problem with incremental auth
Part of MDL-58220
Damyon Wiese [Fri, 10 Mar 2017 04:11:17 +0000 (12:11 +0800)]
MDL-58219 oauth2: Show connected system account info
Show the username and email of the connected system account (if it ever requires refreshing - this will help identity the account
to re-authorise).
Part of MDL-58220
Damyon Wiese [Fri, 10 Mar 2017 02:37:29 +0000 (10:37 +0800)]
MDL-58142 calendar: Add an obvious link to the help docs
Part of MDL-58220
Damyon Wiese [Thu, 9 Mar 2017 01:38:02 +0000 (09:38 +0800)]
MDL-58131 googledocs: Add manage url -> drive
Part of MDL-58220
Damyon Wiese [Thu, 9 Mar 2017 01:15:57 +0000 (09:15 +0800)]
MDL-58168 oauth2: Check for new access code before checking scopes
Part of MDL-58220
Damyon Wiese [Wed, 8 Mar 2017 14:03:09 +0000 (22:03 +0800)]
MDL-58168 auth_oauth2: Allow linking other accounts
Part of MDL-58220
Damyon Wiese [Tue, 7 Mar 2017 14:04:30 +0000 (22:04 +0800)]
MDL-58132 repositories: Controlled link file type
This introduces a new "controlled link" file type where the file is not
stored in Moodle - but Moodle will control the access permissions on the file.
Plugins can "freeze" a filearea which means Moodle will take ownership of all the remote
files of this type.
When accessing a file, if the "filebrowser" infomation indicates the current user can write to the file, they
will be granted temporary write access.
Part of MDL-58220
Damyon Wiese [Mon, 6 Mar 2017 06:16:51 +0000 (14:16 +0800)]
MDL-58128 googledocs: Don't copy files
When linking - add the moodle account to the file and
organise it on the moodle side. Also allow read access with link,
but don't make any other changes to the perm/ownership.
Part of MDL-58220
Damyon Wiese [Fri, 3 Mar 2017 08:08:28 +0000 (16:08 +0800)]
MDL-58128 googledocs: Support reference files.
Add options so the admin can control the types of files this repository can support (and the default).
Part of MDL-58220
Damyon Wiese [Sun, 5 Mar 2017 08:13:53 +0000 (16:13 +0800)]
MDL-58128 googledocs: Upgrade repo config
Part of MDL-58220
Damyon Wiese [Sun, 5 Mar 2017 06:28:33 +0000 (14:28 +0800)]
MDL-58128 oauth2: Add a scheduled task for refresh
We need to make sure our refresh tokens do not expire. We run a scheduled
task to update the refresh token once per hour.
Part of MDL-58220