Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24243 from owncloud/stable8.2-backport-24052 | blizzz | 2016-04-26 | 6 | -48/+32 |
|\ | | | | | [stable8.2] Fix LDAP race conditions | ||||
| * | Fix LDAP race conditions | Morris Jobke | 2016-04-25 | 6 | -48/+32 |
| | | | | | | | | | | | | | | | | * getFromCache is wrapped in isCached * inbetween the two calls the cache entry hits it's TTL * getFromCache returns null * this fix only checkes if the returned value is null and return only non-null values | ||||
* | | on clone Connection, do not take over the existing LDAP resource | Arthur Schiwon | 2016-04-25 | 2 | -11/+3 |
|/ | | | | | | | For one, it solves potential conflicts when using the resource. For the other, one on the login check (the only place where a clone happens currently) we do not need to rebind after confirming the user's login was successful. | ||||
* | Merge pull request #24144 from ↵ | blizzz | 2016-04-23 | 1 | -1/+1 |
|\ | | | | | | | | | owncloud/stable8.2-filelist-redirectonstoragenotavailable Fix StorageNotAvailable exception string detection | ||||
| * | Fix StorageNotAvailable exception string detection | Vincent Petry | 2016-04-21 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #24113 from ↵ | Thomas Müller | 2016-04-21 | 3 | -56/+80 |
|\ \ | |/ |/| | | | | | owncloud/backport-24111-chunking-users-in-background-jobs-8.2 [8.2] Chunk the users correctly in the trashbin and versions background job | ||||
| * | Copy the 9.0 method for the background jobs | Joas Schilling | 2016-04-20 | 2 | -2/+58 |
| | | |||||
| * | Chunk the users correctly in the trashbin and versions background job | Joas Schilling | 2016-04-20 | 3 | -56/+24 |
| | | |||||
* | | Merge pull request #23984 from owncloud/fix-infinite-loop-in-unavailable-mount | Morris Jobke | 2016-04-20 | 1 | -1/+2 |
|\ \ | | | | | | | [stable8.2] Fixes a possible infinite change-dir-loop | ||||
| * | | Fixes a possible infinite change-dir-loop | Arthur Schiwon | 2016-04-13 | 1 | -1/+2 |
| | | | | | | | | | | | | Those can occure when browsing in a mount that got unavailable | ||||
* | | | Merge pull request #24100 from owncloud/fix_23632_8.2 | Björn Schießle | 2016-04-20 | 2 | -10/+48 |
|\ \ \ | | | | | | | | | [stable8.2] init users mount point before recovery | ||||
| * | | | we need to initialize the mount points of the given user before we recover | Björn Schießle | 2016-04-19 | 2 | -10/+48 |
| | |/ | |/| | | | | | | | access to his files | ||||
* | | | Merge pull request #23363 from owncloud/smb-1.0.8-82 | Vincent Petry | 2016-04-20 | 19 | -58/+236 |
|\ \ \ | | | | | | | | | [8.2] update icewind/smb to 1.0.8 | ||||
| * | | | update icewind/smb to 1.0.8 | Robin Appelman | 2016-03-17 | 19 | -58/+236 |
| | | | | |||||
* | | | | Merge pull request #24000 from owncloud/shared-islocal-82 | Vincent Petry | 2016-04-20 | 1 | -0/+7 |
|\ \ \ \ | | | | | | | | | | | [8.2] implement isLocal for shared storage | ||||
| * | | | | implement isLocal for shared storage | Robin Appelman | 2016-04-14 | 1 | -0/+7 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #23402 from owncloud/backport-23282-stable8.2 | Vincent Petry | 2016-04-20 | 2 | -3/+89 |
|\ \ \ \ | |/ / / |/| | | | [stable8.2] fix writing to cache when fallback server should be used immediately | ||||
| * | | | fix writing to cache when fallback server should be used immediately | Arthur Schiwon | 2016-03-18 | 2 | -3/+89 |
| | | | | |||||
* | | | | Merge pull request #23505 from owncloud/ee-1149-share-propagation-entries-in-db | Vincent Petry | 2016-03-23 | 1 | -2/+40 |
|\ \ \ \ | | | | | | | | | | | Grab the values for share propagation manually from the DB | ||||
| * | | | | Chunk the shareId query | Joas Schilling | 2016-03-23 | 1 | -7/+12 |
| | | | | | |||||
| * | | | | Grab the values for share propagation manually from the DB | Joas Schilling | 2016-03-23 | 1 | -2/+35 |
| | | | | | |||||
* | | | | | Merge pull request #23457 from owncloud/backport-23329-stable8.2 | Morris Jobke | 2016-03-23 | 2 | -1/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | [stable8.2] Avatar must be saved after login is done and external storages set up… | ||||
| * | | | | Avatar must be saved after login is done and external storages set up ↵ | Arthur Schiwon | 2016-03-21 | 2 | -1/+17 |
| |/ / / | | | | | | | | | | | | | properly, fixes #21555 | ||||
* / / / | handle forbidden exceptions in smb backend | Robin Appelman | 2016-03-22 | 1 | -1/+18 |
|/ / / | |||||
* | | | Merge pull request #22766 from owncloud/ceph-keystone-readiness-stable8.2 | Vincent Petry | 2016-03-18 | 10 | -23/+230 |
|\ \ \ | | | | | | | | | Synchronise files_external and objectstore Docker tests with master | ||||
| * | | | Synchronise files_external and objectstore Docker tests with master | Robin McCorkell | 2016-03-01 | 10 | -23/+230 |
| | | | | | | | | | | | | | | | | Checkout files from 4d69e562a065a79461343444a842ada025f3643c | ||||
* | | | | Set proper public webdav permissions when public upload disabled | Roeland Jago Douma | 2016-03-17 | 1 | -0/+5 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23325 It can happen that a user shares a folder with public upload. And some time later the admin disables public upload on the server. To make sure this is handled correctly we need to check the config value and reduce the permissions. Fix is kept small to be easy backportable. | ||||
* | | | Merge pull request #23234 from owncloud/stable8.2-fix_21678 | Morris Jobke | 2016-03-16 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | [stable8.2] Gracefull handle link shares rename hook | ||||
| * | | | Gracefull handle link shares rename hook | Roeland Jago Douma | 2016-03-14 | 1 | -0/+6 |
| | |/ | |/| | | | | | | | | | | | | | | | | Fixes #21678 The hook is called on all renames. However when we use a link share the getUserFolder fails. We now just opt out. | ||||
* | | | allow group shares, even if not all public keys are available | Bjoern Schiessle | 2016-03-15 | 2 | -2/+42 |
| | | | |||||
* | | | Remove disabled autocorrect for new file names | Morris Jobke | 2016-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | * ref #22784 | ||||
* | | | Merge pull request #22923 from owncloud/stable8.2-share-archivenamedownloadall | Morris Jobke | 2016-03-09 | 2 | -3/+5 |
|\ \ \ | | | | | | | | | [stable8.2] Fix archive file name when downloading public share | ||||
| * | | | Remove "files" arg from download URL in public link page | Vincent Petry | 2016-03-07 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | When no files were specified for download, it means folder download. In this case, no need to pass an empty "files" argument. | ||||
| * | | | Fix archive file name when downloading public share | Vincent Petry | 2016-03-07 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | When download a public link share folder using the button on the top right, it doesn't provide a list of files. This fix makes sure to trigger the correct logic when no file list was given. | ||||
* | | | Merge pull request #22935 from owncloud/stable8.2-remove-wrongly-backported-test | Morris Jobke | 2016-03-09 | 2 | -57/+1 |
|\ \ \ | | | | | | | | | Remove wrongly backported test | ||||
| * | | | Fix casing - causes failure on php 5.4 | Thomas Müller | 2016-03-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove wrongly backported test | Morris Jobke | 2016-03-08 | 1 | -56/+0 |
| |/ / | | | | | | | | | | * backported with #22752 | ||||
* / / | Remove browser autocomplete in new file menu | Vincent Petry | 2016-03-07 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #22868 from owncloud/stable8.2-backport-22865 | C. Montero Luque | 2016-03-04 | 4 | -1/+82 |
|\ \ | | | | | | | [stable8.2] Run cleanup of expired DB file locks to background job | ||||
| * | | Run cleanup of expired DB file locks to background job | Morris Jobke | 2016-03-04 | 4 | -1/+82 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | * 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. | ||||
* / | Properly check path validity before deleting to trash | Vincent Petry | 2016-03-04 | 1 | -1/+1 |
|/ | | | | | This prevents deleting the whole "files" folder of the user whenever $ownerPath is empty. This can happen in concurrency situations. | ||||
* | allow putting the part file in the view root | Robin Appelman | 2016-03-01 | 1 | -0/+56 |
| | |||||
* | Merge pull request #22665 from owncloud/backport-22599-stable8.2 | Thomas Müller | 2016-02-29 | 1 | -2/+2 |
|\ | | | | | [backport] [stable8.2] take the first result of that array, if present. Fixes 2nd display na… | ||||
| * | take the first result of that array, if present. Fixes 2nd display name to ↵ | Arthur Schiwon | 2016-02-26 | 1 | -2/+2 |
| | | | | | | | | be 'Array', if cache is configured and enabled. | ||||
* | | Skip users with no trashbin | Victor Dubiniuk | 2016-02-26 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #22676 from owncloud/fed-share-etag-82 | Morris Jobke | 2016-02-26 | 1 | -0/+50 |
|\ \ | |/ |/| | [8.2] use the default view for propagation if possible | ||||
| * | Add test for owner etag propagation | Robin Appelman | 2016-02-26 | 1 | -0/+50 |
| | | |||||
* | | Merge pull request #22649 from owncloud/external-share-manager-82 | Thomas Müller | 2016-02-25 | 1 | -3/+4 |
|\ \ | | | | | | | inject the correct external share manager into the storage | ||||
| * | | inject the correct external share manager into the storage | Robin Appelman | 2016-02-25 | 1 | -3/+4 |
| |/ | |||||
* | | Merge pull request #22629 from owncloud/stable8.2-fedshare-testremote-after-404 | Thomas Müller | 2016-02-25 | 1 | -0/+3 |
|\ \ | |/ |/| | [stable8.2] Properly trigger testRemote after getting a 404 from remote fed share |