Vincent Petry
06dec2632f
Merge pull request #6512 from owncloud/master-failingoracletests
...
Removed numRows usage from encryption app
2013-12-19 08:22:44 -08:00
Björn Schießle
079f1a6f41
Merge pull request #6495 from owncloud/enc_fseek_fallback
...
Added fseek fallback to the encryption app
2013-12-19 07:09:07 -08:00
Vincent Petry
963ee31efb
Removed numRows usage from encryption app
...
numRows on Oracle always seem to return 0.
This fix removes numRows usage from the encryption and sharing app.
This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
2013-12-19 15:51:24 +01:00
Jenkins for ownCloud
37cdbc3be0
[tx-robot] updated from transifex
2013-12-19 01:57:03 -05:00
Bjoern Schiessle
df0c1fe7f3
add test for the stream wrapper to read encrypted files from the system folder /tmp
2013-12-18 17:07:35 +01:00
Bjoern Schiessle
f9ec3a7124
test for isEncryptedPath()
2013-12-18 16:39:34 +01:00
Bjoern Schiessle
4f8ae789ae
extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek
2013-12-18 15:43:50 +01:00
Bjoern Schiessle
d9668977cd
implement ftell stream wrapper and fix return value from fseek stream wrapper
2013-12-18 15:41:40 +01:00
Thomas Müller
277ae28171
Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
...
Fixed download file from URL error messages
2013-12-18 06:03:50 -08:00
Thomas Müller
930a46e8e2
Merge pull request #6469 from owncloud/enc_cleanup
...
remove duplicated code
2013-12-18 05:21:42 -08:00
Jan-Christoph Borchardt
ee2ecbe543
Merge pull request #6366 from owncloud/fix-6335
...
Bump the footer down 20px to avoid overlap.
2013-12-17 14:59:24 -08:00
Jenkins for ownCloud
6488ff2c75
[tx-robot] updated from transifex
2013-12-17 16:43:17 -05:00
Björn Schießle
22a6bf9e5a
Merge pull request #6474 from owncloud/enc_detect_encrypted_files
...
reliable detect encrypted files
2013-12-17 09:12:02 -08:00
Frank Karlitschek
0b9f4130b0
clarifying license
2013-12-17 17:32:01 +01:00
Bjoern Schiessle
9a94c07553
remove unused method tail()
2013-12-17 16:19:00 +01:00
Bjoern Schiessle
c955381d56
fall back to getLocalFile if storage doesn't support fseek
2013-12-17 16:18:05 +01:00
Bjoern Schiessle
69b89454a4
reliable detect encrypted files
2013-12-17 15:53:25 +01:00
Jenkins for ownCloud
a99dd3183c
[tx-robot] updated from transifex
2013-12-17 06:46:52 -05:00
Bjoern Schiessle
83417d69be
remove duplicated code
2013-12-17 11:28:05 +01:00
Frank Karlitschek
753525c57f
Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb
...
always show 'Deleted Files' breadcrumb
2013-12-17 00:25:06 -08:00
Björn Schießle
4ae148cebd
Merge pull request #6183 from owncloud/enc_tests
...
enable more encryption tests
2013-12-16 08:46:52 -08:00
Bjoern Schiessle
3e17fbe30d
always show home breadcrumb in files view
2013-12-16 17:40:35 +01:00
Bjoern Schiessle
95892c8be9
update file cache for target file
2013-12-16 16:05:24 +01:00
Bjoern Schiessle
cdd816c930
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
2013-12-16 16:05:24 +01:00
Bjoern Schiessle
6d489e0474
call set password hook because it doesn't get triggered during test execution and fix paths
2013-12-16 16:00:16 +01:00
Jenkins for ownCloud
77b68505c2
[tx-robot] updated from transifex
2013-12-13 14:44:31 -05:00
Vincent Petry
769256cb39
Merge pull request #6321 from sevoku/master
...
fix smbclient directory listing parser
2013-12-13 09:13:06 -08:00
Arthur Schiwon
1292793c4b
LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
2013-12-13 16:29:42 +01:00
Bjoern Schiessle
3831b8b1be
always show 'Deleted Files' breadcrumb
2013-12-13 12:17:10 +01:00
ringmaster
e2197c7108
Bump the footer down 20px to avoid overlap.
...
Fixes #6335 .
2013-12-12 13:06:57 -05:00
Bjoern Schiessle
79719d9ae5
toggle select all checkbox
2013-12-12 17:33:04 +01:00
Arthur Schiwon
5ba9344b0e
LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
2013-12-12 14:15:39 +01:00
Vincent Petry
335b2f40a6
Fixed download file from URL error messages
...
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
OC_L10N_String values
2013-12-12 10:38:12 +01:00
Jenkins for ownCloud
7b20212c0a
[tx-robot] updated from transifex
2013-12-11 13:32:13 -05:00
Vsevolod Kukol
a8f814fe2d
fix smbclient directory listing parser
2013-12-11 17:21:34 +01:00
Vincent Petry
050f87c9e4
Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfix
...
Fixed sharing results to include the correct permissions
2013-12-11 02:59:22 -08:00
Vincent Petry
e9255e5d57
Added unit test for sharing permissions
2013-12-10 11:19:09 +01:00
Vincent Petry
89eb3759a8
Fixed sharing results to include the correct permissions
...
Passing $includeCollections would return more than one entry which gives
mixed up file permissions.
Added a method getFile() that doesn't set $includeCollections to make
sure we only get one result which is the file itself.
Fixes #6265
2013-12-09 18:14:58 +01:00
Jenkins for ownCloud
6aab1ebf44
[tx-robot] updated from transifex
2013-12-09 06:40:22 -05:00
Jenkins for ownCloud
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
Björn Schießle
575a68074f
Merge pull request #6220 from owncloud/debug_oracle_errors
...
cherry-picks from #5884 , just for debugging purpose
2013-12-06 10:00:04 -08:00
blizzz
b5939324b0
Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode
...
correctly propagate the return value of ldap_set_option
2013-12-06 08:54:29 -08:00
Bart Visscher
40f148cc6c
Don't try to encrypt a file when the temp file isn't created
2013-12-06 17:01:13 +01:00
Bjoern Schiessle
9ff231590c
set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
2013-12-06 16:11:41 +01:00
Björn Schießle
b18c8e5c53
Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire
...
Sharing etag propagation on expire
2013-12-06 05:41:08 -08:00
Bjoern Schiessle
e447d978d3
it is not possible to unshare files
2013-12-06 12:35:47 +01:00
Bjoern Schiessle
9371944e43
fix typo
2013-12-06 12:20:42 +01:00
Bjoern Schiessle
58c0117c3d
only create new key on password change if a recovery key exists or if the user don't have any private/public keys
2013-12-06 12:20:31 +01:00
Bjoern Schiessle
8082ef2073
show change password form if key couldn't be decrypted
2013-12-06 12:20:22 +01:00
Bjoern Schiessle
85467b973a
add method to check if users private/public key exists
2013-12-06 12:20:14 +01:00
