mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,337 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

24337 Commits

Author SHA1 Message Date
Jenkins for ownCloud da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Clark Tomlinson 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
Clark Tomlinson 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
Joas Schilling c7e5e30b86 Merge pull request #15674 from owncloud/fix-console-check-output 
Convert error and hint to string before writing to the output
 2015-04-16 14:51:29 +02:00
Joas Schilling 3e1b58dd3d Merge pull request #15673 from owncloud/issue/15577-transaction-read-committed 
[master] Using TRANSACTION_READ_COMMITTED
 2015-04-16 14:33:35 +02:00
Bjoern Schiessle e93f262eac display warning if password changed or if the keys are not initialized 2015-04-16 14:30:19 +02:00
Bjoern Schiessle 959665003b decrypt private key for public shares correctly 2015-04-16 14:15:04 +02:00
Bjoern Schiessle b25c06f576 detect system wide mount points correctly 2015-04-16 14:15:04 +02:00
Bjoern Schiessle 67500d5f2f if we start writing a file from the beginning, size should start by zero; result of floor needs to be casted to int in order to compare it with ->size 2015-04-16 14:15:04 +02:00
Bjoern Schiessle d2ef73367c allow user to start migration in admin settings if no external user back-ends are enabled 2015-04-16 14:15:04 +02:00
Bjoern Schiessle 6bcf88ca96 fix decryption of legacy private key 2015-04-16 14:15:04 +02:00
Bjoern Schiessle e7a4f4f3e4 add version 2015-04-16 14:15:04 +02:00
Bjoern Schiessle e3d77c4b01 add migration script from old encryption to new one 2015-04-16 14:15:04 +02:00
Thomas Müller 07243f0482 Convert error and hint to string before writing to the output - fixes https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html 2015-04-16 12:32:17 +02:00
Joas Schilling 99b0c6e525 Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master 
files_encryption -> encryption
 2015-04-16 11:57:14 +02:00
Thomas Müller bcf65d9c13 Using TRANSACTION_READ_COMMITTED 2015-04-16 11:49:12 +02:00
Thomas Müller b6f79567aa files_encryption -> encryption 2015-04-16 10:46:34 +02:00
Jörn Friedrich Dreyer 2e06cf49a5 Merge pull request #15623 from t3chguy/master 
Redis DB Index via Select
 2015-04-16 09:30:07 +02:00
Jenkins for ownCloud 8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Michael Telatynski 8ebf9de3f8 Memcache\Redis Add DB Select Functionality 2015-04-15 21:24:38 +01:00
Frank Karlitschek f50798a674 8.1 alpha 1 2015-04-15 22:16:26 +02:00
Morris Jobke 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
Bjoern Schiessle 389a101de6 make sure that encrypted private keys always have a header 2015-04-15 19:52:48 +02:00
Morris Jobke 512558c827 Merge pull request #15644 from owncloud/sftp-defaultport-storageid 
Fix SFTP storage id to be compatible with older ids
 2015-04-15 17:40:18 +02:00
Morris Jobke 4a5c3eea42 Add visibility for method 2015-04-15 17:40:07 +02:00
Morris Jobke 9e46b7175d Merge pull request #15638 from owncloud/primary-button-disabled 
add disabled state to primary action button
 2015-04-15 16:43:40 +02:00
Vincent Petry 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
Jan-Christoph Borchardt 14b92c3ce6 Merge pull request #15632 from owncloud/remove-tooltip-fade 
remove slow fade animation for remaining tipsy tooltips
 2015-04-15 14:42:45 +02:00
Jan-Christoph Borchardt 008e3376c6 add disabled state to primary action button 2015-04-15 14:23:54 +02:00
Jan-Christoph Borchardt 04ca5b8160 remove slow fade animation for remaining tipsy tooltips 2015-04-15 12:25:10 +02:00
Vincent Petry 75268860fc Merge pull request #15626 from owncloud/remove-tooltip-fade 
remove slow fade animation for tipsy tooltip
 2015-04-15 12:14:54 +02:00
Thomas Müller 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
Jan-Christoph Borchardt 9332c8c266 remove slow fade animation for tipsy tooltip 2015-04-15 09:10:21 +02:00
Jenkins for ownCloud 1a894bd0d8 [tx-robot] updated from transifex 2015-04-15 01:54:38 -04:00
Morris Jobke e33e5b425a Merge pull request #12006 from owncloud/dav-put-storage 
Work directly on the storage when uploading over webdav
 2015-04-15 03:08:52 +02:00
Jenkins for ownCloud 843290a0fb [tx-robot] updated from transifex 2015-04-14 18:22:17 -04:00
Jenkins for ownCloud 7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Thomas Müller 70480423ff Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath 
Adding a final fallback for findBinaryPath
 2015-04-15 00:16:56 +02:00
Thomas Müller 1aa368effe Merge pull request #15592 from owncloud/fix-15590-master 
Avoid php message "Invalid argument supplied for foreach()"
 2015-04-15 00:14:08 +02:00
Vincent Petry 2a68336952 Merge pull request #15612 from owncloud/fix-transifex-master 
files_encryption -> encryption
 2015-04-14 18:10:17 +02:00
Björn Schießle 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
Morris Jobke 717723b83e Remove unneeded comments 2015-04-14 16:44:24 +02:00
Robin Appelman eeecca04e6 Keep phpdoc updated. 2015-04-14 16:25:52 +02:00
Thomas Müller 922c3ee975 files_encryption -> encryption 2015-04-14 16:18:12 +02:00
Morris Jobke c53a53f705 Allow files app nav entries to have a different icon class 2015-04-14 16:17:24 +02:00
Robin Appelman 308af8b909 pass a stream to the tests 2015-04-14 15:25:52 +02:00
Morris Jobke 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
Olivier Paroz bb0c09e994 Adding a final fallback for findBinaryPath 2015-04-14 14:06:58 +02:00
Thomas Müller cbe30f740e remove calculateUnencryptedSize() - not needed 2015-04-14 13:08:59 +02:00
Thomas Müller 967e882757 return size from cache in case the cache entry is marked as encrypted 2015-04-14 13:08:59 +02:00