summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17690 from owncloud/stable8.1-repair-ocs-idsThomas Müller2015-07-174-2/+198
|\ | | | | [stable8.1] Add repair step for outdated OCS IDs
| * Prefer OCS Id from databaseLukas Reschke2015-07-171-0/+6
| | | | | | | | To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id.
| * Add repair step for outdated OCS IDsLukas Reschke2015-07-163-2/+192
| | | | | | | | | | | | There is the case where OCs IDs might become outdated such as it has been with the calendar and contacts app which refer to the old dummy entry. This means that users with the old OCS id can't update updates as well will receive invalid state flags. (e.g. "experimental" instead of "approved") To allow instances to properly update the applications in the future we need to migrate the OCS IDs for now manually.
* | Merge pull request #17678 from ↵Thomas Müller2015-07-175-8/+73
|\ \ | | | | | | | | | | | | owncloud/backport-encryption_migration_improvements-stable8.1 Backport encryption migration improvements stable8.1
| * | only create new key pair if both keys are missingBjoern Schiessle2015-07-162-7/+68
| | |
| * | only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-163-1/+5
| | |
* | | Merge pull request #17679 from owncloud/backport-fix_trashbin-stable8.1Thomas Müller2015-07-172-2/+62
|\ \ \ | |_|/ |/| | only move real files to the trash bin
| * | only move real files to the trash binBjoern Schiessle2015-07-162-2/+62
| |/
* | Merge pull request #17676 from owncloud/backport-files-scan-user-path-stable8.1Morris Jobke2015-07-161-4/+5
|\ \ | |/ |/| Lock scanner to the given user
| * Lock scanner to the given userRobin Appelman2015-07-161-4/+5
| |
* | Merge pull request #17653 from ↵Morris Jobke2015-07-162-10/+158
|\ \ | |/ |/| | | | | owncloud/backport-17330-share-group-path-exception [stable8.1] Fix the path for users which have an exception for a group share
| * Make sure the owner always has the right pathJoas Schilling2015-07-151-3/+6
| |
| * Add test case when owner renames shared folderVincent Petry2015-07-151-5/+8
| |
| * Add unit test for getUsersSharingFileVincent Petry2015-07-151-0/+127
| | | | | | | | | | This is to test if the user list and paths are correct, even when a recipient renamed the received shared folder
| * Fix the path for users which have an exception for a group shareJoas Schilling2015-07-151-7/+22
| |
* | Merge pull request #17658 from owncloud/share-lock-owner-parent-stable81Vincent Petry2015-07-163-10/+134
|\ \ | | | | | | [8.1] lock parent folders for the owner when locking a shared file as recipient
| * | only lock the parent foldersRobin Appelman2015-07-152-2/+13
| | |
| * | lock parent folders for the owner when locking a shared file as recipientRobin Appelman2015-07-153-10/+123
| | |
* | | Merge pull request #17556 from owncloud/enc_fix_migration_stable8.1Vincent Petry2015-07-162-14/+82
|\ \ \ | | | | | | | | [stable8.1 backport] more secure way to update the database
| * | | more secure way to update the databaseBjoern Schiessle2015-07-102-14/+82
| | | |
* | | | Merge pull request #17294 from owncloud/stable8.1-s2s-catchmoreexceptiontypesMorris Jobke2015-07-161-13/+7
|\ \ \ \ | | | | | | | | | | [stable8.1] Catch more error codes thrown by federated shares
| * | | | Throw storage not available on guzzle errorVincent Petry2015-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the remote server is in maintenance mode, we must throw storage not available exception instead of not found which might auto-remove the share.
| * | | | Catch more error codes thrown by federated sharesVincent Petry2015-07-011-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the time it doesn't make sense to forward Guzzle's RequestException, so we convert it to StorageNotAvailable instead. This prevents unpredictable error codes to block access to unrelated folders needlessly.
* | | | | Merge pull request #17337 from owncloud/stable8.1-backport-17077Morris Jobke2015-07-154-8/+58
|\ \ \ \ \ | |_|_|/ / |/| | | | [stable8.1] fix getting mount points when passing a path to the files:scan command
| * | | | handle invalid results from mount providersRobin Appelman2015-07-021-1/+4
| | | | |
| * | | | handle error during setupRobin Appelman2015-07-021-3/+5
| | | | |
| * | | | add unit testRobin Appelman2015-07-022-2/+48
| | | | |
| * | | | fix getting mount points when passing a path to the files:scan commandRobin Appelman2015-07-021-3/+2
| | | | |
* | | | | Merge pull request #17643 from owncloud/stable8.1-s2s-hasupdated-catch405Morris Jobke2015-07-151-1/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | [stable8.1] Throw StorageNotAvailable if propfind on root failed
| * | | | Throw StorageNotAvailable if propfind on root failedVincent Petry2015-07-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | If PROPFIND fails with 404 or 405 on the remote share root, it means the storage is not available. Throw StorageNotAvailable is such case.
* | | | | Merge pull request #17642 from owncloud/stable8.1-backport-17565Björn Schießle2015-07-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | [stable8.1] allow remote shares for users with email as usernames
| * | | | allow remote shares for users with email as usernamesFelix Böhm2015-07-141-1/+1
|/ / / /
* | | | Merge pull request #17632 from owncloud/stable8.1-backport-17606Vincent Petry2015-07-141-2/+2
|\ \ \ \ | | | | | | | | | | [stable8.1] Handle returned null value in app level code
| * | | | Handle returned null value in app level codeMorris Jobke2015-07-141-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | * getApplication on OCSClient can also return null this is now handled properly * fixes #17587
* | | | Merge pull request #17607 from owncloud/stable8.1-backport-17426Thomas Müller2015-07-131-1/+0
|\ \ \ \ | |_|_|/ |/| | | [stable8.1] [config sample] Update info about appstore
| * | | [config sample] Update info about appstoreMorris Jobke2015-07-131-1/+0
|/ / /
* | | Merge pull request #17288 from owncloud/stable8.1-chunk-cleanupgracefulonlockMorris Jobke2015-07-093-10/+107
|\ \ \ | | | | | | | | Stable8.1 chunk cleanupgracefulonlock
| * | | Catch cache garbage collection exception on postLoginVincent Petry2015-07-011-2/+8
| | | | | | | | | | | | | | | | Just log the exception instead of preventing access to OC.
| * | | Test for chunk cache garbage collectionVincent Petry2015-07-011-5/+89
| | | |
| * | | Do not try clearing locked files in cache folderVincent Petry2015-07-011-3/+10
| | | |
* | | | Merge pull request #17518 from owncloud/stable8.1-backport-config-sampleMorris Jobke2015-07-091-105/+117
|\ \ \ \ | | | | | | | | | | [stable8.1] backport config sample
| * | | | [config sample] improve RST markup and wordingMorris Jobke2015-07-091-16/+26
| | | | |
| * | | | refine sample config textMorris Jobke2015-07-091-9/+12
| | | | |
| * | | | [config sample] merge Miscellaneous & All other optionsMorris Jobke2015-07-091-87/+86
|/ / / /
* | | | Merge pull request #17289 from owncloud/stable8.1-files-cleanuppartfileonlyonceMorris Jobke2015-07-081-4/+8
|\ \ \ \ | | | | | | | | | | Stable8.1 files cleanuppartfileonlyonce
| * | | | Only delete part file on error if it is really a part fileVincent Petry2015-07-011-2/+6
| | | | |
| * | | | Clean up part file only once, not twice on errorVincent Petry2015-07-011-2/+2
| |/ / /
* | | | Merge pull request #17332 from ↵Morris Jobke2015-07-082-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/fix-temporary-mountpoint-name-in-activities Fix the mount point name before creating the activities
| * | | | Use the item name when refering to the unaccepted remote shareJoas Schilling2015-07-022-2/+8
| | |_|/ | |/| |
* | | | Merge pull request #17338 from owncloud/stable8.1-backport-17252Morris Jobke2015-07-082-15/+23
|\ \ \ \ | | | | | | | | | | [stable8.1] Only do the description kung-fu on strings - fixes #17028
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 03:21:19 +0000