Thomas Müller
739c3f01aa
Merge pull request #16434 from owncloud/persist-maintenance-state
...
Persist the state of the maintenance after an upgrade
2015-06-03 13:56:17 +02:00
Thomas Müller
69d1e7aaf4
Merge pull request #16687 from owncloud/issue-16113-redis-minimum-version
...
Check for redis to be 2.2.5+
2015-06-03 13:55:26 +02:00
Lukas Reschke
3a233b8698
Merge pull request #16714 from owncloud/fix-cors-test
...
Fix #16713
2015-06-03 13:52:14 +02:00
Morris Jobke
e3440863bc
Merge pull request #16708 from owncloud/enc_fix_move_to_trash
...
make sure that we always use the correct owner for both source and target
2015-06-03 13:49:46 +02:00
Lukas Reschke
9ba5081d47
Merge pull request #16710 from owncloud/move-invoke-private-to-base-class
...
Move the helpful invokePrivate method to the TestCase class
2015-06-03 13:41:32 +02:00
Thomas Müller
7de2940b42
Merge pull request #16711 from owncloud/files-invalidchar400
...
Translate invalid path exception to sabre exception for files
2015-06-03 13:40:31 +02:00
Bernhard Posselt
21ce5d034b
fix #16713
2015-06-03 12:56:50 +02:00
Joas Schilling
d3e3a84cae
Move the helpful method to the TestCase class
2015-06-03 12:33:29 +02:00
Vincent Petry
6ab38be40e
Translate invalid path exception to sabre exception for files
2015-06-03 12:22:31 +02:00
Bjoern Schiessle
7eb2b31e34
make sure that we always use the correct owner for both source and target
2015-06-03 11:59:06 +02:00
Vincent Petry
500748725c
Merge pull request #16698 from owncloud/use-proper-quoting
...
Properly quote memcache.locking
2015-06-03 10:45:14 +02:00
Jenkins for ownCloud
410a836702
[tx-robot] updated from transifex
2015-06-03 01:55:29 -04:00
Lukas Reschke
b806502cdb
Properly quote memcache.locking
2015-06-02 21:46:57 +02:00
Lukas Reschke
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
Morris Jobke
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
Joas Schilling
bdc82dcfb9
Check for redis to be 2.2.5+
2015-06-02 15:42:48 +02:00
Morris Jobke
70f0cf67a5
L10n for federated cloud ID and rtrim '/' on ID
2015-06-02 15:16:21 +02:00
Bjoern Schiessle
6e5ed81064
show federated cloud id in the personal settings
2015-06-02 14:09:53 +02:00
Thomas Müller
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
Joas Schilling
be1f319511
Correctly ignore remote shares aswell
2015-06-02 12:33:51 +02:00
Joas Schilling
50a31fa8f9
Add unit tests for wrapStorage
2015-06-02 12:33:17 +02:00
Joas Schilling
9a4040c7ca
Move the storage wrapping into a testable method
2015-06-02 12:29:06 +02:00
Morris Jobke
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
Morris Jobke
cf2c599218
Merge pull request #16200 from owncloud/kill-globalfilecache
...
Drop file caching
2015-06-02 09:11:33 +02:00
Jenkins for ownCloud
baca5c60c0
[tx-robot] updated from transifex
2015-06-02 01:56:23 -04:00
Thomas Müller
1acdef5e34
Merge pull request #16672 from owncloud/tests-xmlupdate
...
Fix phpunit xml
2015-06-01 21:31:39 +02:00
Vincent Petry
ac98480028
Fix phpunit xml
...
Rename/remove obsolete paths
2015-06-01 20:42:32 +02:00
Joas Schilling
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
Lukas Reschke
73875da4b0
Clean application identifier before processing
2015-06-01 17:03:51 +02:00
Lukas Reschke
418f4e1a90
Bump Dropbox library to newest upstream version
2015-06-01 17:03:46 +02:00
Thomas Müller
2f8296875f
Merge pull request #16237 from owncloud/file-locking
...
High level file locking
2015-06-01 16:37:38 +02:00
Lukas Reschke
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
Thomas Müller
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
Thomas Müller
2104c2ffdd
Fixing undefined index 'foo'
2015-06-01 14:10:00 +02:00
Tom Needham
2bf9219be3
Fix grammar of search results phrase
2015-06-01 12:29:12 +01:00
Robin Appelman
8902e2be73
fix nooplockingprovider
2015-06-01 13:25:27 +02:00
Robin Appelman
ce04cf6610
shared lock around hooks
2015-06-01 13:24:02 +02:00
Robin Appelman
661c9e2444
add changeLock to the storage api
2015-06-01 13:24:02 +02:00
Robin Appelman
a1372b2fb5
add method to atomically change between shared and exclusive lock
2015-06-01 13:24:02 +02:00
Thomas Müller
43772e2a9a
Adding information on file locking status to admin section
2015-06-01 13:24:02 +02:00
Vincent Petry
270a10b754
Return 423 instead of 503 for locked files
2015-06-01 13:24:02 +02:00
Vincent Petry
0451a6652d
Move locking exceptions
2015-06-01 13:24:02 +02:00
Vincent Petry
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
Robin Appelman
8665a98744
add locking for non-chunking webdav upload
2015-06-01 13:22:57 +02:00
Robin Appelman
72776b165f
use arraycache for locking in unit tests
2015-06-01 13:22:56 +02:00
Robin Appelman
6b965d71d1
add seperate config option for locking memcache backend
2015-06-01 13:22:56 +02:00
Robin Appelman
72847dbc77
always use locking in unit tests
2015-06-01 13:22:56 +02:00
Robin Appelman
437c0b55a6
unlock source file when we cant lock the target in a rename
2015-06-01 13:22:56 +02:00
Robin Appelman
668fafd4d2
close file handle after sending sabre response
2015-06-01 13:22:56 +02:00
Vincent Petry
2f4f468399
Added config switch for file locking
2015-06-01 13:22:56 +02:00
