Thomas Müller
f2fe9fffd9
Merge pull request #15699 from owncloud/fix-15696-master
...
Fix 15696 master
2015-04-17 17:36:07 +02:00
Thomas Müller
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
Thomas Müller
2e803fd2cd
Do not concat translation string
2015-04-17 14:26:58 +02:00
Thomas Müller
d9f23c0578
fixing undefined variable
2015-04-17 14:25:57 +02:00
Thomas Müller
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
Thomas Müller
d9990c2b4e
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager'
2015-04-17 13:55:31 +02:00
Bjoern Schiessle
195a48b2b8
fix change password if no user is logged in, occ call
2015-04-17 13:26:38 +02:00
Thomas Müller
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
Vincent Petry
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
Vincent Petry
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
Bjoern Schiessle
7d4b1b52d0
always create a new instance of the encryption module
2015-04-17 10:31:33 +02:00
Roeland Jago Douma
b971029652
Added unit tests
2015-04-17 09:38:09 +02:00
Roeland Jago Douma
595adfd193
moved from html to $('html') to fix unit tests
2015-04-17 09:38:09 +02:00
Roeland Jago Douma
c456f5dee1
Reset sharedialog values
2015-04-17 09:38:09 +02:00
Thomas Müller
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
Thomas Müller
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
Jenkins for ownCloud
da44df2cfa
[tx-robot] updated from transifex
2015-04-17 01:55:37 -04:00
Morris Jobke
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
Morris Jobke
1d30efdd73
Fix private member access of parent class in ocsresponse
...
* noticed while checking PHPDoc
2015-04-16 16:54:01 +02: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
Frank Karlitschek
59161774e4
8.1.0 alpha 2
2015-04-15 23:55:25 +02:00
Morris Jobke
7b7d05eb74
Merge pull request #15805 from owncloud/fileslist-whitespace
...
add whitespace to bottom of files list to correctly show dropdowns
2015-04-22 23:53:26 +02:00
Vincent Petry
903d52d45f
Merge pull request #15809 from owncloud/view-null-root
...
dont allow using null as view root
2015-04-22 18:10:26 +02:00
Robin Appelman
bd57902d1d
typo
2015-04-22 16:24:37 +02:00
Robin Appelman
e302213248
add unit tests for null handling in view
2015-04-22 16:24:25 +02:00
Thomas Müller
750f0bc489
Merge pull request #15799 from owncloud/fix-enc-folder-move
...
Fix enc folder move
2015-04-22 16:04:29 +02:00
Robin Appelman
f391f88d7f
dont allow using null as view root
2015-04-22 14:51:02 +02:00
Jan-Christoph Borchardt
b92dd82e41
add whitespace to bottom of files list to correctly show dropdowns, fix #15801
2015-04-22 13:58:53 +02:00
Thomas Müller
0042bdd2e7
fix PHPDoc
2015-04-22 13:12:52 +02:00
Thomas Müller
225cde2183
pass KeyStorage via ctor
2015-04-22 13:09:42 +02:00
Thomas Müller
987bc138df
calling renameKeys() on directory level as well - fixes #15778
2015-04-22 12:12:27 +02:00
Thomas Müller
fc4127dd62
add $encryptionModuleId to methods of Keys/IStorage
2015-04-22 11:53:05 +02:00
Michael Telatynski
8ebf9de3f8
Memcache\Redis Add DB Select Functionality
2015-04-15 21:24:38 +01:00