| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Backport of 17255 to stable8.1 | Arthur Schiwon | 2015-07-17 | 9 | -1/+389 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensure groups match filter when using memberOf to read users group, refs #17119 integration test adjust unit test tests solidity | |||||
| * | | | Merge pull request #17707 from owncloud/backport-fix-closest-stable8.1 | Thomas Müller | 2015-07-20 | 1 | -1/+1 | |
| |\ \ \ | |_|/ |/| | | fix browser compatibility issue for element.closest | |||||
| | * | | fix browser compatibility issue for element.closest | Hendrik Leppelsack | 2015-07-17 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #17736 from owncloud/backport-allow-update-of-disabled-apps | Morris Jobke | 2015-07-20 | 1 | -3/+1 | |
| |\ \ \ | | | | | | | | | [stable8.1] Allow upgrade of not enabled apps | |||||
| | * | | | Allow upgrade of not enabled apps | Thomas Müller | 2015-07-19 | 1 | -3/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #17711 from owncloud/fix_repeated_migration_oc8.1 | Morris Jobke | 2015-07-20 | 6 | -25/+124 | |
| |\ \ \ \ | |/ / / |/| | | | [8.1 backport] Don't mix up directories if the migration runs multiple times | |||||
| | * | | | unit tests | Bjoern Schiessle | 2015-07-17 | 1 | -2/+36 | |
| | | | | | ||||||
| | * | | | don't move keys if the key where already moved in a previous migration run | Bjoern Schiessle | 2015-07-17 | 6 | -24/+89 | |
| | |/ / | ||||||
| * | | | Merge pull request #17702 from owncloud/enc_detect_legacy_files2_8.1 | Björn Schießle | 2015-07-17 | 4 | -62/+210 | |
| |\ \ \ | | | | | | | | | [8.1 backport] make sure that we always detect legacy files correctlly | |||||
| | * | | | set targetIsEncrypted to true if file cache indicates that we try to read a ↵ | Bjoern Schiessle | 2015-07-17 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | encrypted file | |||||
| | * | | | make sure that we always detect legacy files correctly | Bjoern Schiessle | 2015-07-17 | 4 | -62/+209 | |
| | | |/ | |/| | ||||||
| * | | | Merge pull request #17710 from owncloud/stable8.1-s2s-catchremotelockexceptions | Morris Jobke | 2015-07-17 | 1 | -17/+27 | |
| |\ \ \ | |_|/ |/| | | [Stable 8.1] s2s catchremotelockexceptions | |||||
| | * | | Throw lock exceptions if remote share returned 423 status code | Vincent Petry | 2015-07-17 | 1 | -17/+27 | |
| |/ / | ||||||
| * | | Merge pull request #17697 from owncloud/fix-undefined-REMOTE_ADDR-stable8.1 | Morris Jobke | 2015-07-17 | 2 | -5/+17 | |
| |\ \ | |/ |/| | Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460 | |||||
| | * | Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460 | Thomas Müller | 2015-07-17 | 2 | -5/+17 | |
| |/ | ||||||
| * | Merge pull request #17690 from owncloud/stable8.1-repair-ocs-ids | Thomas Müller | 2015-07-17 | 4 | -2/+198 | |
| |\ | | | | | [stable8.1] Add repair step for outdated OCS IDs | |||||
| | * | Prefer OCS Id from database | Lukas Reschke | 2015-07-17 | 1 | -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 IDs | Lukas Reschke | 2015-07-16 | 3 | -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üller | 2015-07-17 | 5 | -8/+73 | |
| |\ \ | | | | | | | | | | | | | owncloud/backport-encryption_migration_improvements-stable8.1 Backport encryption migration improvements stable8.1 | |||||
| | * | | only create new key pair if both keys are missing | Bjoern Schiessle | 2015-07-16 | 2 | -7/+68 | |
| | | | | ||||||
| | * | | only cleanUp the remaining keys if the migration really finished succesfully | Bjoern Schiessle | 2015-07-16 | 3 | -1/+5 | |
| | | | | ||||||
| * | | | Merge pull request #17679 from owncloud/backport-fix_trashbin-stable8.1 | Thomas Müller | 2015-07-17 | 2 | -2/+62 | |
| |\ \ \ | |_|/ |/| | | only move real files to the trash bin | |||||
| | * | | only move real files to the trash bin | Bjoern Schiessle | 2015-07-16 | 2 | -2/+62 | |
| | |/ | ||||||
| * | | Merge pull request #17676 from owncloud/backport-files-scan-user-path-stable8.1 | Morris Jobke | 2015-07-16 | 1 | -4/+5 | |
| |\ \ | |/ |/| | Lock scanner to the given user | |||||
| | * | Lock scanner to the given user | Robin Appelman | 2015-07-16 | 1 | -4/+5 | |
| | | | ||||||
| * | | Merge pull request #17653 from ↵ | Morris Jobke | 2015-07-16 | 2 | -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 path | Joas Schilling | 2015-07-15 | 1 | -3/+6 | |
| | | | ||||||
| | * | Add test case when owner renames shared folder | Vincent Petry | 2015-07-15 | 1 | -5/+8 | |
| | | | ||||||
| | * | Add unit test for getUsersSharingFile | Vincent Petry | 2015-07-15 | 1 | -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 share | Joas Schilling | 2015-07-15 | 1 | -7/+22 | |
| | | | ||||||
| * | | Merge pull request #17658 from owncloud/share-lock-owner-parent-stable81 | Vincent Petry | 2015-07-16 | 3 | -10/+134 | |
| |\ \ | | | | | | | [8.1] lock parent folders for the owner when locking a shared file as recipient | |||||
| | * | | only lock the parent folders | Robin Appelman | 2015-07-15 | 2 | -2/+13 | |
| | | | | ||||||
| | * | | lock parent folders for the owner when locking a shared file as recipient | Robin Appelman | 2015-07-15 | 3 | -10/+123 | |
| | | | | ||||||
| * | | | Merge pull request #17556 from owncloud/enc_fix_migration_stable8.1 | Vincent Petry | 2015-07-16 | 2 | -14/+82 | |
| |\ \ \ | | | | | | | | | [stable8.1 backport] more secure way to update the database | |||||
| | * | | | more secure way to update the database | Bjoern Schiessle | 2015-07-10 | 2 | -14/+82 | |
| | | | | | ||||||
| * | | | | Merge pull request #17294 from owncloud/stable8.1-s2s-catchmoreexceptiontypes | Morris Jobke | 2015-07-16 | 1 | -13/+7 | |
| |\ \ \ \ | | | | | | | | | | | [stable8.1] Catch more error codes thrown by federated shares | |||||
| | * | | | | Throw storage not available on guzzle error | Vincent Petry | 2015-07-13 | 1 | -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 shares | Vincent Petry | 2015-07-01 | 1 | -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-17077 | Morris Jobke | 2015-07-15 | 4 | -8/+58 | |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | [stable8.1] fix getting mount points when passing a path to the files:scan command | |||||
| | * | | | | handle invalid results from mount providers | Robin Appelman | 2015-07-02 | 1 | -1/+4 | |
| | | | | | | ||||||
| | * | | | | handle error during setup | Robin Appelman | 2015-07-02 | 1 | -3/+5 | |
| | | | | | | ||||||
| | * | | | | add unit test | Robin Appelman | 2015-07-02 | 2 | -2/+48 | |
| | | | | | | ||||||
| | * | | | | fix getting mount points when passing a path to the files:scan command | Robin Appelman | 2015-07-02 | 1 | -3/+2 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #17643 from owncloud/stable8.1-s2s-hasupdated-catch405 | Morris Jobke | 2015-07-15 | 1 | -1/+5 | |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | [stable8.1] Throw StorageNotAvailable if propfind on root failed | |||||
| | * | | | | Throw StorageNotAvailable if propfind on root failed | Vincent Petry | 2015-07-14 | 1 | -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-17565 | Björn Schießle | 2015-07-14 | 1 | -1/+1 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | [stable8.1] allow remote shares for users with email as usernames | |||||
| | * | | | | allow remote shares for users with email as usernames | Felix Böhm | 2015-07-14 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #17632 from owncloud/stable8.1-backport-17606 | Vincent Petry | 2015-07-14 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | [stable8.1] Handle returned null value in app level code | |||||
| | * | | | | Handle returned null value in app level code | Morris Jobke | 2015-07-14 | 1 | -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-17426 | Thomas Müller | 2015-07-13 | 1 | -1/+0 | |
| |\ \ \ \ | |_|_|/ |/| | | | [stable8.1] [config sample] Update info about appstore | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |