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 |
|
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 |
|
Morris Jobke
|
9eff199a17
|
Merge pull request #15360 from owncloud/cross-storage-move-cache
Preserve cache data when doing a cross storage move
|
2015-04-13 21:48:30 +02:00 |
|
Morris Jobke
|
74732cc0d8
|
Fix user list
* the name cell was changed from td to th because of accessibility
issues - this adjusts the CSS and JS to behave like before
|
2015-04-13 21:43:36 +02:00 |
|
Robin Appelman
|
f605c98531
|
Fix cross storage move with shared storages
|
2015-04-13 17:10:05 +02:00 |
|
Robin Appelman
|
01da6be4d6
|
upda tests
|
2015-04-13 17:10:02 +02:00 |
|
Robin Appelman
|
addfafd9da
|
Fix moving mount points
|
2015-04-13 17:10:02 +02:00 |
|
Robin Appelman
|
8688660825
|
check that we know the parent
|
2015-04-13 17:10:02 +02:00 |
|
Robin Appelman
|
6b5daca7b7
|
check for source cache
|
2015-04-13 17:10:02 +02:00 |
|
Robin Appelman
|
caadc8cdd9
|
reuse cache move logic
|
2015-04-13 17:10:01 +02:00 |
|
Robin Appelman
|
d7b3a1a35a
|
preserve cache data when doing a cross storage move
|
2015-04-13 17:10:01 +02:00 |
Joas Schilling
|
71de1d58cd
|
Fix namespace duplication and other issues in repairlegacystorages
|
2015-04-13 16:34:10 +02:00 |
|
Thomas Müller
|
660aa7ff1e
|
Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_results
cach user folder for file search results
|
2015-04-13 15:16:07 +02:00 |
|
Robin Appelman
|
c29419e6d7
|
fix rebase issue
|
2015-04-13 15:13:03 +02:00 |
|
Robin Appelman
|
d4c91dc835
|
add missing return for shared
|
2015-04-13 15:13:03 +02:00 |