0ca6398aa3
Revert "use a simple function - OC.Encryption is already defined - fixes #15707"
...
This reverts commit c1a60a2349
2015-04-17 18:02:00 +02:00
a255866a93
make jshint happy
2015-04-17 17:59:53 +02:00
b083b65894
fix capitalization for server-side encryption and email server, fix #15642
2015-04-17 17:57:30 +02:00
c1a60a2349
use a simple function - OC.Encryption is already defined - fixes #15707
2015-04-17 17:57:17 +02:00
f2fe9fffd9
Merge pull request #15699 from owncloud/fix-15696-master
...
Fix 15696 master
2015-04-17 17:36:07 +02:00
85dbaeee97
Merge pull request #15695 from owncloud/handle-app-upgrade-of-filesystem-apps
...
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encry...
2015-04-17 17:07:18 +02:00
2e803fd2cd
Do not concat translation string
2015-04-17 14:26:58 +02:00
d9f23c0578
fixing undefined variable
2015-04-17 14:25:57 +02:00
295839930a
Merge pull request #15686 from owncloud/enc_fix_change_password
...
fix change password if no user is logged in, occ call
2015-04-17 14:14:29 +02:00
d9990c2b4e
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager'
2015-04-17 13:55:31 +02:00
195a48b2b8
fix change password if no user is logged in, occ call
2015-04-17 13:26:38 +02:00
d671f13f26
Write the type of exception to the log - really helpful for exceptions which hold no message
2015-04-17 13:10:10 +02:00
b7e5884b54
Get rid of the obsolete OC_VObject class
...
The class isn't needed any more since the update to Sabre 2.1
2015-04-17 12:55:31 +02:00
aef6ecdbf1
Merge pull request #15616 from owncloud/enc_stream_copy
...
always create a new instance of the encryption module
2015-04-17 11:32:24 +02:00
7d4b1b52d0
always create a new instance of the encryption module
2015-04-17 10:31:33 +02:00
f32d97750c
Merge pull request #15679 from owncloud/fix-private-member-access
...
Fix private member access of parent class in ocsresponse
2015-04-17 09:13:54 +02:00
852cc6f2c6
Merge pull request #15680 from owncloud/add-since-tags-to-public-namespace
...
Add @since tags to all methods in public namespace
2015-04-17 09:13:04 +02:00
da44df2cfa
[tx-robot] updated from transifex
2015-04-17 01:55:37 -04:00
7644950b48
Add @since tags to all methods in public namespace
...
* enhance the app development experience - you can look up the
method introduction right inside the code without searching
via git blame
* easier to write apps for multiple versions
2015-04-16 17:00:08 +02:00
1d30efdd73
Fix private member access of parent class in ocsresponse
...
* noticed while checking PHPDoc
2015-04-16 16:54:01 +02: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
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
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
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
b25c06f576
detect system wide mount points correctly
2015-04-16 14:15:04 +02:00
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
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
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
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
99b0c6e525
Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master
...
files_encryption -> encryption
2015-04-16 11:57:14 +02:00
bcf65d9c13
Using TRANSACTION_READ_COMMITTED
2015-04-16 11:49:12 +02:00
b6f79567aa
files_encryption -> encryption
2015-04-16 10:46:34 +02:00
2e06cf49a5
Merge pull request #15623 from t3chguy/master
...
Redis DB Index via Select
2015-04-16 09:30:07 +02:00
8606b7ca66
[tx-robot] updated from transifex
2015-04-16 01:54:43 -04:00
8ebf9de3f8
Memcache\Redis Add DB Select Functionality
2015-04-15 21:24:38 +01:00
f50798a674
8.1 alpha 1
2015-04-15 22:16:26 +02: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
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
4a5c3eea42
Add visibility for method
2015-04-15 17:40:07 +02:00
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
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
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
008e3376c6
add disabled state to primary action button
2015-04-15 14:23:54 +02:00
04ca5b8160
remove slow fade animation for remaining tipsy tooltips
2015-04-15 12:25:10 +02:00
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
Jan-Christoph Borchardt
Bjoern Schiessle
Vincent Petry
Jenkins for ownCloud
Morris Jobke
Clark Tomlinson
Joas Schilling
Jörn Friedrich Dreyer
Michael Telatynski
Frank Karlitschek