Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | [stable8.1] Ignore certificate file if it starts with file:// | Lukas Reschke | 2016-04-21 | 2 | -0/+15 | |
|/ | ||||||
* | Merge pull request #24146 from ↵ | Thomas Müller | 2016-04-21 | 1 | -1/+8 | |
|\ | | | | | | | | | owncloud/stable8.1-quota-recognizeremoteunlimitedquota [stable8.1] 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-04-21 | 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) | |||||
* | Merge pull request #24101 from owncloud/fix_23632_8.1 | Björn Schießle | 2016-04-20 | 2 | -10/+48 | |
|\ | | | | | [stable8.1] 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 #24042 from owncloud/stable8.1-autoload | Morris Jobke | 2016-04-18 | 1 | -1/+1 | |
|\ | | | | | [stable8.1] Exclude autoload_static.php | |||||
| * | Exclude autoload_static.php | Lukas Reschke | 2016-04-17 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #23236 from owncloud/stable8.1-fix_21678 | Vincent Petry | 2016-03-18 | 1 | -0/+6 | |
|\ | | | | | [stable8.1] 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. | |||||
* | | Merge pull request #23353 from owncloud/stable8.1_backport_23346 | Thomas Müller | 2016-03-17 | 1 | -0/+5 | |
|\ \ | | | | | | | [Stable 8.1] Set proper public webdav permissions when public upload disabled | |||||
| * | | 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 #23311 from owncloud/check-syntax-travis-stable8.1 | Morris Jobke | 2016-03-17 | 2 | -0/+29 | |
|\ \ | | | | | | | [stable8.1] Execute parallel-lint | |||||
| * | | [stable8.1] Execute parallel-lint | Lukas Reschke | 2016-03-17 | 2 | -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-viewer | Morris Jobke | 2016-03-16 | 2 | -0/+83 | |
|\ \ | | | | | | | [stable8.1] Backport OC.joinPaths to fix the Video Viewer | |||||
| * | | More tests for joinPaths | Vincent Petry | 2016-03-16 | 1 | -0/+3 | |
| | | | ||||||
| * | | Add OC.joinPaths for convenient path joining | Vincent Petry | 2016-03-16 | 2 | -0/+80 | |
|/ / | ||||||
* | | Merge pull request #23267 from owncloud/fix_22907_8.1 | Morris Jobke | 2016-03-16 | 2 | -2/+42 | |
|\ \ | |/ |/| | allow group shares, even if not all public keys are available | |||||
| * | allow group shares, even if not all public keys are available | Bjoern Schiessle | 2016-03-15 | 2 | -2/+42 | |
|/ | ||||||
* | Merge pull request #22946 from owncloud/backport-22800-stable8.1 | Thomas Müller | 2016-03-14 | 1 | -0/+3 | |
|\ | | | | | [8.1] 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 | |
| | | ||||||
* | | Merge pull request #23149 from owncloud/stable8.1-fix-broken-interface | Vincent Petry | 2016-03-14 | 1 | -1/+1 | |
|\ \ | | | | | | | [stable8.1] Fix broken scanner call in ajax/scan.php | |||||
| * | | Fix broken scanner call in ajax/scan.php | Morris Jobke | 2016-03-11 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #22843 from owncloud/stable81_22830 | Morris Jobke | 2016-03-09 | 2 | -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 updatable | Roeland Jago Douma | 2016-03-04 | 2 | -3/+3 | |
| | | | | | | | | | | | | * Fix unit tests | |||||
* | | | 8.1.6v8.1.6 | C Montero-Luque | 2016-03-08 | 1 | -2/+2 | |
| |/ |/| | ||||||
* | | 8.1.6 RC2v8.1.6RC2 | C Montero-Luque | 2016-03-04 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #22863 from owncloud/stable8.1-trashbin-checkpath | C. Montero Luque | 2016-03-04 | 1 | -1/+1 | |
|\ \ | |/ |/| | [stable8.1] Properly check path validity before deleting to trash | |||||
| * | 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. | |||||
* | 8.1.6 RC1v8.1.6RC1 | C Montero-Luque | 2016-03-01 | 2 | -3/+3 | |
| | ||||||
* | Merge pull request #22409 from ↵ | Thomas Müller | 2016-03-01 | 1 | -0/+2 | |
|\ | | | | | | | | | owncloud/stable8.1-gdrive-reindexarraytoduetoduplicates [stable8.1] Reindex array in GDrive after removing duplicates | |||||
| * | Reindex array in GDrive after removing duplicates | Vincent Petry | 2016-02-15 | 1 | -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.1 | Morris Jobke | 2016-03-01 | 4 | -5/+32 | |
|\ \ | | | | | | | [backport][stable8.1] Fix race condition when switching filter mode | |||||
| * | | Fix race condition when switching filter mode. Fixes #22278 | Arthur Schiwon | 2016-02-24 | 4 | -5/+32 | |
| | | | ||||||
* | | | Merge pull request #22630 from owncloud/stable8.1-fedshare-testremote-after-404 | Roeland Douma | 2016-02-29 | 1 | -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 share | Vincent Petry | 2016-02-24 | 1 | -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-22565 | Vincent Petry | 2016-02-25 | 1 | -0/+4 | |
|\ \ \ | | | | | | | | | [stable8.1] 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 | |||||
* | | | Merge pull request #22632 from owncloud/stable8.1-backport-18762 | Morris Jobke | 2016-02-25 | 2 | -4/+4 | |
|\ \ \ | | | | | | | | | [stable8.1] Use "json_encode" and "json_decode" instead of unserialize | |||||
| * | | | [user_ldap] properly decode cached objects | Morris Jobke | 2016-02-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | * fixes #21896 | |||||
| * | | | Use "json_encode" and "json_decode" instead of unserialize | Lukas Reschke | 2016-02-24 | 2 | -4/+4 | |
| |/ / | ||||||
* | | | Merge pull request #22627 from owncloud/fix_broken_unencrypted_size_8.1 | Björn Schießle | 2016-02-25 | 2 | -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 Schiessle | 2016-02-25 | 2 | -4/+286 | |
|/ / | | | | | | | not correct | |||||
* | | Merge pull request #22572 from owncloud/stable8.1-backport-21544 | Morris Jobke | 2016-02-24 | 1 | -0/+3 | |
|\ \ | | | | | | | [stable8.1] set etag and permission fields for trashbin entries | |||||
| * | | set etag and permission fields for trashbin entries | Robin Appelman | 2016-02-22 | 1 | -0/+3 | |
| | | | ||||||
* | | | Merge pull request #22558 from owncloud/backport-22496-share-group-problem-8.1 | Roeland Douma | 2016-02-22 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | [8.1] Fix on shared groups assignment. | |||||
| * | | Fix on shared groups assignment. | Leonardo Diez | 2016-02-22 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #22373 from owncloud/stable8.1-backport-22369 | Morris Jobke | 2016-02-16 | 1 | -0/+1 | |
|\ \ | | | | | | | [stable8.1] Fix BMP support | |||||
| * | | Fix BMP support | Morris Jobke | 2016-02-14 | 1 | -0/+1 | |
| |/ | | | | | | | * fixes #16461 | |||||
* | | Merge pull request #22363 from owncloud/backport-20152-stable8.1 | Roeland Douma | 2016-02-15 | 1 | -4/+4 | |
|\ \ | |/ |/| | [stable8.1] Remove invalid type-cast | |||||
| * | Remove invalid type-cast | Lukas Reschke | 2016-02-13 | 1 | -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 |