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 |
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 |
Joas Schilling
|
1592f25ed0
|
Scale up the font on larger previews
|
2015-04-15 14:03:40 +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 |
|
Robin Appelman
|
0f21303b75
|
a bit more phpdoc
|
2015-04-14 12:35:53 +02:00 |
|
Thomas Müller
|
387984a0d5
|
preserve filesize on rename after upload
|
2015-04-14 12:27:12 +02:00 |
|
Thomas Müller
|
f816acde27
|
fix reading of private key
|
2015-04-14 12:23:25 +02:00 |
|
Thomas Müller
|
88cc52c408
|
Avoid php message "Invalid argument supplied for foreach()" - refs #15590
|
2015-04-14 11:00:20 +02:00 |
|
Thomas Müller
|
ffa115b517
|
Merge pull request #15566 from owncloud/fix-filepicker
fix filepicker
|
2015-04-14 00:39:12 +02:00 |
Lukas Reschke
|
e36c0a0c12
|
Merge pull request #15585 from owncloud/fix-user-list
Fix user list
|
2015-04-13 23:30:37 +02:00 |
|
Morris Jobke
|
5f66f867b6
|
Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace
Fix namespace duplication and other issues in repairlegacystorages
|
2015-04-13 21:51:38 +02:00 |