2bff34be56
Merge pull request #23707 from owncloud/make-sure-that-encrypted-version-is-set
...
Make sure that the encrypted version is set
2016-03-31 20:37:17 +02:00
fdb59079a2
Merge pull request #23675 from owncloud/fix_encryption_versions_on_external_storages
...
fix creation of versions of encrypted files on external storages
2016-03-31 20:36:03 +02:00
dea3985e86
Merge pull request #23516 from owncloud/dropbox-stream-download
...
Dropbox stream download with RetryWrapper
2016-03-31 20:07:36 +02:00
ba8c81e6d1
Merge pull request #23526 from owncloud/fix_23337
...
Add setId and setProviderId to IShare interface
2016-03-31 20:07:02 +02:00
93ed965cbb
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 19:24:47 +02:00
c427bf3b5d
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 18:06:37 +02:00
bfb5748f1f
Merge pull request #23702 from owncloud/emptycontent
...
improve emptycontent styles
2016-03-31 17:00:53 +02:00
a8a98d42cb
improve emptycontent styles
2016-03-31 15:31:04 +02:00
8ef6c6c7bc
Merge pull request #23690 from owncloud/add-codecov-icon
...
Add codecov icon
2016-03-31 12:00:31 +02:00
0dcc5a4764
Add codecov icon
2016-03-31 11:58:42 +02:00
8394985e14
Merge pull request #23672 from owncloud/use-retry-wrapper-for-sftp
...
Use RetryWrapper for SFTP storage
2016-03-31 11:24:47 +02:00
52f51c94db
Merge pull request #15750 from owncloud/loading-feedback-email-usermanagement
...
Add loading feedback for email change in user management
2016-03-31 11:24:27 +02:00
82da373ee7
[tx-robot] updated from transifex
2016-03-31 01:55:24 -04:00
d7072ee8e5
Merge pull request #23642 from stweil/master
...
apps: Fix some typos found by codespell
2016-03-30 23:47:00 +02:00
395c3d852d
Merge pull request #23508 from owncloud/text-columns-should-have-length
...
Text columns should really have a length 🙈
2016-03-30 23:46:26 +02:00
8da48a4482
Add unit tests
...
Add some unit tests for setting the internal id and the provider id
2016-03-30 23:08:35 +02:00
d883b877d1
Move OCP\Share over to PSR-4
...
Touching the code so moving it over to PSR-4
2016-03-30 22:55:03 +02:00
2f4294e781
Add setId and setProviderID to the public interface
...
Fixes #23337
We only allow the id to be set once!
2016-03-30 22:55:03 +02:00
3dc5c59e57
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 22:45:09 +02:00
00c9974d94
Merge pull request #23663 from owncloud/share-displayownerfix
...
Fix displaying owner before share icon in file list
2016-03-30 18:42:25 +02:00
510e8db1ba
Merge pull request #23660 from owncloud/master-make-google-drive-drumpf-again
...
Use the shipped cacerts.pem instead of the global one
2016-03-30 18:34:36 +02:00
a9aa39efbf
Fix displaying owner before share icon in file list
...
Initial display of owner was missing
2016-03-30 18:09:02 +02:00
66ee9d56fc
Merge pull request #23628 from owncloud/avatar-remove
...
only remove avatars from the folder we store them in
2016-03-30 17:00:09 +02:00
bd93722e12
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:58:39 +02:00
748a59db11
Merge pull request #23654 from owncloud/issue-23653-xcache-detection-fails
...
xcache.var_size with 64M should evaluate to isAvailable
2016-03-30 16:57:02 +02:00
7d7a595969
Merge pull request #23651 from owncloud/fix_23536
...
Non moveable mount points should always be UPDATE+DELETE shareable
2016-03-30 16:56:23 +02:00
f1c23a92a4
xcache.var_size with 64M should evaluate to isAvailable
2016-03-30 14:54:56 +02:00
9ce5e4b01f
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:33:16 +02:00
524b374f02
apps/files_external: Fix typos in comments (found and fixed by codespell)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-30 13:27:12 +02:00
c22697e09e
only remove avatars from the folder we store them in
2016-03-30 10:24:43 +02:00
217d9e8e95
apps/files_trashbin: Fix typos in comments (found and fixed by codespell)
...
Fix also a wrong word.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-30 10:14:26 +02:00
65b0127241
apps/dav: Fix typos in comments (found and fixed by codespell)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-30 10:14:26 +02:00
0e687993c8
Merge pull request #23630 from owncloud/upload-white
...
correct form of upload-white icon to be same as upload icon
2016-03-30 09:08:49 +02:00
fc708c1e04
[tx-robot] updated from transifex
2016-03-30 01:57:41 -04:00
0486fc2aa9
correct form of upload-white icon to be same as upload icon
2016-03-29 19:11:52 +02:00
37d32a93d0
Merge pull request #23543 from owncloud/issue-23503-activity-emails-always-short
...
Fix activity emails always using the short translation
2016-03-29 18:44:16 +02:00
cd850dc325
Merge pull request #23568 from owncloud/finally-fix-23328-now-for-addressbooks-as-well
...
Handle group shares of addressbooks on v1 as well ... now FINALLY ....
2016-03-29 18:41:40 +02:00
dd5bbc31f2
[tx-robot] updated from transifex
2016-03-29 01:55:16 -04:00
a092fe3bf8
[tx-robot] updated from transifex
2016-03-28 01:55:08 -04:00
1079554284
[tx-robot] updated from transifex
2016-03-27 01:55:45 -04:00
3e33b686b1
[tx-robot] updated from transifex
2016-03-26 01:55:15 -04:00
ae97b8e1c2
[tx-robot] updated from transifex
2016-03-25 01:55:47 -04:00
ab0db65b23
Merge pull request #23549 from owncloud/dav-sharetypes-remote
...
Return remote shares in oc:share-types Webdav property
2016-03-24 22:44:19 +01:00
b966fc2233
Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removal
...
Lock the mountpoint while removing
2016-03-24 22:43:46 +01:00
b8812c8cba
Merge pull request #23154 from owncloud/avatar-save-failure
...
dont die when we cant save the resized avatar, log instead
2016-03-24 22:43:17 +01:00
89cd6e228d
Handle group shares of addressbooks on v1 as well ... now FINALLY ....
2016-03-24 17:11:07 +01:00
a7e7f5e180
Merge pull request #23511 from owncloud/sidebar-click
...
sidebar click modification
2016-03-24 13:30:27 +01:00
24b6b8d31f
Merge pull request #23551 from owncloud/objectstoremissingvar
...
add missing var
2016-03-24 13:30:08 +01:00
c3508df09a
add missing var
2016-03-24 12:49:43 +01:00
3d51682440
Merge pull request #23342 from owncloud/fix-group-sharing-for-v1-caldav-and-carddav
...
Fix group shares on v1 caldav and carddav
2016-03-24 12:47:18 +01:00
Frank Karlitschek
Thomas Müller
Bjoern Schiessle
Lukas Reschke
Jan-Christoph Borchardt
Jenkins for ownCloud
Roeland Jago Douma
Vincent Petry
Joas Schilling
Stefan Weil
Robin Appelman
Jörn Friedrich Dreyer