da44df2cfa
[tx-robot] updated from transifex
2015-04-17 01:55:37 -04:00
ac133e9faa
Merge pull request #15675 from owncloud/enc_error_messages
...
[encryption] display warning if password changed or if the keys are not initialized
2015-04-16 09:45:09 -04:00
1174ad0681
Merge pull request #15445 from owncloud/enc2_migration
...
add migration script from old encryption to new one
2015-04-16 09:34:47 -04:00
e93f262eac
display warning if password changed or if the keys are not initialized
2015-04-16 14:30:19 +02:00
959665003b
decrypt private key for public shares correctly
2015-04-16 14:15:04 +02:00
6bcf88ca96
fix decryption of legacy private key
2015-04-16 14:15:04 +02:00
e7a4f4f3e4
add version
2015-04-16 14:15:04 +02:00
e3d77c4b01
add migration script from old encryption to new one
2015-04-16 14:15:04 +02:00
8606b7ca66
[tx-robot] updated from transifex
2015-04-16 01:54:43 -04:00
8653da6c16
Merge pull request #15654 from owncloud/enc2_header_system_keys
...
make sure that encrypted private keys always have a header
2015-04-15 20:28:58 +02:00
389a101de6
make sure that encrypted private keys always have a header
2015-04-15 19:52:48 +02:00
4a5c3eea42
Add visibility for method
2015-04-15 17:40:07 +02:00
a6c5d65fd6
Fix SFTP storage id to be compatible with older ids
...
Remove port from SFTP storage id if it is 22.
This will prevent recreating a different storage entry due to id
mismatch after upgrade.
2015-04-15 16:25:47 +02:00
1a2475227b
Merge pull request #15613 from owncloud/allow-files-nav-icons
...
Allow files app nav entries to have a different icon class
2015-04-15 11:18:58 +02:00
1a894bd0d8
[tx-robot] updated from transifex
2015-04-15 01:54:38 -04:00
7f3f191ee9
[tx-robot] updated from transifex
2015-04-14 18:19:31 -04:00
4f0437fbde
Merge pull request #15598 from owncloud/fix-enc-file-size-master
...
Fix file size of encrypted files
2015-04-14 16:48:04 +02:00
c53a53f705
Allow files app nav entries to have a different icon class
2015-04-14 16:17:24 +02:00
82cab25762
Merge pull request #13360 from owncloud/cross-storage-move
...
Proper copy/move between multiple local storages
2015-04-14 14:35:08 +02:00
cbe30f740e
remove calculateUnencryptedSize() - not needed
2015-04-14 13:08:59 +02:00
0f21303b75
a bit more phpdoc
2015-04-14 12:35:53 +02:00
f816acde27
fix reading of private key
2015-04-14 12:23:25 +02:00
ffa115b517
Merge pull request #15566 from owncloud/fix-filepicker
...
fix filepicker
2015-04-14 00:39:12 +02:00
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
8688660825
check that we know the parent
2015-04-13 17:10:02 +02:00
6b5daca7b7
check for source cache
2015-04-13 17:10:02 +02:00
d4c91dc835
add missing return for shared
2015-04-13 15:13:03 +02:00
d26c6cab90
properly return false if we cant delete the source file
2015-04-13 15:13:03 +02:00
d16ee4138d
Fix test
2015-04-13 15:13:03 +02:00
d726db7459
Implement move/copyFromStorage for shared storage
2015-04-13 15:13:03 +02:00
a88e013f72
Merge pull request #15570 from owncloud/shares-properlyformatmountpoint
...
Properly add trailing slash to mount point
2015-04-13 13:16:07 +02:00
2822d0579e
Properly add trailing slash to mount point
...
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
b21dc35355
Do not try to make user subadmin of group twice
...
If the provisioning api is used to make a user subadmin of a group that user
is already a subadmin just return success.
Added unit test to ensure things keep working.
2015-04-13 11:42:56 +02:00
59efcb63a3
fix filepicker
...
* add ability to filter for mimetype
* fixes #15526
* fixes #11563
2015-04-13 10:38:08 +02:00
7ce4d2dec9
Merge pull request #15535 from owncloud/smb-1.0.0
...
update icewind/smb to 1.0.0
2015-04-10 23:43:55 +02:00
294f14a793
Merge pull request #15538 from owncloud/encryption-crypt-tests
...
add unit test for crypt.php
2015-04-10 10:24:01 -04:00
7b2d53603c
Merge pull request #15489 from owncloud/dont_hide_exceptions_master
...
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
20a1a110de
Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2
...
Fix master unit test: Clear leftover shares from other tests
2015-04-10 15:42:16 +02:00
d1fa3c6b32
add unit test for crypt.php
2015-04-10 15:12:57 +02:00
a41fbf7a92
update icewind/smb to 1.0.0
2015-04-10 14:59:16 +02:00
4a225aa12c
Clear leftover shares from other tests
2015-04-10 14:53:17 +02:00
b51b5b64e6
Fix converting Guzzle error codes in s2s storage
2015-04-10 12:12:05 +02:00
73afca6207
Catch more exceptions when connecting to remote DAV server
...
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
1427ea78d4
fix typo and comment
2015-04-10 09:12:37 +02:00
5626a02d69
throw exception if setup is incomplete
2015-04-10 09:12:37 +02:00
077ab27281
fix_tests
...
Conflicts:
apps/user_ldap/tests/user_ldap.php
2015-04-10 09:12:37 +02:00
488405d1ec
do not hide exception when ldap server has a hiccup
2015-04-10 09:12:37 +02:00
43b503641c
Merge pull request #15521 from owncloud/shareinfo-catchguzzle503
...
Properly catch guzzle 503 when querying share info
2015-04-10 00:23:05 +02:00
02614d214e
Merge pull request #15437 from owncloud/deleteorphanedfiles
...
[command] delete orphaned file cache entries
2015-04-10 00:09:56 +02:00
Jenkins for ownCloud
Clark Tomlinson
Bjoern Schiessle
Morris Jobke
Vincent Petry
Thomas Müller
Björn Schießle
Robin Appelman
Roeland Jago Douma
Jörn Friedrich Dreyer