summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24243 from owncloud/stable8.2-backport-24052blizzz2016-04-266-48/+32
|\ | | | | [stable8.2] Fix LDAP race conditions
| * Fix LDAP race conditionsMorris Jobke2016-04-256-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 resourceArthur Schiwon2016-04-252-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 ↵blizzz2016-04-231-1/+1
|\ | | | | | | | | owncloud/stable8.2-filelist-redirectonstoragenotavailable Fix StorageNotAvailable exception string detection
| * Fix StorageNotAvailable exception string detectionVincent Petry2016-04-211-1/+1
| |
* | Merge pull request #24113 from ↵Thomas Müller2016-04-213-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 jobsJoas Schilling2016-04-202-2/+58
| |
| * Chunk the users correctly in the trashbin and versions background jobJoas Schilling2016-04-203-56/+24
| |
* | Merge pull request #23984 from owncloud/fix-infinite-loop-in-unavailable-mountMorris Jobke2016-04-201-1/+2
|\ \ | | | | | | [stable8.2] Fixes a possible infinite change-dir-loop
| * | Fixes a possible infinite change-dir-loopArthur Schiwon2016-04-131-1/+2
| | | | | | | | | | | | Those can occure when browsing in a mount that got unavailable
* | | Merge pull request #24100 from owncloud/fix_23632_8.2Björn Schießle2016-04-202-10/+48
|\ \ \ | | | | | | | | [stable8.2] init users mount point before recovery
| * | | we need to initialize the mount points of the given user before we recoverBjörn Schießle2016-04-192-10/+48
| | |/ | |/| | | | | | | access to his files
* | | Merge pull request #23363 from owncloud/smb-1.0.8-82Vincent Petry2016-04-2019-58/+236
|\ \ \ | | | | | | | | [8.2] update icewind/smb to 1.0.8
| * | | update icewind/smb to 1.0.8Robin Appelman2016-03-1719-58/+236
| | | |
* | | | Merge pull request #24000 from owncloud/shared-islocal-82Vincent Petry2016-04-201-0/+7
|\ \ \ \ | | | | | | | | | | [8.2] implement isLocal for shared storage
| * | | | implement isLocal for shared storageRobin Appelman2016-04-141-0/+7
| | |/ / | |/| |
* | | | Merge pull request #23402 from owncloud/backport-23282-stable8.2Vincent Petry2016-04-202-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 immediatelyArthur Schiwon2016-03-182-3/+89
| | | |
* | | | Merge pull request #23505 from owncloud/ee-1149-share-propagation-entries-in-dbVincent Petry2016-03-231-2/+40
|\ \ \ \ | | | | | | | | | | Grab the values for share propagation manually from the DB
| * | | | Chunk the shareId queryJoas Schilling2016-03-231-7/+12
| | | | |
| * | | | Grab the values for share propagation manually from the DBJoas Schilling2016-03-231-2/+35
| | | | |
* | | | | Merge pull request #23457 from owncloud/backport-23329-stable8.2Morris Jobke2016-03-232-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 Schiwon2016-03-212-1/+17
| |/ / / | | | | | | | | | | | | properly, fixes #21555
* / / / handle forbidden exceptions in smb backendRobin Appelman2016-03-221-1/+18
|/ / /
* | | Merge pull request #22766 from owncloud/ceph-keystone-readiness-stable8.2Vincent Petry2016-03-1810-23/+230
|\ \ \ | | | | | | | | Synchronise files_external and objectstore Docker tests with master
| * | | Synchronise files_external and objectstore Docker tests with masterRobin McCorkell2016-03-0110-23/+230
| | | | | | | | | | | | | | | | Checkout files from 4d69e562a065a79461343444a842ada025f3643c
* | | | Set proper public webdav permissions when public upload disabledRoeland Jago Douma2016-03-171-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_21678Morris Jobke2016-03-161-0/+6
|\ \ \ | | | | | | | | [stable8.2] Gracefull handle link shares rename hook
| * | | Gracefull handle link shares rename hookRoeland Jago Douma2016-03-141-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 availableBjoern Schiessle2016-03-152-2/+42
| | |
* | | Remove disabled autocorrect for new file namesMorris Jobke2016-03-091-1/+1
| | | | | | | | | | | | * ref #22784
* | | Merge pull request #22923 from owncloud/stable8.2-share-archivenamedownloadallMorris Jobke2016-03-092-3/+5
|\ \ \ | | | | | | | | [stable8.2] Fix archive file name when downloading public share
| * | | Remove "files" arg from download URL in public link pageVincent Petry2016-03-071-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 shareVincent Petry2016-03-071-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-testMorris Jobke2016-03-092-57/+1
|\ \ \ | | | | | | | | Remove wrongly backported test
| * | | Fix casing - causes failure on php 5.4Thomas Müller2016-03-081-1/+1
| | | |
| * | | Remove wrongly backported testMorris Jobke2016-03-081-56/+0
| |/ / | | | | | | | | | * backported with #22752
* / / Remove browser autocomplete in new file menuVincent Petry2016-03-071-1/+1
|/ /
* | Merge pull request #22868 from owncloud/stable8.2-backport-22865C. Montero Luque2016-03-044-1/+82
|\ \ | | | | | | [stable8.2] Run cleanup of expired DB file locks to background job
| * | Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-044-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 trashVincent Petry2016-03-041-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 rootRobin Appelman2016-03-011-0/+56
|
* Merge pull request #22665 from owncloud/backport-22599-stable8.2Thomas Müller2016-02-291-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 Schiwon2016-02-261-2/+2
| | | | | | | | be 'Array', if cache is configured and enabled.
* | Skip users with no trashbinVictor Dubiniuk2016-02-261-0/+6
| |
* | Merge pull request #22676 from owncloud/fed-share-etag-82Morris Jobke2016-02-261-0/+50
|\ \ | |/ |/| [8.2] use the default view for propagation if possible
| * Add test for owner etag propagationRobin Appelman2016-02-261-0/+50
| |
* | Merge pull request #22649 from owncloud/external-share-manager-82Thomas Müller2016-02-251-3/+4
|\ \ | | | | | | inject the correct external share manager into the storage
| * | inject the correct external share manager into the storageRobin Appelman2016-02-251-3/+4
| |/
* | Merge pull request #22629 from owncloud/stable8.2-fedshare-testremote-after-404Thomas Müller2016-02-251-0/+3
|\ \ | |/ |/| [stable8.2] Properly trigger testRemote after getting a 404 from remote fed share