upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 21
31122 commits 1042 branches 1221 tags 8.4 GiB
Commit graph

31122 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
78ee14dad5 Also replace password in updatePrivateKeyPassword 
Fixes https://github.com/owncloud/core/issues/23717
 2016-04-01 11:06:31 +02:00
Thomas Müller
9c800f62dd Merge pull request #23590 from owncloud/fix-themes-for-stable9 
[stable9] Fix for themes with .jpg backgrounds
 2016-04-01 11:02:42 +02:00
Thomas Müller
059df32542 Merge pull request #23684 from owncloud/stable9-backport-23676 
[stable9] Properly handle return values of OC_App::getAppInfo()
 2016-04-01 11:02:09 +02:00
Morris Jobke
43579e784f Properly handle return values of OC_App::getAppInfo() 
* fixes #23668
 2016-04-01 09:16:47 +02:00
Thomas Müller
193a33a8ad Merge pull request #23709 from owncloud/stable9-make-sure-that-encrypted-version-is-set 
[stable9] Make sure that the encrypted version is set
 2016-04-01 09:08:50 +02:00
Thomas Müller
b84746ce36 Merge pull request #23710 from owncloud/fix_encryption_versions_on_external_storages_9.0 
[stable9] fix creation of versions of encrypted files on external storages
 2016-04-01 09:08:09 +02:00
Bjoern Schiessle
2cb45e71ea fix creation of versions of encrypted files on external storages 
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.
 2016-03-31 23:18:45 +02:00
Thomas Müller
e3cc82df38 Merge pull request #23518 from owncloud/stable9-gdrive-stream-download 
[stable9] GDrive stream download with RetryWrapper
 2016-03-31 23:14:49 +02:00
Frank Karlitschek
05fd4f2da0 Merge pull request #23522 from owncloud/stable9-dropbox-stream-download 
[stable9] Dropbox stream download with RetryWrapper
 2016-03-31 21:18:29 +02:00
Lukas Reschke
d16553d2d8 Make sure that the encrypted version is set 
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.
 2016-03-31 20:39:35 +02:00
Thomas Müller
8453073fdb Merge pull request #23689 from owncloud/revert-23629 
Revert "Explicitly add the current principal to the acl in case of gr…
 2016-03-31 12:32:34 +02:00
Thomas Müller
b6fb3148c2 Revert "Explicitly add the current principal to the acl in case of group sharing" 
This reverts commit 52f4acf23d.
 2016-03-31 11:22:47 +02:00
Thomas Müller
cfe0a6450e Merge pull request #23673 from owncloud/stable9-fix-sftp-retry-wrapper 
[stable9] Use RetryWrapper for SFTP storage
 2016-03-31 11:12:29 +02:00
Thomas Müller
5f5e13351a Merge pull request #23552 from owncloud/fix-group-sharing-for-v1-caldav-and-carddav-stable9 
Fix group sharing for v1 caldav and carddav stable9
 2016-03-31 11:12:12 +02:00
Thomas Müller
ef8b75960c Handle group shares of addressbooks on v1 as well ... now FINALLY .... 2016-03-31 09:07:36 +02:00
Thomas Müller
f28817aed5 Fix acls for calendar objects and cards - fixes #23273 2016-03-31 09:07:36 +02:00
Thomas Müller
cb300d164e Return proper current-user-principal on v1 endpoints - fixes #23306 2016-03-31 09:05:39 +02:00
Thomas Müller
e664e582fb Fix group shares on v1 caldav and carddav - fixes #23328 2016-03-31 09:05:39 +02:00
Thomas Müller
9bd5fd23e7 Merge pull request #23629 from owncloud/fix-group-sharing-access-stable9 
Explicitly add the current principal to the acl in case of group sharing
 2016-03-31 09:04:07 +02:00
Thomas Müller
835e24826d Merge pull request #23640 from owncloud/backport-23545-lock-mountpoint-on-removal 
[9.0] Lock the mountpoint while removing
 2016-03-31 08:59:28 +02:00
Thomas Müller
8d6aff69a8 Merge pull request #23659 from owncloud/backport-23654-xcache-availablility 
[9.0] xcache.var_size with 64M should evaluate to isAvailable
 2016-03-31 08:58:18 +02:00
Joas Schilling
7c7e079a36 Lock the mountpoint while removing 2016-03-30 23:50:10 +02:00
Lukas Reschke
1f7b037a59 Use RetryWrapper for SFTP storage 
Equivalent to https://github.com/owncloud/core/pull/23442

Required for making encryption work with external storage reliable.
 2016-03-30 23:01:42 +02:00
Vincent Petry
99843c06f9 GDrive stream download with RetryWrapper 2016-03-30 18:43:01 +02:00
Thomas Müller
ed88f7b8b5 Merge pull request #23664 from owncloud/stable9-share-displayownerfix 
[stable9] Fix displaying owner before share icon in file list
 2016-03-30 18:42:49 +02:00
Thomas Müller
03f89d8242 Merge pull request #23662 from owncloud/make-google-drive-drumpf-again 
[stable9] Use the shipped cacerts.pem instead of the global one
 2016-03-30 18:41:36 +02:00
Vincent Petry
f981661195 Fix displaying owner before share icon in file list 
Initial display of owner was missing
 2016-03-30 18:10:56 +02:00
Thomas Müller
424c2b8263 Merge pull request #23652 from owncloud/stable9_23651 
[Stable 9] Non moveable mount points should always be UPDATE+DELETE shareable
 2016-03-30 17:01:41 +02:00
Thomas Müller
2ab503f70a Merge pull request #23641 from owncloud/avatar-remove-9 
[9.0] only remove avatars from the folder we store them in
 2016-03-30 17:00:53 +02:00
Thomas Müller
cdff098357 Merge pull request #23618 from owncloud/backport-23543-activity-emails-always-short 
Backport 23543 activity emails always short
 2016-03-30 16:59:22 +02:00
Lukas Reschke
57596e1415 Use the shipped cacerts.pem instead of the global one 
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.
 2016-03-30 16:55:26 +02:00
Joas Schilling
dd8d1c2b94 xcache.var_size with 64M should evaluate to isAvailable 2016-03-30 16:43:28 +02:00
Roeland Jago Douma
2660cf80c3 Non moveable mount points should always be UPDATE+DELETE shareable 
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
 2016-03-30 13:42:08 +02:00
Robin Appelman
3cadc45ca5 only remove avatars from the folder we store them in 2016-03-30 10:25:37 +02:00
Thomas Müller
8c9842fbd9 Fix unit test 2016-03-30 10:01:17 +02:00
Thomas Müller
456035a750 Merge pull request #23631 from owncloud/stable9-upload-white 
[stable9] correct form of upload-white icon to be same as upload icon
 2016-03-30 09:09:20 +02:00
C Montero-Luque
fb77aa2e62 9.0.1 RC1 2016-03-29 22:03:08 +02:00
Jan-Christoph Borchardt
3b4999c835 correct form of upload-white icon to be same as upload icon 2016-03-29 19:18:54 +02:00
Thomas Müller
52f4acf23d Explicitly add the current principal to the acl in case of group sharing 2016-03-29 19:09:31 +02:00
Thomas Müller
6b7c694a42 Merge pull request #23582 from owncloud/avatar-save-failure-9 
[9.0] dont die when we cant save the resized avatar, log instead
 2016-03-29 18:49:22 +02:00
Thomas Müller
605abf9088 Merge pull request #23570 from owncloud/stable9-dav-sharetypes-remote 
[stable9] Return remote shares in oc:share-types Webdav property
 2016-03-29 18:41:25 +02:00
Joas Schilling
b5922e467a Allow the activity app to set the current user when sending emails 2016-03-29 09:12:12 +02:00
Joas Schilling
1733b6e8c8 We are only formatting an object when it's not null 2016-03-29 09:11:48 +02:00
Daniel Hansson
c066882309 [stable9] Fix for themes with .jpg backgrounds 
Without this all themes with .jpg or .jpeg are broken.
 2016-03-26 15:10:04 +01:00
Robin Appelman
b456035aa7 dont die when we cant save the resized avatar, log instead 2016-03-25 14:13:17 +01:00
Thomas Müller
03f461591e Merge pull request #23550 from owncloud/backport-23542 
[stable9] getAppPath can return false
 2016-03-24 22:44:31 +01:00
Vincent Petry
1f4738c372 Return remote shares in oc:share-types Webdav property 
Fixes web UI to properly display the share status icon when an outgoing
remote share exists
 2016-03-24 17:22:09 +01:00
Thomas Müller
af7c34d9a6 Merge pull request #23401 from owncloud/backport-23282-stable9 
[stable9] fix writing to cache when fallback server should be used immediately
 2016-03-24 13:30:44 +01:00
Thomas Müller
515ebc02b0 Merge pull request #23539 from owncloud/backport-23530 
[stable9] Backport 23530
 2016-03-24 13:06:00 +01:00
Lukas Reschke
0bb7644150 getAppPath can return false 
Fixes https://github.com/owncloud/core/issues/23533
 2016-03-24 12:22:42 +01:00