| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | only move real files to the trash bin | Bjoern Schiessle | 2015-07-16 | 2 | -2/+62 |
| | | |||||
| * | 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 | ||||
| | * | | | [config sample] Update info about appstore | Morris Jobke | 2015-07-13 | 1 | -1/+0 |
| |/ / / | |||||
| * | | | Merge pull request #17288 from owncloud/stable8.1-chunk-cleanupgracefulonlock | Morris Jobke | 2015-07-09 | 3 | -10/+107 |
| |\ \ \ | | | | | | | | | Stable8.1 chunk cleanupgracefulonlock | ||||
| | * | | | Catch cache garbage collection exception on postLogin | Vincent Petry | 2015-07-01 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | Just log the exception instead of preventing access to OC. | ||||
| | * | | | Test for chunk cache garbage collection | Vincent Petry | 2015-07-01 | 1 | -5/+89 |
| | | | | | |||||
| | * | | | Do not try clearing locked files in cache folder | Vincent Petry | 2015-07-01 | 1 | -3/+10 |
| | | | | | |||||
| * | | | | Merge pull request #17518 from owncloud/stable8.1-backport-config-sample | Morris Jobke | 2015-07-09 | 1 | -105/+117 |
| |\ \ \ \ | | | | | | | | | | | [stable8.1] backport config sample | ||||
| | * | | | | [config sample] improve RST markup and wording | Morris Jobke | 2015-07-09 | 1 | -16/+26 |
| | | | | | | |||||
| | * | | | | refine sample config text | Morris Jobke | 2015-07-09 | 1 | -9/+12 |
| | | | | | | |||||
| | * | | | | [config sample] merge Miscellaneous & All other options | Morris Jobke | 2015-07-09 | 1 | -87/+86 |
| |/ / / / | |||||
| * | | | | Merge pull request #17289 from owncloud/stable8.1-files-cleanuppartfileonlyonce | Morris Jobke | 2015-07-08 | 1 | -4/+8 |
| |\ \ \ \ | | | | | | | | | | | Stable8.1 files cleanuppartfileonlyonce | ||||
| | * | | | | Only delete part file on error if it is really a part file | Vincent Petry | 2015-07-01 | 1 | -2/+6 |
| | | | | | | |||||
| | * | | | | Clean up part file only once, not twice on error | Vincent Petry | 2015-07-01 | 1 | -2/+2 |
| | |/ / / | |||||
| * | | | | Merge pull request #17332 from ↵ | Morris Jobke | 2015-07-08 | 2 | -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 share | Joas Schilling | 2015-07-02 | 2 | -2/+8 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge pull request #17338 from owncloud/stable8.1-backport-17252 | Morris Jobke | 2015-07-08 | 2 | -15/+23 |
| |\ \ \ \ | | | | | | | | | | | [stable8.1] Only do the description kung-fu on strings - fixes #17028 | ||||
| | * | | | | Only do the description kung-fu on strings - fixes #17028 | Thomas Müller | 2015-07-02 | 2 | -15/+23 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge pull request #17366 from owncloud/fix_16740_8.1 | Morris Jobke | 2015-07-08 | 2 | -2/+4 |
| |\ \ \ \ | | | | | | | | | | | [oc8.1] owner is stored as 'uid_owner', not as 'owner' in the oc_share table | ||||
| | * | | | | call post_addToGroup als for class OC_User because sharing and LDAP are ↵ | Bjoern Schiessle | 2015-07-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | using this class. Minimal approach to fix #16740 | ||||
| | * | | | | owner is stored as 'uid_owner', not as 'owner' in the oc_share table | Bjoern Schiessle | 2015-07-03 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #17370 from ↵ | Morris Jobke | 2015-07-08 | 2 | -1/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/stable8.1-share-onlyshowstaticownerifavailable [stable8.1] Do not show static share owner if not available | ||||
| | * | | | | | Do not show static share owner if not available | Vincent Petry | 2015-07-03 | 2 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some corner cases, an outgoing share exists but sharing is not allowed for the current user. This would cause the file list to break because the static text could not be rendered as the owner was undefined. | ||||
| * | | | | | | Merge pull request #17417 from owncloud/stable8.1-backport-17159 | Morris Jobke | 2015-07-08 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [stable8.1] remove duplicate ID in HTML template for public shares | ||||
| | * | | | | | | remove duplicate ID in HTML template for public shares | Morris Jobke | 2015-07-06 | 2 | -2/+2 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge pull request #17429 from owncloud/stable8.1-backport-17088 | Morris Jobke | 2015-07-08 | 3 | -0/+16 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [stable8.1] [upgrade] add verbosity check and show repair info & steps | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |