410a836702
[tx-robot] updated from transifex
2015-06-03 01:55:29 -04:00
b806502cdb
Properly quote memcache.locking
2015-06-02 21:46:57 +02:00
61356b5560
Keep versions when deleting as recipient
...
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.
This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
2015-06-02 17:13:00 +02:00
1cccb227c3
Merge pull request #16686 from owncloud/show_cloud_id
...
show federated cloud id in the personal settings
2015-06-02 17:05:33 +02:00
259937680b
Merge pull request #16667 from owncloud/issue-16510-fix-encryption-with-s2s-shares
...
Add tests for the storage wrapper and fix the wrapping
2015-06-02 16:42:32 +02:00
bdc82dcfb9
Check for redis to be 2.2.5+
2015-06-02 15:42:48 +02:00
70f0cf67a5
L10n for federated cloud ID and rtrim '/' on ID
2015-06-02 15:16:21 +02:00
120588dd7a
Disable update check test when testing wrappers
...
The checkUpdate test is intended for testing real storages, not
wrappers.
2015-06-02 15:14:37 +02:00
a9455be14a
more hints
2015-06-02 14:16:37 +02:00
6e5ed81064
show federated cloud id in the personal settings
2015-06-02 14:09:53 +02:00
0497534a6e
more type hints
2015-06-02 14:07:55 +02:00
8926bca0c7
phpdoc, strict and type hints
2015-06-02 14:07:55 +02:00
6f47a547d8
only use mount provider if we have a valid user
2015-06-02 14:07:54 +02:00
24131586d7
call mount providers that are registered after the filesystem is setup
2015-06-02 14:07:54 +02:00
c91b52d38c
move emitter implementation to a trait
2015-06-02 14:07:54 +02:00
4b48dd424f
emit hooks from a view as long as the path is inside the default root
2015-06-02 14:07:20 +02:00
3ebc8f0564
Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master
...
Fix get local file encryption master
2015-06-02 13:47:37 +02:00
be1f319511
Correctly ignore remote shares aswell
2015-06-02 12:33:51 +02:00
50a31fa8f9
Add unit tests for wrapStorage
2015-06-02 12:33:17 +02:00
9a4040c7ca
Move the storage wrapping into a testable method
2015-06-02 12:29:06 +02:00
c4cb93e644
Added storage backend test for checkUpdate
...
This helps testing whether checkUpdate properly returns false when no
change exists
2015-06-02 11:42:03 +02:00
30d7f92763
Get etag from remote OC server
2015-06-02 11:42:03 +02:00
d2f3710ede
Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview
...
Get a 96x96 preview for file conflict resolution
2015-06-02 09:36:51 +02:00
cf2c599218
Merge pull request #16200 from owncloud/kill-globalfilecache
...
Drop file caching
2015-06-02 09:11:33 +02:00
baca5c60c0
[tx-robot] updated from transifex
2015-06-02 01:56:23 -04:00
1acdef5e34
Merge pull request #16672 from owncloud/tests-xmlupdate
...
Fix phpunit xml
2015-06-01 21:31:39 +02:00
ac98480028
Fix phpunit xml
...
Rename/remove obsolete paths
2015-06-01 20:42:32 +02:00
1c47b14651
Merge pull request #16663 from owncloud/no-sense-to-check-for-cli
...
Remove check for RAW_POPULATE_POST_DATA for unit tests
2015-06-01 17:35:30 +02:00
73875da4b0
Clean application identifier before processing
2015-06-01 17:03:51 +02:00
418f4e1a90
Bump Dropbox library to newest upstream version
2015-06-01 17:03:46 +02:00
2f8296875f
Merge pull request #16237 from owncloud/file-locking
...
High level file locking
2015-06-01 16:37:38 +02:00
e6b0a7a55a
Remove check for RAW_POPULATE_POST_DATA for unit tests
...
We do have a work around meanwhile and for CLI this is not relevant at all. Can be removedWe do have a work around meanwhile and for CLI this is not relevant at all. Can be removed.
2015-06-01 16:35:54 +02:00
50b420446f
Merge pull request #16655 from owncloud/fix-search-results-phrase
...
Fix grammar of search results phrase
2015-06-01 14:57:50 +02:00
2104c2ffdd
Fixing undefined index 'foo'
2015-06-01 14:10:00 +02:00
2bf9219be3
Fix grammar of search results phrase
2015-06-01 12:29:12 +01:00
8902e2be73
fix nooplockingprovider
2015-06-01 13:25:27 +02:00
ce04cf6610
shared lock around hooks
2015-06-01 13:24:02 +02:00
661c9e2444
add changeLock to the storage api
2015-06-01 13:24:02 +02:00
a1372b2fb5
add method to atomically change between shared and exclusive lock
2015-06-01 13:24:02 +02:00
43772e2a9a
Adding information on file locking status to admin section
2015-06-01 13:24:02 +02:00
270a10b754
Return 423 instead of 503 for locked files
2015-06-01 13:24:02 +02:00
0451a6652d
Move locking exceptions
2015-06-01 13:24:02 +02:00
ba174ac626
Convert LockedException to FileLocked in Sabre connector
...
For Sabre to be able to return the proper error code instead of 500, the
LockedException is now rethrown as FileLocked exception in the Sabre
connector
2015-06-01 13:22:57 +02:00
8665a98744
add locking for non-chunking webdav upload
2015-06-01 13:22:57 +02:00
72776b165f
use arraycache for locking in unit tests
2015-06-01 13:22:56 +02:00
6b965d71d1
add seperate config option for locking memcache backend
2015-06-01 13:22:56 +02:00
72847dbc77
always use locking in unit tests
2015-06-01 13:22:56 +02:00
437c0b55a6
unlock source file when we cant lock the target in a rename
2015-06-01 13:22:56 +02:00
668fafd4d2
close file handle after sending sabre response
2015-06-01 13:22:56 +02:00
2f4f468399
Added config switch for file locking
2015-06-01 13:22:56 +02:00
Jenkins for ownCloud
Lukas Reschke
Vincent Petry
Morris Jobke
Joas Schilling
Robin Appelman
Bjoern Schiessle
Thomas Müller
Joas Schilling
Tom Needham