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

25596 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
57945dbc4b fix typehinting 2015-07-01 16:13:33 +02:00
Robin Appelman
207ce35ee9 phpdoc 2015-07-01 16:07:57 +02:00
Robin Appelman
faf642c31d expose the mount manager in the public api 2015-07-01 15:57:04 +02:00
Vincent Petry
5caeda33f1 Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes 
Catch more error codes thrown by federated shares
 2015-07-01 12:30:32 +02:00
Morris Jobke
b476c125c0 Merge pull request #15363 from owncloud/ext-ocp 
Use OCP classes as much as possible in files_external
 2015-07-01 11:16:52 +02:00
Vincent Petry
5d3aa36355 Catch more error codes thrown by federated shares 
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.

This prevents unpredictable error codes to block access to unrelated
folders needlessly.
 2015-07-01 11:14:03 +02:00
Robin McCorkell
728a22cda1 Use OCP classes as much as possible in files_external 2015-07-01 09:08:28 +02:00
Morris Jobke
b5c9196ffc Merge pull request #17088 from owncloud/add-verbosity-to-upgrade 
[upgrade] add verbosity check and show repair info & steps
 2015-07-01 08:56:06 +02:00
Morris Jobke
4e44cc49d9 Merge pull request #17093 from owncloud/upgrade-timestamp 
[upgrade] show timestamp for output during upgrade
 2015-07-01 08:55:32 +02:00
Morris Jobke
da45fad3eb Merge pull request #17078 from owncloud/fix-initial-server-host 
Fix undefined offset
 2015-07-01 08:55:12 +02:00
Morris Jobke
8f05d4b662 Merge pull request #16535 from rullzer/ocs_share_api_url 
OCS Share API link shares now always have an url
 2015-07-01 08:54:48 +02:00
Morris Jobke
1469177a3a Merge pull request #16406 from owncloud/enc-strlenperffix 
Small perf tweak in strlen loop
 2015-07-01 08:54:33 +02:00
Morris Jobke
c703a3a63e Merge pull request #15569 from owncloud/remove-getetag-properties 
Remove unneeded getetag entries in properties table
 2015-07-01 08:53:37 +02:00
Morris Jobke
044d2ece07 Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util 
Move core apps from OC_Log::write to OCP\Util
 2015-07-01 08:53:16 +02:00
Morris Jobke
f25b71f70e Merge pull request #15475 from rullzer/files_sharing_OCP_DB 
Move files sharing app (mostly) to OCP\DB
 2015-07-01 08:53:03 +02:00
Vincent Petry
b921748e61 Merge pull request #17224 from owncloud/webdav-handle-ServerNotAvailableException 
Adding exception handling for ServerNotAvailableException
 2015-07-01 07:18:36 +02:00
Vincent Petry
f76773bd4c Merge pull request #17259 from owncloud/chunk-cleanupgracefulonlock 
Do not try clearing locked files in cache folder
 2015-07-01 07:08:47 +02:00
Thomas Müller
02331652d1 Merge pull request #17264 from owncloud/use-mb-functions 
Use UTF-8 mode for preg_split and preg_replace
 2015-07-01 07:04:22 +02:00
Lukas Reschke
aff55347f9 Use UTF-8 mode for preg_split and preg_replace 
Otherwise a single application with a description containing a non compliant character can break the whole ownCloud appstore. This is for example https://apps.owncloud.com/content/show.php?content=149553

Fixes https://github.com/owncloud/core/issues/17101#issuecomment-117365224
 2015-07-01 01:44:33 +02:00
C Montero-Luque
e7a30e091d 8.1 RC2 2015-06-30 19:43:05 -04:00
Thomas Müller
0a23d566ba Merge pull request #17255 from owncloud/fix-17119 
[LDAP] Filter user groups obtained by memberof
 2015-07-01 00:33:39 +02:00
Vincent Petry
16ff6cff54 Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendisabled 
Do not set callback wrapper when locking is disabled
 2015-06-30 18:28:28 +02:00
Vincent Petry
2fe677d0ed Catch cache garbage collection exception on postLogin 
Just log the exception instead of preventing access to OC.
 2015-06-30 17:36:55 +02:00
Vincent Petry
e339e6f497 Test for chunk cache garbage collection 2015-06-30 17:34:10 +02:00
Vincent Petry
dd4de48418 Do not try clearing locked files in cache folder 2015-06-30 17:00:46 +02:00
Björn Schießle
2c1b0f9a66 Merge pull request #17225 from owncloud/fix_12106 
if it is a mount point we need to get the path from the mount manager
 2015-06-30 16:40:57 +02:00
Bjoern Schiessle
44ec3dd110 if it is a mount point we need to get the path from the mount manager 2015-06-30 15:08:18 +02:00
Thomas Müller
134dc136e6 Avoid namespace clash 2015-06-30 15:07:48 +02:00
Thomas Müller
039a470a6a Fixing content type detection and handle all local printErrorPage calls 2015-06-30 15:05:59 +02:00
Thomas Müller
5dc7eebcdb Adding request specific exception handling - now with WebDAV responses - refs #17192 2015-06-30 15:05:59 +02:00
Thomas Müller
3f3c603922 Adding exception handling for ServerNotAvailableException - refs #17192 2015-06-30 15:05:59 +02:00
Vincent Petry
0118bf04dc Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-in-log 
Perform the filesize on the file that exists
 2015-06-30 14:51:29 +02:00
Arthur Schiwon
5f4db0540a tests solidity 2015-06-30 14:09:11 +02:00
Arthur Schiwon
646f2f1d41 adjust unit test 2015-06-30 13:56:25 +02:00
Vincent Petry
afd83caf69 Do not set callback wrapper when locking is disabled 2015-06-30 13:45:41 +02:00
Arthur Schiwon
663cd7af4d integration test 2015-06-30 12:52:27 +02:00
Morris Jobke
2bcd0af177 Merge pull request #17189 from owncloud/files-straypartfilesonexception 
Cleanup part file after upload exception
 2015-06-30 11:58:26 +02:00
Joas Schilling
9c533342fc Perform the filesize only when the file exists 
Regression from 95602d4069
and 9b336765b6
 2015-06-30 11:47:58 +02:00
Joas Schilling
a1bfc26b88 Merge pull request #17249 from owncloud/file-cache-is-a-icache 
Fixing "ImportController::__construct() must implement interface OCP\…
 2015-06-30 09:46:09 +02:00
Thomas Müller
fc474de573 Fixing "ImportController::__construct() must implement interface OCP\\ICache, instance of OC\\Cache\\File given" 2015-06-29 22:43:18 +02:00
Thomas Müller
6506357210 Merge pull request #17239 from owncloud/files-nameconflictfix 
Fix class name conflict
 2015-06-29 21:47:39 +02:00
Thomas Müller
883888bdc6 Merge pull request #17240 from owncloud/do-not-rely-on-php-being-fast 
Do not rely on actual time in unit tests
 2015-06-29 21:47:15 +02:00
Vincent Petry
167f57c15e Unlock first path on rename if second path is locked 2015-06-29 17:31:14 +02:00
Vincent Petry
3217d4dad1 Cleanup part file after upload exception 
Added unit tests for checking for stray part files.
Convert exception to sabre exception in upload put method.

Also added unit test for exception mapping, which also indirectly tests
that the part file is being deleted on exception.

This applies to both chunking and non-chunking mode.

Added some unit tests for chunk upload.
 2015-06-29 17:31:14 +02:00
Lukas Reschke
422d088bb9 Do not rely on actual time in unit tests 
Ref https://github.com/owncloud/core/pull/17238#issuecomment-116724055
 2015-06-29 17:15:42 +02:00
Vincent Petry
2fa432dfb8 Fix class name conflict 
Looks like PHP 5.6.x doesn't like name conflicts.

\Sabre\DAV\Server would overlap with \OC\Connector\Sabre\Server.
 2015-06-29 17:11:14 +02:00
Morris Jobke
b88a0e7080 Merge pull request #17231 from owncloud/add-missing-version-field 
Add missing version field
 2015-06-29 16:41:47 +02:00
Joas Schilling
30f5fa42e5 Merge pull request #17229 from owncloud/maintenance-plugin-test 
Unit tests added for MaintenancePlugin
 2015-06-29 16:22:38 +02:00
Thomas Müller
372a9afabe Fixing ctor calls and ctor itself to not break usage in calendar and contacts ..... 2015-06-29 15:54:05 +02:00
Lukas Reschke
ab4d5d20ea Typehint $targetVersion 2015-06-29 15:10:40 +02:00