009bbef17e
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 10:34:25 +01:00
16b484209c
Merge branch 'master' into encryption_work_with_public_gallery
...
Conflicts:
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/crypt.php
2013-11-21 10:33:37 +01:00
18c80e47b6
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/stream.php
2013-11-21 10:24:47 +01:00
391f267d38
Merge pull request #5897 from hkjolhede/master
...
Fixed error-checking error in sftp.php
2013-11-21 01:22:05 -08:00
19af45c7d1
Merge pull request #5972 from owncloud/extstorage-webdav-moveoperationfix
...
Fixed move operation to pass the whole URL as expected
2013-11-21 01:20:19 -08:00
2b361ea085
better distinction between userID and keyId
2013-11-21 10:09:07 +01:00
b27fc42e1f
public upload now also works with encryption enabled
2013-11-21 00:23:38 +01:00
318db64b2d
adapt tests to the new code
2013-11-20 23:27:42 +01:00
b9c18d16fe
make sure that we always use the correct user id
2013-11-20 23:23:23 +01:00
e11afd3066
fix some getShareKey() and getFileKey() calls
2013-11-20 22:44:23 +01:00
c2ccf4a6b3
beta 5 is here
2013-11-20 19:30:30 +01:00
e26500045f
Fixed move operation to pass the whole URL as expected
...
The MOVE and COPY spec expect the "Destination" header to receive the
full URL, not only the root.
Fixes #5942
2013-11-20 18:59:02 +01:00
c5cb4206f5
[wip] make encryption work with public gallery sharing
2013-11-20 18:10:56 +01:00
5de5c317c1
Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset
...
Fix for extstorage + encryption where unencrypted size is not kept
2013-11-20 09:04:37 -08:00
a88aec8a5c
Merge pull request #5965 from owncloud/mimetype-only-path
...
Change default mimetype detection for storage backends to only use filename
2013-11-20 08:11:41 -08:00
8f33286b19
Merge pull request #5966 from owncloud/fixing-fileid-webdav-master
...
always get the right node for the given file path
2013-11-20 07:51:47 -08:00
c221e8272c
Merge pull request #5959 from owncloud/encryption_check_if_file_is_encrypted
...
only check if the key file exists to decide if it is an encrypted file or not
2013-11-20 07:32:43 -08:00
fe44024868
Fix for extstorage + encryption where unencrypted size is not kept
...
Fix for external storage with encryption where the unencrypted size is
first written in the DB, then set back to zero, causing performance
issue because the file needs to be reopened every time to find out the
unencrypted size (and potentially needs a full redownload)
2013-11-20 16:22:55 +01:00
51a8172868
always get the right node for the given file path
2013-11-20 16:14:08 +01:00
a0d570b4cc
Change default mimetype detection for storage backends to only use filename
2013-11-20 15:25:29 +01:00
b4e7258a04
Merge branch 'master' into encryption_check_if_file_is_encrypted
2013-11-20 14:45:04 +01:00
30b8f4ec8e
Merge pull request #5961 from owncloud/core-fixgetfiletempfilecondition
...
Fixed getLocalFile() condition for x-send-file
2013-11-20 05:42:21 -08:00
726a202cdb
Fixed getLocalFile() condition for x-send-file
...
Until now, addSendfileHeader() was called even when no x-send-file
headers were set. Even though the method itself doesn't do anything,
a call to getLocalFile() was done and would trigger a full download
when using external storage.
Additionally, the storage resolution code is wrong and always
returns the local storage of the root filesystem, which caused the code to
be run anyway.
This commit fixes both issues.
2013-11-20 14:33:59 +01:00
f3e2a63712
check if it is a cached file or a version to resolve the correct path to the file key
2013-11-20 12:34:23 +01:00
0c24c7c420
only check if the key file exists to decide if it is an encrypted file or not.
...
This solves problems with external storage which doesn't support fseek
2013-11-20 11:02:22 +01:00
8bc339413b
Merge pull request #5926 from owncloud/less-bold
...
remove bold from legend, table header, label - less obtrusive
2013-11-19 13:57:21 -08:00
93ff86e31f
Merge pull request #5951 from owncloud/ldap_encryption_fix
...
fix encryption with LDAP, make sure that the owners home is mounted correctly
2013-11-19 13:51:12 -08:00
b823505bd1
make sure that the owners home is mounted correctly
2013-11-19 18:28:51 +01:00
5f6f78ee03
Merge pull request #5878 from owncloud/extstorage-smb
...
[SMB] Fix stat and unlink
2013-11-19 06:13:25 -08:00
5b6d1d79d0
Fixed SMB file deletion success detection
...
Since unlink() smb4php doesn't return true on deletion success, we need
to check whether the file was deleted to confirm success.
Fixes #5866
2013-11-19 15:05:11 +01:00
8ab40f1959
Removing trailing dot in path that samba doesn't seem to like
...
Fixes #5778
Added unit test for getId() and constructUrl()
2013-11-19 15:05:11 +01:00
a7962faa56
Fixed delete action to show error message as notification
2013-11-19 15:05:11 +01:00
b55a66187c
Merge pull request #5916 from owncloud/extstorage-smb-ignorenetbioserror
...
SMB ignore connection errors when NetBIOS is disabled
2013-11-18 15:23:11 -08:00
4a0d295e4a
Merge pull request #5927 from owncloud/quota-excludeextstorage
...
External storage space is now not counted in total space
2013-11-18 14:42:40 -08:00
cdc72ddd8d
Merge pull request #5928 from owncloud/quota-totalsizeoffiles
...
Root size for home storage is now size of "files" subdir
2013-11-18 14:31:00 -08:00
3e2fd9942b
Root size for home storage is now size of "files" subdir
...
Fixes #4593
2013-11-18 18:17:25 +01:00
614e4d485c
External storage space is now not counted in total space
...
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.
Fixes #5924
2013-11-18 18:09:01 +01:00
b51d405852
Merge pull request #5923 from owncloud/font-weight
...
change bold 'deleted files' button to normal for less focus
2013-11-18 08:39:46 -08:00
b678766c7d
remove bold from legend, table header, label - less obtrusive
2013-11-18 17:32:06 +01:00
5da2929180
fix filtering number like filenames in filelist
...
forward port of 847ad6c40b
2013-11-18 17:18:31 +01:00
c8cf3320a4
Merge pull request #5922 from owncloud/fix-time-inputs
...
fix input type time fields, have them use the default styles
2013-11-18 07:17:09 -08:00
463b054530
adjust input CSS to multiline, coding guidelines
2013-11-18 16:14:13 +01:00
f2d18867af
change bold 'deleted files' button to normal for less focus
2013-11-18 15:06:38 +01:00
8dd50dc9a6
fix input type time fields, have them use the default styles
2013-11-18 14:51:43 +01:00
44c2f9aad2
Merge pull request #5915 from owncloud/fix_apps_versioncheck
...
Fix apps versioncheck
2013-11-18 05:48:17 -08:00
d306f5c4cf
Merge pull request #5908 from owncloud/fix_errorpage_call
...
[encryption] fix redirectToErrorPage() call
2013-11-18 05:17:28 -08:00
a2e3821b87
Merge pull request #5914 from owncloud/fix_5832
...
Check which permissions are possible to re-share a file
2013-11-18 05:16:05 -08:00
7e6f3817d0
SMB ignore connection errors when NetBIOS is disabled
...
When NetBIOS is blocked or disabled, a smb::look() call can still get
the list of shares from smbclient, even though the name resolution at
the end of the command fails.
This fix makes it ignore the connection error if we already got the list
of shares.
Fixed #5860
2013-11-18 12:31:55 +01:00
385a296864
one tab less
2013-11-18 12:19:16 +01:00
e5994f9c1a
fix the version check for downloaded apps. Fixes https://github.com/owncloud/apps/issues/1485
2013-11-18 12:16:03 +01:00
Bjoern Schiessle
Vincent Petry
Frank Karlitschek
blizzz
Thomas Müller
Robin Appelman
Morris Jobke
Jan-Christoph Borchardt
Jörn Friedrich Dreyer