wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
25437 commits 157 branches 562 tags 714 MiB
Commit graph

25437 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Morris Jobke
49d6186714 Add min-height to login page for IE8 and IE9 2015-06-03 10:22:57 +02:00
Morris Jobke
99c6f96c69 Revert "fix theme in IE8 and IE9" 
This reverts commit a4c9688711.
 2015-06-03 10:20:29 +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
Vincent Petry
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
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
Vincent Petry
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
Robin Appelman
a9455be14a more hints 2015-06-02 14:16:37 +02:00
Bjoern Schiessle
6e5ed81064 show federated cloud id in the personal settings 2015-06-02 14:09:53 +02:00
Robin Appelman
0497534a6e more type hints 2015-06-02 14:07:55 +02:00
Robin Appelman
8926bca0c7 phpdoc, strict and type hints 2015-06-02 14:07:55 +02:00
Robin Appelman
6f47a547d8 only use mount provider if we have a valid user 2015-06-02 14:07:54 +02:00
Robin Appelman
24131586d7 call mount providers that are registered after the filesystem is setup 2015-06-02 14:07:54 +02:00
Robin Appelman
c91b52d38c move emitter implementation to a trait 2015-06-02 14:07:54 +02:00
Robin Appelman
4b48dd424f emit hooks from a view as long as the path is inside the default root 2015-06-02 14:07:20 +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
Vincent Petry
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
Vincent Petry
30d7f92763 Get etag from remote OC server 2015-06-02 11:42:03 +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