summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 9.0.1 RC2v9.0.1RC2C Montero-Luque2016-04-011-2/+2
|
* Merge pull request #23590 from owncloud/fix-themes-for-stable9Thomas Müller2016-04-011-1/+1
|\ | | | | [stable9] Fix for themes with .jpg backgrounds
| * [stable9] Fix for themes with .jpg backgroundsDaniel Hansson2016-03-261-1/+1
| | | | | | Without this all themes with .jpg or .jpeg are broken.
* | Merge pull request #23684 from owncloud/stable9-backport-23676Thomas Müller2016-04-013-1/+19
|\ \ | | | | | | [stable9] Properly handle return values of OC_App::getAppInfo()
| * | Properly handle return values of OC_App::getAppInfo()Morris Jobke2016-04-013-1/+19
|/ / | | | | | | * fixes #23668
* | Merge pull request #23709 from ↵Thomas Müller2016-04-012-7/+26
|\ \ | | | | | | | | | | | | owncloud/stable9-make-sure-that-encrypted-version-is-set [stable9] Make sure that the encrypted version is set
| * | Make sure that the encrypted version is setLukas Reschke2016-03-312-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | The code path called when using external storage with WebDAV is using `\OC\Files\Storage\Wrapper\Encryption::getMetaData` which did not contain the actual encrypted version inside the cache entry version. This lead to the following: 1. User uploaded a file 2. File is created and `\OC\Files\Storage\Wrapper\Encryption::getMetaData` is called. It has an empty `encryptedVersion` but sets `encrypted` to either `true` or `false`. 3. The call when updating the file cache will use the old version.
* | | Merge pull request #23710 from ↵Thomas Müller2016-04-0112-130/+311
|\ \ \ | | | | | | | | | | | | | | | | owncloud/fix_encryption_versions_on_external_storages_9.0 [stable9] fix creation of versions of encrypted files on external storages
| * | | fix creation of versions of encrypted files on external storagesBjoern Schiessle2016-03-3112-130/+311
| |/ / | | | | | | | | | | | | | | | in order to create a 1:1 copy of a file if a version gets created we need to store this information on copyBetweenStorage(). This allows us to by-pass the encryption wrapper if we read the source file.
* | | Merge pull request #23518 from owncloud/stable9-gdrive-stream-downloadThomas Müller2016-03-311-4/+5
|\ \ \ | | | | | | | | [stable9] GDrive stream download with RetryWrapper
| * | | GDrive stream download with RetryWrapperVincent Petry2016-03-301-4/+5
| | | |
* | | | Merge pull request #23522 from owncloud/stable9-dropbox-stream-downloadFrank Karlitschek2016-03-312-8/+32
|\ \ \ \ | |_|/ / |/| | | [stable9] Dropbox stream download with RetryWrapper
| * | | Dropbox stream download with RetryWrapperVincent Petry2016-03-231-4/+6
| | | |
| * | | Fix dropbox storage to not store the whole file in memoryVincent Petry2016-03-232-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | Since the library can only store the full response in memory on download, we use an alternate client lib and set the correct headers to be able to stream the content to a temp file.
* | | | Merge pull request #23689 from owncloud/revert-23629Thomas Müller2016-03-3114-137/+65
|\ \ \ \ | | | | | | | | | | Revert "Explicitly add the current principal to the acl in case of gr…
| * | | | Revert "Explicitly add the current principal to the acl in case of group ↵Thomas Müller2016-03-3114-137/+65
|/ / / / | | | | | | | | | | | | | | | | | | | | sharing" This reverts commit 52f4acf23d9e388fdc6348858c4572e291bbc56b.
* | | | Merge pull request #23673 from owncloud/stable9-fix-sftp-retry-wrapperThomas Müller2016-03-311-1/+3
|\ \ \ \ | | | | | | | | | | [stable9] Use RetryWrapper for SFTP storage
| * | | | Use RetryWrapper for SFTP storageLukas Reschke2016-03-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Equivalent to https://github.com/owncloud/core/pull/23442 Required for making encryption work with external storage reliable.
* | | | | Merge pull request #23552 from ↵Thomas Müller2016-03-3110-88/+214
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-group-sharing-for-v1-caldav-and-carddav-stable9 Fix group sharing for v1 caldav and carddav stable9
| * | | | | Handle group shares of addressbooks on v1 as well ... now FINALLY ....Thomas Müller2016-03-311-1/+2
| | | | | |
| * | | | | Fix acls for calendar objects and cards - fixes #23273Thomas Müller2016-03-319-84/+193
| | | | | |
| * | | | | Return proper current-user-principal on v1 endpoints - fixes #23306Thomas Müller2016-03-311-0/+15
| | | | | |
| * | | | | Fix group shares on v1 caldav and carddav - fixes #23328Thomas Müller2016-03-313-4/+5
|/ / / / /
* | | | | Merge pull request #23629 from owncloud/fix-group-sharing-access-stable9Thomas Müller2016-03-3114-67/+139
|\ \ \ \ \ | | | | | | | | | | | | Explicitly add the current principal to the acl in case of group sharing
| * | | | | Fix unit testThomas Müller2016-03-301-1/+1
| | | | | |
| * | | | | Explicitly add the current principal to the acl in case of group sharingThomas Müller2016-03-2914-66/+138
| | | | | |
* | | | | | Merge pull request #23640 from ↵Thomas Müller2016-03-311-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/backport-23545-lock-mountpoint-on-removal [9.0] Lock the mountpoint while removing
| * | | | | | Lock the mountpoint while removingJoas Schilling2016-03-301-0/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #23659 from owncloud/backport-23654-xcache-availablilityThomas Müller2016-03-311-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [9.0] xcache.var_size with 64M should evaluate to isAvailable
| * | | | | xcache.var_size with 64M should evaluate to isAvailableJoas Schilling2016-03-301-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #23664 from owncloud/stable9-share-displayownerfixThomas Müller2016-03-302-3/+4
|\ \ \ \ \ | | | | | | | | | | | | [stable9] Fix displaying owner before share icon in file list
| * | | | | Fix displaying owner before share icon in file listVincent Petry2016-03-302-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Initial display of owner was missing
* | | | | | Merge pull request #23662 from owncloud/make-google-drive-drumpf-againThomas Müller2016-03-301-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [stable9] Use the shipped cacerts.pem instead of the global one
| * | | | | Use the shipped cacerts.pem instead of the global oneLukas Reschke2016-03-301-0/+1
| |/ / / / | | | | | | | | | | | | | | | The one we ship may cause problems since Equifax is not included anymore (SHA-1 certs) are deprecated. We should just be consistent here and also use the certificate file which is used by the other calls in the library.
* | | | | Merge pull request #23652 from owncloud/stable9_23651Thomas Müller2016-03-302-1/+24
|\ \ \ \ \ | | | | | | | | | | | | [Stable 9] Non moveable mount points should always be UPDATE+DELETE shareable
| * | | | | Non moveable mount points should always be UPDATE+DELETE shareableRoeland Jago Douma2016-03-302-1/+24
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23536 The new sharing code is much stricter in checking permissions. However for non moveable mounts the permissions UPDATE+DELETE are not reported on the mount point. This is just a quick fix. * Updated unit tests
* | | | | Merge pull request #23641 from owncloud/avatar-remove-9Thomas Müller2016-03-302-3/+2
|\ \ \ \ \ | | | | | | | | | | | | [9.0] only remove avatars from the folder we store them in
| * | | | | only remove avatars from the folder we store them inRobin Appelman2016-03-302-3/+2
| |/ / / /
* | | | | Merge pull request #23618 from ↵Thomas Müller2016-03-302-2/+31
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | owncloud/backport-23543-activity-emails-always-short Backport 23543 activity emails always short
| * | | | Allow the activity app to set the current user when sending emailsJoas Schilling2016-03-292-1/+29
| | | | |
| * | | | We are only formatting an object when it's not nullJoas Schilling2016-03-291-1/+2
| | |_|/ | |/| |
* | | | Merge pull request #23631 from owncloud/stable9-upload-whiteThomas Müller2016-03-302-3/+1
|\ \ \ \ | | | | | | | | | | [stable9] correct form of upload-white icon to be same as upload icon
| * | | | correct form of upload-white icon to be same as upload iconJan-Christoph Borchardt2016-03-292-3/+1
| | |/ / | |/| |
* / | | 9.0.1 RC1v9.0.1RC1C Montero-Luque2016-03-291-2/+2
|/ / /
* | | Merge pull request #23582 from owncloud/avatar-save-failure-9Thomas Müller2016-03-294-7/+25
|\ \ \ | | | | | | | | [9.0] dont die when we cant save the resized avatar, log instead
| * | | dont die when we cant save the resized avatar, log insteadRobin Appelman2016-03-254-7/+25
| |/ /
* | | Merge pull request #23570 from owncloud/stable9-dav-sharetypes-remoteThomas Müller2016-03-294-2/+8
|\ \ \ | |/ / |/| | [stable9] Return remote shares in oc:share-types Webdav property
| * | Return remote shares in oc:share-types Webdav propertyVincent Petry2016-03-244-2/+8
| | | | | | | | | | | | | | | Fixes web UI to properly display the share status icon when an outgoing remote share exists
* | | Merge pull request #23550 from owncloud/backport-23542Thomas Müller2016-03-241-3/+6
|\ \ \ | |/ / |/| | [stable9] getAppPath can return false
| * | getAppPath can return falseLukas Reschke2016-03-241-3/+6
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23533
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-15 02:35:12 +0000