mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
85,892 Commits 36 Branches 519 Tags
Commit Graph

1620 Commits

Author SHA1 Message Date
Jake Dallimore
7a170fad85 MDL-35290 files: File manager reports files which can't be read 2017-08-29 11:15:30 +08:00
Cameron Ball
03756f0bdb
MDL-59700 filestorage: Rework repositories to avoid add_file_to_pool 
For historical reasons repositories need to call add_file_to_pool
to sync file records. However now that a before_file_created hook
has been added additional information is needed by add_file_to_pool.

Ideally add_file_to_pool and friends will become private/protected,
so we need to remove all uses of it in core.

This patch adds some new methods to the file class to allow syncing
to be managed internally by the file and the file_storage class.
 2017-08-07 15:50:15 +08:00
Eloy Lafuente (stronk7)
29af7b0b4c MDL-57432 upgrade: clean < 3.0.0 upgrade steps 
This just deletes all the upgrade steps previous to 3.0.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.

Also includes an upgrade step to prevent upgrading from any
version < 2015111600 (v3.0.0) as anti-cheating measure.

Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
 2017-07-10 09:16:55 +01:00
Simey Lameze
64c385a293 MDL-59008 repository: add reload parent window support to callback 2017-07-03 13:41:58 +08:00
Simey Lameze
1ba1412fa3 MDL-59008 repository_onedrive: add method to serve login on a popup 2017-07-03 13:41:58 +08:00
Simey Lameze
fd8790d5cf MDL-59008 repository_googledocs: add method to serve login on a popup 
This commit also add a new string logintoaccount to make the login
button more clear.
 2017-07-03 13:41:58 +08:00
Eloy Lafuente (stronk7)
5e27228335 MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts 2017-05-19 19:22:07 +02:00
Helen Foster
0d86195e8d MDL-58877 lang: Merge English strings from the en_fix language pack 
Significant string changes:

* loginerror_cannotcreateaccounts in auth_oauth2 - more understandable
  error message
* config_keep_groups_and_groupings and config_keep_roles_and_enrolments
  in core_backup - switch fix
 2017-05-10 12:24:36 +02:00
Eloy Lafuente (stronk7)
d989ee1e03 MDL-58853 versions: bump all versions and requires near release 
version = 2017051500 release version
requires= 2017050500 current rc1 version
 2017-05-09 02:58:28 +02:00
Dan Poltawski
e18cd34bbb Merge branch 'MDL-58765-master' of git://github.com/damyon/moodle 2017-05-08 10:31:59 +01:00
Damyon Wiese
6a7552fe70 MDL-58765 repository: controlled links fix 
If a file is selected as a controlled link, only copy it to the system account the first time
the form is saved.
 2017-05-08 10:53:58 +08:00
Andrew Nicols
7167d25f5f Merge branch 'MDL-58823-master' of git://github.com/jleyva/moodle 2017-05-08 09:32:58 +08:00
Damyon Wiese
eeaee38a75 MDL-58535 onedrive: Try the upload twice 
For work accounts we need to specify the auth headers, for personal accounts we cannot specify the auth headers.
We don't know which is which so we have to try both cases.
 2017-05-05 16:44:52 +08:00
Juan Leyva
fcdd7730bd MDL-58823 repository: Fix redirections to external files 
We cannot use redirect() because is not compatible with
webservice/pluginfile.php
This script is defined as an AJAX_SCRIPT so redirections are not
allowed by redirect() function.
 2017-05-05 10:04:51 +02:00
Dan Poltawski
bf39e7c7aa Merge branch 'MDL-58800-master' of git://github.com/damyon/moodle 2017-05-04 10:00:37 +01:00
Jun Pataleta
1e324a4a88 Merge branch 'MDL-58749-master-enfix' of git://github.com/mudrd8mz/moodle 2017-05-04 14:45:08 +08:00
Damyon Wiese
00879eca66 MDL-58800 repository_googledocs: Switch oauth clients 
We need to ensure we use the correct oauth client to download files. This change
is the same as the one made to the onedrive repository where a usesystem flag
is added to the file reference if the file has been copied to the system account.
 2017-05-04 12:57:23 +08: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
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
Damyon Wiese
13d21db324 MDL-58535 repository_onedrive: Use the weblink 
The permission has it's own weblink which is different from the link on the original doc.
 2017-05-01 16:15:36 +08:00
Damyon Wiese
c0a4efdce2 MDL-58535 repository_onedrive: Better error 
When OneDrive has never been initialised the Graph API returns an error. Detect this and
direct the user to log in to OneDrive.
 2017-05-01 16:15:36 +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
Damyon Wiese
68c6fd20a7 MDL-58535 onedrive: Fix upload to system account 
This was failing for personal accounts (but was fine for business).
 2017-05-01 16:15:35 +08:00
Damyon Wiese
536ed579b9 MDL-58535 repository_onedrive: Controlled link fixes 
It is impossible to reliable copy a file between users without downloading and uploading the file.

This sucks but it's true...
 2017-05-01 16:15:35 +08:00
Jan Dageförde
c7de40a8ed
MDL-58372 repository_webdav: Explicitly pass some filename 
Not passing anything triggers PHP 7.1 "Too few arguments" exception.
 2017-04-26 11:28:41 +02:00
Jun Pataleta
089810fb06 MDL-58538 repository_onedrive: Use image_url() instead of pix_url() 2017-04-19 12:29:22 +08:00
Jake Dallimore
84fb93a77e Merge branch 'MDL-58297-master' of git://github.com/andrewnicols/moodle 2017-04-11 10:49:07 +08:00
Andrew Nicols
e6a4780452 MDL-58297 core: Update to use new hashing functions 2017-04-07 10:40:23 +08:00
Dan Poltawski
1e4e5c52d7 Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle 2017-04-04 17:07:41 +01:00
Damyon Wiese
bcd08003fa MDL-58220 lang: Add / fix lang strings 
The refactoring during integration caused some lang string errors.
 2017-04-04 10:28:14 +08:00
Damyon Wiese
aa89bf2e6c 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.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
e7688f559a 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.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
86a5f1efe1 MDL-58220 repository_skydrive: Add deprecation warning 2017-04-03 13:43:27 +08:00
Damyon Wiese
e518ea7949 MDL-58220 repository_onedrive: rename from skydrive 
Update all references from skydrive to onedrive in the code / lang strings.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
9b8a36e882 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.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
0931acf96b MDL-58220 repository: Move skydrive -> onedrive 2017-04-03 13:43:27 +08:00
Damyon Wiese
33536fb2b7 MDL-58220 repositories: missing/disabled issuer 
This makes the code checking for a missing / disabled issuer a bit cleaner.
 2017-04-03 13:43:26 +08:00
Dan Poltawski
5afb4f0e50 MDL-58220 repository: prevent repo breaking when issuer doesn't exist 2017-04-03 13:43:26 +08:00
Damyon Wiese
ba3b0145ff MDL-58220 repository_skydrive: Remove references to google 2017-04-03 13:43:26 +08:00
Damyon Wiese
eb47ad4a6e MDL-58220 repository: More docs / comments 
More docs / comments for the reference_file_selected function used by controlled links.
 2017-04-03 13:43:26 +08:00
Damyon Wiese
6f8a03f196 MDL-58220 skydrive: Upgrade from old settings 
Upgrade the oauth2 settings to an oauth2 issuer.
 2017-04-03 13:43:26 +08:00
Damyon Wiese
13b449f4a5 MDL-58220 oauth2: cibot cleanups 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
092304a3de MDL-58220 oauth2: Cibot fixes 
Missing phpdocs.
 2017-04-03 13:43:25 +08:00
Damyon Wiese
eca128bf47 MDL-58220 oauth2: Global enable/disable for issuers. 2017-04-03 13:41:19 +08:00
Damyon Wiese
ffda3e395c MDL-58127 skydrive: Upgrades to new oauth2 
Support for controlled links workflow.

Part of MDL-58220
 2017-04-03 13:41:19 +08:00
Damyon Wiese
af28b22892 MDL-58219 googledocs: Use google file extensions 
Only rename on export for download.

Part of MDL-58220
 2017-04-03 13:41:19 +08:00
Damyon Wiese
72643dc688 MDL-58219 googledocs: Update to new model for controlledlinks 
Part of MDL-58220
 2017-04-03 13:41:19 +08:00
Damyon Wiese
141ee541ca 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
 2017-04-03 13:41:19 +08:00
Damyon Wiese
72fd103add MDL-58219 cibot: Fixes 
Fixes for cibot warnings.

Part of MDL-58220
 2017-04-03 13:41:19 +08:00