Commit Graph

6820 Commits

Author SHA1 Message Date
Vincent Petry 391f267d38 Merge pull request #5897 from hkjolhede/master
Fixed error-checking error in sftp.php
2013-11-21 01:22:05 -08:00
Vincent Petry 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
Vincent Petry 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
Vincent Petry 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
Bjoern Schiessle 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
Bjoern Schiessle 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
Bjoern Schiessle b823505bd1 make sure that the owners home is mounted correctly 2013-11-19 18:28:51 +01:00
Vincent Petry 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
Vincent Petry 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
Vincent Petry a7962faa56 Fixed delete action to show error message as notification 2013-11-19 15:05:11 +01:00
Morris Jobke 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
Jan-Christoph Borchardt 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
Jörn Friedrich Dreyer 5da2929180 fix filtering number like filenames in filelist
forward port of 847ad6c40b
2013-11-18 17:18:31 +01:00
Jan-Christoph Borchardt f2d18867af change bold 'deleted files' button to normal for less focus 2013-11-18 15:06:38 +01:00
Vincent Petry d306f5c4cf Merge pull request #5908 from owncloud/fix_errorpage_call
[encryption] fix redirectToErrorPage() call
2013-11-18 05:17:28 -08:00
Vincent Petry 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
Bjoern Schiessle 82f30d37ca call error page with session as parameter 2013-11-17 13:23:07 +01:00
Jenkins for ownCloud c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05:00
hkjolhede 3e2d4c1bc1 Fixed error-checking error in sftp.php 2013-11-15 21:10:09 +01:00
Vincent Petry 68f278025c Merge pull request #5894 from owncloud/readd_sharing_token
readd sharing token to public template
2013-11-15 09:25:46 -08:00
blizzz cb968c77d1 Merge pull request #5772 from owncloud/fix5741
LDAP Wizard: introduce configuration status indicator, fixes #5741
2013-11-15 08:52:41 -08:00
Björn Schießle 3ad546002f Merge pull request #5833 from owncloud/encryption_fixes
[encryption] preserve timestamps and etags during encryption/decryption
2013-11-15 08:47:22 -08:00
Vincent Petry 6355af162c Merge pull request #5880 from owncloud/replace_etmp_files
write encryption tmp files to the cache folder
2013-11-15 07:53:23 -08:00
Bjoern Schiessle f36ee69855 tests added 2013-11-15 16:49:50 +01:00
Jörn Friedrich Dreyer 11425d142d readd sharing token to public template
necessary for https://github.com/owncloud/apps/pull/1476
2013-11-15 16:27:41 +01:00
Vincent Petry f9a64d2b27 Fix for smb4php fseek
The stream_fseek function must return a boolean which will be mapped
to 0 for success and -1 for failure for the caller.

This patch fixes stream_fseek of smb4php to also respect this
convention.

Since the encryption app is relying on fseek to detect whether a file is
encrypted by reading the last bit of data, this will fix #5023
2013-11-15 14:23:24 +01:00
Thomas Müller 1e863cd959 Merge pull request #5700 from owncloud/ldapWizSetDisplayNames
LDAP Wizard: do not forget to set display name attributes for user and g...
2013-11-15 01:12:54 -08:00
Thomas Müller 2bb4c266a6 Merge pull request #5862 from owncloud/files-singledotdirs
Files singledotdirs
2013-11-14 11:40:21 -08:00
Bjoern Schiessle faa08da944 instead of writing etmp files we write the dummy file to data/user/cache to avoid that etmp files show up in the users files list 2013-11-14 17:32:21 +01:00
Frank Karlitschek 29e9f2833d Merge pull request #5214 from owncloud/no_extra_slashes
Don't double-slash filenames at the root.
2013-11-14 07:53:51 -08:00
Vincent Petry 008c3b80d6 Files app backend now normalizes paths before rendering templates
Before rendering breadcrumbs or the file list, the paths are now
normalized. This prevents the UI to show "." breadcrumbs in case the
path contains sections with "/./"

Fixes #5848
2013-11-14 13:24:05 +01:00
Bjoern Schiessle 2624a6cb32 remove debug output 2013-11-14 12:13:22 +01:00
Bjoern Schiessle 2df3763675 test encryptAll() and decryptAll() to make sure that mtime and etag stay the same 2013-11-14 12:11:21 +01:00
Frank Karlitschek 58ff8a8673 Merge pull request #5805 from owncloud/shared-storage-copy-folder
Use View::copy and View::rename when copying or renaming files in the shared storage
2013-11-13 10:17:37 -08:00
Arthur Schiwon 84a882c651 LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take too much awareness 2013-11-13 19:07:28 +01:00
Arthur Schiwon 7a61dcadd2 LDAP Wizard: move status indicator in one line with back and continue buttons 2013-11-13 19:07:28 +01:00
Arthur Schiwon 4ee296051b LDAP Wizard: introduce configuration status indicator, fixes #5741 2013-11-13 19:07:28 +01:00
Frank Karlitschek 15c4e4ed09 Merge pull request #5806 from owncloud/styles-fix-external_storage
Fix spacing issue for checkboxes, vertically center checkboxes on person...
2013-11-13 07:43:59 -08:00
Morris Jobke 5aae550b11 Merge pull request #5809 from owncloud/fix5753
LDAP Wizard: proper behaviour with anonymous bind, fixes #5753
2013-11-13 06:52:07 -08:00
Morris Jobke ac0e87b1cc Merge pull request #5831 from owncloud/files-charatissue
Fixed total dirs/files message hiding condition
2013-11-13 05:22:48 -08:00
Bjoern Schiessle 222fa88eec Merge branch 'master' into encryption_fixes 2013-11-13 12:11:12 +01:00
Vincent Petry 3fa651f2b1 Merge pull request #5447 from owncloud/fixing-5117-master
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
Vincent Petry 5bdfccfc47 Fixed total dirs/files message hiding condition
Fixes #5829
2013-11-13 10:53:16 +01:00
Bjoern Schiessle dd0ebcede2 fixPartialFilePath() is now stripPartialFileExtension() 2013-11-12 18:48:31 +01:00
Bjoern Schiessle 77429c28fd rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does 2013-11-12 16:48:24 +01:00
Bjoern Schiessle e2fb8d7128 only update file cache if the file is already indexed to avoid that we create a incomplete file cache entry 2013-11-12 15:55:59 +01:00
Bjoern Schiessle 894856ce01 make sure that we keep the correct timestamp and etag after encryoption/decryption 2013-11-12 15:51:51 +01:00
Georg Ehrke 238e4bc3eb implement delete hooks in file versions lib 2013-11-12 14:06:32 +01:00
Georg Ehrke 90fac1f371 replace $path with '/files_trashbin/files/' . $file 2013-11-12 14:03:50 +01:00
Georg Ehrke feee4b865b add delete hook for trash bin app 2013-11-12 14:00:36 +01:00