summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 8.1.1 beta1v8.1.1betaC Montero-Luque2015-07-222-3/+3
|
* Merge pull request #17802 from owncloud/update-sabre-dav-2.1.6Thomas Müller2015-07-221-0/+0
|\ | | | | Update SabreDAV to 2.1.6
| * Update SabreDAV to 2.1.6Joas Schilling2015-07-221-0/+0
| |
* | Merge pull request #17816 from owncloud/enc_improved_app_description_8.1Björn Schießle2015-07-221-13/+8
|\ \ | |/ |/| [8.1 backport] improved description for the default encryption module
| * improved app description and adjust it to the way the new encryption module ↵Bjoern Schiessle2015-07-221-13/+8
|/ | | | works
* Merge pull request #17752 from ↵Joas Schilling2015-07-212-4/+81
|\ | | | | | | | | owncloud/enc_migration_fix_mountpoint_detection_8.1 [8.1 backport] fix system wide mount point detection on migration
| * fix mount point detectionBjoern Schiessle2015-07-202-4/+81
| |
* | Merge pull request #17762 from owncloud/backport-17723-stable8.1Morris Jobke2015-07-212-125/+133
|\ \ | | | | | | Backport of #17723 to stable8.1
| * | Backport of #17723 to stable8.1Arthur Schiwon2015-07-202-125/+133
| | | | | | | | | | | | | | | | | | fix runtime caching in ldap's user manager, fixes #17631 fix indentation. no code changes, whitespace only.
* | | Merge pull request #17704 from owncloud/backport-stable8.1-17255-17526Morris Jobke2015-07-2110-1/+483
|\ \ \ | |/ / |/| | Backport stable8.1 #17255 #17526
| * | LDAP: when checking group for matching filter, also take base DN into ↵Arthur Schiwon2015-07-174-2/+96
| | | | | | | | | | | | consideration. Fixes #17516
| * | Backport of 17255 to stable8.1Arthur Schiwon2015-07-179-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.1Thomas Müller2015-07-201-1/+1
|\ \ \ | |_|/ |/| | fix browser compatibility issue for element.closest
| * | fix browser compatibility issue for element.closestHendrik Leppelsack2015-07-171-1/+1
| | |
* | | Merge pull request #17736 from owncloud/backport-allow-update-of-disabled-appsMorris Jobke2015-07-201-3/+1
|\ \ \ | | | | | | | | [stable8.1] Allow upgrade of not enabled apps
| * | | Allow upgrade of not enabled appsThomas Müller2015-07-191-3/+1
| | | |
* | | | Merge pull request #17711 from owncloud/fix_repeated_migration_oc8.1Morris Jobke2015-07-206-25/+124
|\ \ \ \ | |/ / / |/| | | [8.1 backport] Don't mix up directories if the migration runs multiple times
| * | | unit testsBjoern Schiessle2015-07-171-2/+36
| | | |
| * | | don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-176-24/+89
| |/ /
* | | Merge pull request #17702 from owncloud/enc_detect_legacy_files2_8.1Björn Schießle2015-07-174-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 Schiessle2015-07-171-0/+1
| | | | | | | | | | | | | | | | encrypted file
| * | | make sure that we always detect legacy files correctlyBjoern Schiessle2015-07-174-62/+209
| | |/ | |/|
* | | Merge pull request #17710 from owncloud/stable8.1-s2s-catchremotelockexceptionsMorris Jobke2015-07-171-17/+27
|\ \ \ | |_|/ |/| | [Stable 8.1] s2s catchremotelockexceptions
| * | Throw lock exceptions if remote share returned 423 status codeVincent Petry2015-07-171-17/+27
|/ /
* | Merge pull request #17697 from owncloud/fix-undefined-REMOTE_ADDR-stable8.1Morris Jobke2015-07-172-5/+17
|\ \ | |/ |/| Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460
| * Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460Thomas Müller2015-07-172-5/+17
|/
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 00:44:40 +0000