4f0769fc07
Merge pull request #15483 from owncloud/maintenance-refresh
...
Fix maintenance refresh interval
2015-04-08 22:46:35 +02:00
98698e05e8
Add JS unit test for sorting
2015-04-08 22:08:37 +02:00
f3ef17a963
Merge pull request #15490 from owncloud/remove-debug-logging
...
remove unessesary logging of methods instantiation
2015-04-08 21:42:47 +02:00
eb1cf58d11
Reference `$(this)` instead
2015-04-08 21:26:12 +02:00
0cd29e00d1
Fix wording
2015-04-08 21:24:03 +02:00
4e60b81264
Merge pull request #14120 from owncloud/dav-statcache
...
Stat cache for DAV storage, improves s2s performance a little bit
2015-04-08 21:09:28 +02:00
62936aa323
Merge pull request #15488 from owncloud/files-navigation-icons
...
add icons to Files sidebar
2015-04-08 21:06:03 +02:00
91a90e25ae
fix for IE8
2015-04-08 21:05:31 +02:00
3ffb2d8abd
remove unessesary logging of methods instantiation
2015-04-08 14:46:01 -04:00
84c2fe85b7
add icons to files sidebar, fix shade, fix position of settings icon and text
2015-04-08 19:25:28 +02:00
053c15d1a7
Merge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabled
...
don't throw exception if a file gets uploaded and encryption is disabled
2015-04-08 18:50:40 +02:00
78ec7543d5
Fix maintenance refresh interval
...
* fix XMLHttpRequest - send after callback is registered
* check for correct type of value - it's a boolean
* return correct content-type in status.php
2015-04-08 18:02:00 +02:00
c379557e1d
don't throw exception if a file gets uploaded and encryption is disabled
2015-04-08 16:41:20 +02:00
fc2711e156
Merge pull request #15472 from owncloud/enc_backward_compatibility
...
make private key handling backward compatible
2015-04-08 09:38:27 -04:00
103d451459
Merge pull request #14987 from rullzer/ocs_password_fix2
...
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
d01a2acbcf
Merge pull request #15469 from owncloud/fix/15463
...
Fix language level incompatibilties
2015-04-08 14:30:56 +02:00
4ce5669419
read cipher from key header and always write a key header if a new private key is stored
2015-04-08 14:26:00 +02:00
69ba67ec0f
Merge pull request #15464 from owncloud/fixmasterunittests
...
Replace originalStorage in tests with a proper teardown
2015-04-08 14:24:42 +02:00
6a59502759
Work directly on the storage when uploading over webdav
2015-04-08 14:04:58 +02:00
c3c50fb481
Fix language level incompatibilties
...
Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master.
Fixed https://github.com/owncloud/core/issues/15463
2015-04-08 13:55:10 +02:00
c12dd2820c
Merge pull request #15465 from owncloud/issue/15456-disable-ocs-maintenance
...
Disable OCS api when in maintenance mode
2015-04-08 13:29:49 +02:00
4acf6747d2
Disable trashbin when testing orphaned shares deletion job
2015-04-08 13:04:06 +02:00
19834211b4
Merge pull request #15443 from owncloud/encryption-user-hook-tests
...
adding test for user hooks
2015-04-08 12:56:18 +02:00
f7dd16f1ac
Disable OCS api when in maintenance mode
2015-04-08 12:51:20 +02:00
f8cfc03f36
Replace originalStorage in tests with a proper teardown
...
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.
This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
2015-04-08 12:45:38 +02:00
59322a5037
Merge pull request #15333 from owncloud/copy-cross-device
...
fix copying folder across devices
2015-04-08 12:35:15 +02:00
9c3893ce69
Added FIXME about registering jobs in apps.php
2015-04-08 12:09:42 +02:00
d53aa4a816
Fixing issue #15322 - showing Settings button next to gear icon
2015-04-08 11:57:33 +02:00
dfc0a26e57
Merge pull request #15453 from owncloud/enc2_fix
...
fix function call
2015-04-08 11:10:00 +02:00
17b141337a
Delete orphaned shares in a background job
2015-04-08 10:47:55 +02:00
cefdcea021
[command] delete orphaned file cache entries
...
* ./occ files:cleanup
* delete file cache entries without an existing storage
2015-04-08 10:23:56 +02:00
215a9bcbc3
fix function call
2015-04-08 09:32:55 +02:00
f099c9883e
Adding check command to validate server environment - fixes #15429
2015-04-08 00:19:23 +02:00
6c327f8331
Merge pull request #14879 from oparoz/fix-preview-caching
...
Introducing the maximum size preview
2015-04-07 18:16:24 +02:00
4098f5f7fd
adding test for user hooks
2015-04-07 11:49:50 -04:00
d28d7c470f
Merge pull request #15441 from owncloud/fix-file-headers-master
...
fixing license headers - encryption code related
2015-04-07 17:15:17 +02:00
a4483243ac
fixing license headers - encryption code related
2015-04-07 17:02:49 +02:00
1fbf5d86df
Merge pull request #14472 from owncloud/feature/wipencryptionapp
...
encryption 2.0 app
2015-04-07 16:46:45 +02:00
74bf9806b0
Introducing the maximum size preview
...
The first time we're asked to generate a preview we'll generate one of the maximum dimension indicated in the configuration and all future resizing requests will be done on that preview in order to not waste time converting the same file over and over.
One of the fixes required for #12465
2015-04-07 16:45:59 +02:00
2d2cb09715
fixing unit test - expected value change due to different size being stored in cache table
2015-04-07 14:30:01 +02:00
2182ae0d27
Merge pull request #15431 from owncloud/displayname-width
...
widen displayName input field
2015-04-07 14:24:01 +02:00
161d80da5b
In case of encryption exceptions we return 503 - this will allow the client to retry
2015-04-07 14:17:42 +02:00
dd7c491bff
Fix PHPDoc
2015-04-07 13:49:16 +02:00
a2182cde90
Deduplicate code
2015-04-07 13:48:33 +02:00
6cc3fd9270
Merge pull request #15426 from owncloud/issue/15420-remove-hardcoded-docs-link
...
Remove hardcoded link to performance docs
2015-04-07 13:47:35 +02:00
54a3bdf1c5
fixing unit test execution related to trashbin
2015-04-07 13:30:31 +02:00
268d346b36
fixing unit tests
2015-04-07 13:30:31 +02:00
4a70ca665c
respect mount option while encrypting
2015-04-07 13:30:31 +02:00
d637bffac6
adding user setup test and adding 4 tests to keymanager
2015-04-07 13:30:31 +02:00
28c8017928
adding recoverFileTest
2015-04-07 13:30:31 +02:00
Thomas Müller
Lukas Reschke
Morris Jobke
Clark Tomlinson
Jan-Christoph Borchardt
Vincent Petry
Bjoern Schiessle
Robin Appelman
Joas Schilling
James Anslow
Olivier Paroz