summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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 #23311 from owncloud/check-syntax-travis-stable8.1Morris Jobke2016-03-172-0/+29
|\ \ | | | | | | [stable8.1] Execute parallel-lint
| * | [stable8.1] Execute parallel-lintLukas Reschke2016-03-172-0/+29
|/ / | | | | | | Backport of https://github.com/owncloud/core/pull/22994 and https://github.com/owncloud/core/pull/23303
* | Merge pull request #23301 from owncloud/fix-video-viewerMorris Jobke2016-03-162-0/+83
|\ \ | | | | | | [stable8.1] Backport OC.joinPaths to fix the Video Viewer
| * | More tests for joinPathsVincent Petry2016-03-161-0/+3
| | |
| * | Add OC.joinPaths for convenient path joiningVincent Petry2016-03-162-0/+80
|/ /
* | Merge pull request #23267 from owncloud/fix_22907_8.1Morris Jobke2016-03-162-2/+42
|\ \ | |/ |/| allow group shares, even if not all public keys are available
| * allow group shares, even if not all public keys are availableBjoern Schiessle2016-03-152-2/+42
|/
* Merge pull request #22946 from owncloud/backport-22800-stable8.1Thomas Müller2016-03-141-0/+3
|\ | | | | [8.1] don't hide server not available exception, fixes #20536
| * don't hide server not available exception, fixes #20536Arthur Schiwon2016-03-081-0/+3
| |
* | Merge pull request #23149 from owncloud/stable8.1-fix-broken-interfaceVincent Petry2016-03-141-1/+1
|\ \ | | | | | | [stable8.1] Fix broken scanner call in ajax/scan.php
| * | Fix broken scanner call in ajax/scan.phpMorris Jobke2016-03-111-1/+1
|/ /
* | Merge pull request #22843 from owncloud/stable81_22830Morris Jobke2016-03-092-3/+3
|\ \ | | | | | | [Stable 8.1] Rename and move permissions are set when a file is updatable
| * | Rename and move permissions are set when a file is updatableRoeland Jago Douma2016-03-042-3/+3
| | | | | | | | | | | | * Fix unit tests
* | | 8.1.6v8.1.6C Montero-Luque2016-03-081-2/+2
| |/ |/|
* | 8.1.6 RC2v8.1.6RC2C Montero-Luque2016-03-041-2/+2
| |
* | Merge pull request #22863 from owncloud/stable8.1-trashbin-checkpathC. Montero Luque2016-03-041-1/+1
|\ \ | |/ |/| [stable8.1] Properly check path validity before deleting to trash
| * 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.
* 8.1.6 RC1v8.1.6RC1C Montero-Luque2016-03-012-3/+3
|
* Merge pull request #22409 from ↵Thomas Müller2016-03-011-0/+2
|\ | | | | | | | | owncloud/stable8.1-gdrive-reindexarraytoduetoduplicates [stable8.1] Reindex array in GDrive after removing duplicates
| * Reindex array in GDrive after removing duplicatesVincent Petry2016-02-151-0/+2
| | | | | | | | | | | | | | | | Whenever duplicates are removed from the array, the indices are not in sequence. This seems to cause trouble with opendir/the dir wrapper and make it skip valid entries. This fix reindexes the array to make it work.
* | Merge pull request #22617 from owncloud/backport-22358-stable8.1Morris Jobke2016-03-014-5/+32
|\ \ | | | | | | [backport][stable8.1] Fix race condition when switching filter mode
| * | Fix race condition when switching filter mode. Fixes #22278Arthur Schiwon2016-02-244-5/+32
| | |
* | | Merge pull request #22630 from owncloud/stable8.1-fedshare-testremote-after-404Roeland Douma2016-02-291-0/+3
|\ \ \ | | | | | | | | [stable8.1] Properly trigger testRemote after getting a 404 from remote fed share
| * | | Properly trigger testRemote after getting a 404 from remote fed shareVincent Petry2016-02-241-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Whenever a remote fed share's shareinfo call returns a 404, don't directly assume the storage is not available by throwing StorageNotAvailableException. We need to properly throw NotFoundException to trigger the later logic that calls testRemote() that verifies that the 404 is not from a broken server but really from an obsolete share.
* | | Merge pull request #22634 from owncloud/stable8.1-backport-22565Vincent Petry2016-02-251-0/+4
|\ \ \ | | | | | | | | [stable8.1] Avoids scanning the root storage
| * | | Avoids scanning the root storageMorris Jobke2016-02-241-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
* | | Merge pull request #22632 from owncloud/stable8.1-backport-18762Morris Jobke2016-02-252-4/+4
|\ \ \ | | | | | | | | [stable8.1] Use "json_encode" and "json_decode" instead of unserialize
| * | | [user_ldap] properly decode cached objectsMorris Jobke2016-02-241-1/+1
| | | | | | | | | | | | | | | | * fixes #21896
| * | | Use "json_encode" and "json_decode" instead of unserializeLukas Reschke2016-02-242-4/+4
| |/ /
* | | Merge pull request #22627 from owncloud/fix_broken_unencrypted_size_8.1Björn Schießle2016-02-252-4/+286
|\ \ \ | |/ / |/| | [stable8.1] Heal unencrypted file sizes at download time
| * | recalculate unencrypted size if we assume that the size stored in the db is ↵Bjoern Schiessle2016-02-252-4/+286
|/ / | | | | | | not correct
* | Merge pull request #22572 from owncloud/stable8.1-backport-21544Morris Jobke2016-02-241-0/+3
|\ \ | | | | | | [stable8.1] set etag and permission fields for trashbin entries
| * | set etag and permission fields for trashbin entriesRobin Appelman2016-02-221-0/+3
| | |
* | | Merge pull request #22558 from owncloud/backport-22496-share-group-problem-8.1Roeland Douma2016-02-221-1/+1
|\ \ \ | |/ / |/| | [8.1] Fix on shared groups assignment.
| * | Fix on shared groups assignment.Leonardo Diez2016-02-221-1/+1
|/ /
* | Merge pull request #22373 from owncloud/stable8.1-backport-22369Morris Jobke2016-02-161-0/+1
|\ \ | | | | | | [stable8.1] Fix BMP support
| * | Fix BMP supportMorris Jobke2016-02-141-0/+1
| |/ | | | | | | * fixes #16461
* | Merge pull request #22363 from owncloud/backport-20152-stable8.1Roeland Douma2016-02-151-4/+4
|\ \ | |/ |/| [stable8.1] Remove invalid type-cast
| * Remove invalid type-castLukas Reschke2016-02-131-4/+4
|/ | | | | | This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required. Fixes https://github.com/owncloud/core/issues/20095
* Merge pull request #22173 from owncloud/stable8.1-backport-22143Morris Jobke2016-02-061-1/+1
|\ | | | | [Stable 8.1] When a user is removed we should remove the right shares
| * When a user is removed we should remove the right sharesRoeland Jago Douma2016-02-051-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 #21864 from owncloud/sync-certificates-with-upstream-81Morris Jobke2016-01-251-119/+60
|\ | | | | [stable8.1] Sync certificates with upstream
| * Sync certificates with upstreamLukas Reschke2016-01-221-119/+60
|/
* Merge pull request #21748 from owncloud/stable8.1-backport-20927Thomas Müller2016-01-181-1/+9
|\ | | | | [stable8.1] Handle return code of streamCopy in WebDAV put
| * Handle return code of streamCopy in WebDAV putMorris Jobke2016-01-151-1/+9
|/ | | | * throw a different exception if streamCopy failed
* Merge pull request #21694 from owncloud/stable8.1-users-scrolltopThomas Müller2016-01-151-1/+8
|\ | | | | [stable8.1] Keep scroll position in users page when sorting
| * Keep scroll position in users page when sortingVincent Petry2016-01-131-1/+8
|/ | | | | | | | When sorting, some browsers like Chrome will lose the scroll position, possibly because the sorting code is touching the DOM elements. This fix saves the scroll position before sorting and sets it back afterwards.
* Merge pull request #21665 from owncloud/smb-statcache-cap-81Vincent Petry2016-01-134-2/+163
|\ | | | | [8.1] cap the number of entries we cache in smb's statcache
| * cap the number of entries we cache in smb's statcacheRobin Appelman2016-01-124-2/+163
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-12 22:51:26 +0000