Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23548 from ↵ | Thomas Müller | 2016-04-21 | 1 | -1/+8 |
|\ | | | | | | | | | owncloud/stable8.2-quota-recognizeremoteunlimitedquota [stable8.2] Workaround to be able to recognize unlimited quota in fed shares | ||||
| * | Workaround to be able to recognize unlimited quota in fed shares | Vincent Petry | 2016-03-24 | 1 | -1/+8 |
| | | | | | | | | | | Fixes issues where a user cannot upload to a fed share on OC >= 9.0 where the sharer has unlimited quota (-3) | ||||
* | | Correctly return an empty string for empty files | Joas Schilling | 2016-04-08 | 1 | -3/+9 |
| | | |||||
* | | Fix PHP memory leak in file_get_contents() | Morris Jobke | 2016-04-04 | 2 | -2/+9 |
| | | | | | | | | | | | | | | * ref https://bugs.php.net/bug.php?id=61961 * ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256 * code is based on the proposal of @chriseqipe * fixes #20261 | ||||
* | | fix creation of versions of encrypted files on external storages | Bjoern Schiessle | 2016-03-31 | 6 | -62/+160 |
|/ | | | | | | in order to create a 1:1 copy of a file if a version gets created we need to store this information on copyBetweenStorage(). This allows us to by-pass the encryption wrapper if we read the source file. | ||||
* | Grab the values for share propagation manually from the DB | Joas Schilling | 2016-03-23 | 1 | -0/+12 |
| | |||||
* | Merge pull request #22944 from owncloud/backport-22800-stable8.2 | Thomas Müller | 2016-03-14 | 1 | -0/+3 |
|\ | | | | | [8.2] don't hide server not available exception, fixes #20536 | ||||
| * | don't hide server not available exception, fixes #20536 | Arthur Schiwon | 2016-03-08 | 1 | -0/+3 |
| | | |||||
* | | Fake LOCK statement for Windows 7, 8 and 10 network mounts | Morris Jobke | 2016-03-10 | 1 | -1/+5 |
| | | | | | | | | * fixes #22596 | ||||
* | | Merge pull request #22842 from owncloud/stable82_22830 | Morris Jobke | 2016-03-09 | 1 | -1/+1 |
|\ \ | |/ |/| | [Stable 8.2] Rename and move permissions are set when a file is updatable | ||||
| * | Rename and move permissions are set when a file is updatable | Roeland Jago Douma | 2016-03-04 | 1 | -1/+1 |
| | | | | | | | | * Fix unit tests | ||||
* | | Run cleanup of expired DB file locks to background job | Morris Jobke | 2016-03-04 | 1 | -15/+11 |
|/ | | | | | | | | | | | | | * fixes #22819 The old way fired a DELETE statement on each destruction of the DBLockingProvider. Which could cause a lot of queries. It's enough to run this every 5 minutes in a background job, which in the end could result in file locks that exists 5 minutes longer - in the worst case and for not properly released locks. This makes the DB based locking a lot more performant and could result in a similar performance to the Redis based locking provider. | ||||
* | Merge pull request #22752 from owncloud/part-file-root-82 | Vincent Petry | 2016-03-01 | 2 | -11/+39 |
|\ | | | | | [stable8.2] allow putting the part file in the view root | ||||
| * | Don't apply quota in stream wrapper for part files | Vincent Petry | 2016-03-01 | 1 | -5/+22 |
| | | | | | | | | | | | | | | | | | | When overwriting shared files as recipient, the part file is written on the uploader's storage before overwriting the target file. If the uploader has no quota left, they should still be able to overwrite that file with Webdav. To make this work, they need to be able to write the part file to their own storage first. | ||||
| * | allow putting the part file in the view root | Robin Appelman | 2016-03-01 | 1 | -6/+17 |
| | | |||||
* | | Fixing CodeChecker usage :see_no_evil: | Thomas Müller | 2016-03-01 | 1 | -1/+4 |
|/ | |||||
* | Merge pull request #22325 from owncloud/dav-upload-scan-in-lock-82 | Vincent Petry | 2016-03-01 | 1 | -5/+5 |
|\ | | | | | [8.2] scan the file in the write lock when uploading over dav | ||||
| * | scan the file in the write lock when uploading over dav | Robin Appelman | 2016-02-11 | 1 | -5/+5 |
| | | |||||
* | | Merge pull request #22705 from ↵ | Morris Jobke | 2016-03-01 | 1 | -2/+19 |
|\ \ | | | | | | | | | | | | | owncloud/backport-22677-theme-overwriting-language [8.2] Allow to overwrite a single language string via the theme folder | ||||
| * | | Allow to overwrite a single language string via the theme folder | Joas Schilling | 2016-02-29 | 1 | -2/+19 |
| | | | |||||
* | | | Merge pull request #22657 from owncloud/stable8.2-backport-21854 | Vincent Petry | 2016-03-01 | 1 | -0/+17 |
|\ \ \ | |/ / |/| | | [stable8.2] Fix addUserToGroup hook of the share code | ||||
| * | | Fix addUserToGroup hook of the share code | Morris Jobke | 2016-02-25 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | * sets up the filesystem of the user that is added to a group to properly accept shares * fixes #18499 | ||||
* | | | Merge pull request #22676 from owncloud/fed-share-etag-82 | Morris Jobke | 2016-02-26 | 2 | -8/+28 |
|\ \ \ | |/ / |/| | | [8.2] use the default view for propagation if possible | ||||
| * | | use the default view for propagation if possible | Robin Appelman | 2016-02-26 | 2 | -8/+28 |
| | | | |||||
* | | | Merge pull request #22633 from owncloud/stable8.2-backport-22565 | Vincent Petry | 2016-02-25 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | [stable8.2] Avoids scanning the root storage | ||||
| * | | Avoids scanning the root storage | Morris Jobke | 2016-02-24 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This check will skip the background scan for the root storage because there is nothing in the root storage that isn't already in another (mostly user-) storage. Fixes #22501 | ||||
* | | | recalculate unencrypted size if we assume that the size stored in the db is ↵ | Bjoern Schiessle | 2016-02-25 | 1 | -3/+129 |
|/ / | | | | | | | not correct | ||||
* / | Fix BMP support | Morris Jobke | 2016-02-14 | 1 | -0/+1 |
|/ | | | | * fixes #16461 | ||||
* | Introduce some mimetypes for richdocuments | Faruk Uzun | 2016-02-08 | 1 | -0/+17 |
| | | | | | | | | | * application/vnd.lotus-wordpro * application/vnd.visio * application/vnd.wordperfect * application/msonenote Backport of #21766 | ||||
* | When a user is removed we should remove the right shares | Roeland Jago Douma | 2016-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | * This means all the shares directly shared with them * Or all group shares having a special share with them This patch fixes the operator precedece (AND before OR). So before this patch: (share_with = <deleted user> AND share_type = 0) OR share_type=2 So it deleted all user specific shares Now: share_with = <deleted user> AND (share_type = 0 OR (share_type=2) | ||||
* | Merge pull request #22047 from owncloud/stable8.2-backport-21953 | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ | | | | | [stable8.2] Make enable_avatars setting more robust | ||||
| * | Make enable_avatars setting more robust | Morris Jobke | 2016-02-01 | 1 | -1/+1 |
| | | | | | | | | | | * handles the setting in the same way everywhere * fixes #21949 | ||||
* | | Remove other broken usages in deprecated methods | Joas Schilling | 2016-01-29 | 1 | -35/+3 |
| | | |||||
* | | Deprecate the method and warn against using it | Joas Schilling | 2016-01-29 | 2 | -0/+4 |
|/ | | | | | Conflicts: lib/private/backgroundjob/joblist.php | ||||
* | Add message key to context of logException | Thomas Müller | 2016-01-20 | 3 | -3/+15 |
| | |||||
* | use logException() to properly log the exception | Morris Jobke | 2016-01-20 | 1 | -1/+2 |
| | |||||
* | Improved error message for failing background job | Morris Jobke | 2016-01-20 | 1 | -1/+1 |
| | |||||
* | Handle return code of streamCopy in WebDAV put | Morris Jobke | 2016-01-16 | 1 | -1/+9 |
| | | | | * throw a different exception if streamCopy failed | ||||
* | Merge pull request #21666 from owncloud/smb-statcache-cap-82 | Vincent Petry | 2016-01-13 | 1 | -0/+87 |
|\ | | | | | [8.2] cap the number of entries we cache in smb's statcache | ||||
| * | cap the number of entries we cache in smb's statcache | Robin Appelman | 2016-01-12 | 1 | -0/+87 |
| | | |||||
* | | Use ISession::clear | Lukas Reschke | 2016-01-10 | 1 | -3/+1 |
| | | | | | | | | The native approach using the PHP calls will not work properly with the cryptowrapper and thus this code is effectively doing nothing at the moment. | ||||
* | | Merge pull request #21539 from endocode/kayrus/cookies_auth_fix | Thomas Müller | 2016-01-08 | 1 | -1/+4 |
|\ \ | | | | | | | [stable8.2] Fixed double file upload on failed auth using WebDAV | ||||
| * | | Fixed double file upload on failed auth using WebDAV | kayrus | 2016-01-08 | 1 | -1/+4 |
| |/ | | | | | | | | | Backport of this fix: https://github.com/owncloud/core/pull/21491 Fixes https://github.com/owncloud/core/issues/21486 | ||||
* | | Merge pull request #21118 from owncloud/makeurltypeconfigurable | Thomas Müller | 2016-01-08 | 1 | -2/+7 |
|\ \ | | | | | | | [stable8.2] make swift url type configurable | ||||
| * | | add isset for optional params | Jörn Friedrich Dreyer | 2016-01-07 | 1 | -2/+3 |
| | | | |||||
| * | | make url type configurable | Jörn Friedrich Dreyer | 2015-12-10 | 1 | -1/+5 |
| | | | |||||
* | | | Merge pull request #21265 from owncloud/backport20996-remove-password-reset | Morris Jobke | 2016-01-05 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | Backport 20996 remove password reset | ||||
| * | | | Fix missing import of IUser | Joas Schilling | 2016-01-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Check if user isset in $_REQUEST first | Robin Appelman | 2015-12-17 | 1 | -3/+5 |
| | | | | |||||
| * | | | Allow specifying a custom reset-password-url | Joas Schilling | 2015-12-17 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | Conflicts: core/js/config.php |