summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23125 from owncloud/add-port-support-to-trusteddomainThomas Müller2016-03-111-0/+6
|\ | | | | Explicitly check for port
| * Explicitly check for portLukas Reschke2016-03-101-0/+6
| | | | | | | | | | | | The setup uses `\OCP\IRequest::getInsecureServerHost` which in some cases can also include a port. This makes the trusted domain check fail thus. I've decided to add this here that way because adjusting the setup would require parsing the host properly. This is not something that can be done very good in PHP. Check the following example for why `parse_url` is not our friend: https://3v4l.org/k501Z
* | Use more generic node instead of File/FolderRoeland Jago Douma2016-03-114-26/+9
| | | | | | | | | | | | | | | | | | The phpdoc for the sharing functions was very restrictive. As a consequence passing node object (for example from the OCS Share API where we don't really care if it is a file or folder), would actually be invalid. With this loser restriction the interfaces become more generic.
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-116-16/+48
|/
* Fix some scrutinizer warning in the sharing codeRoeland Jago Douma2016-03-101-2/+2
| | | | | | * Better phpdoc * Promper use statements * Unused parameter
* Merge pull request #21582 from owncloud/core_composerThomas Müller2016-03-1010-0/+518
|\ | | | | Composers PSR-4 autoloader in core
| * POC for PSR-4 autoloader server.php => Server.phpRoeland Jago Douma2016-03-091-0/+0
| |
| * Add composers default autoloader to coreRoeland Jago Douma2016-03-099-0/+518
| | | | | | | | | | | | | | | | This introduces the defacto standard PSR-4 autoloader from composer into core. This will allow proper PSR-4 naming of our classes. Since our original autoloader is still available we can slowly switch over classes to PSR-4.
* | Merge pull request #23029 from owncloud/add-rewrite-rules-after-setupThomas Müller2016-03-101-2/+3
|\ \ | | | | | | Add base rewrite rule only when RewriteBase is defined
| * | Add base rewrite rule only when RewriteBase is definedLukas Reschke2016-03-091-2/+3
| | | | | | | | | | | | In case Apache is configured with an `Alias` such as with the ownCloud packages the rewrite rules will fail when no valid RewriteBase is configured.
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-102-2/+2
| | |
* | | Do not set response status in CLI in case of errorVincent Petry2016-03-091-1/+3
| |/ |/|
* | Merge pull request #22602 from owncloud/fix_slow_chunkcheckThomas Müller2016-03-091-5/+7
|\ \ | | | | | | Do not check all chunks of a chunked upload if we do not need to
| * | Do not check all chunks of a chunked upload if we do not need toRoeland Jago Douma2016-03-071-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22601 Before we did a full test on all chunks to verify if a chunked upload was completed. This is unneeded since if we are missing one chunk we can already fail. Also we look from back to front since it is much more likely that we find a missing chunk thus can error out early.
* | | Merge pull request #23006 from owncloud/require-xml-readerThomas Müller2016-03-091-1/+2
|\ \ \ | |_|/ |/| | Add XMLReader as requirement
| * | Add XMLReader as requirementLukas Reschke2016-03-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The SabreDAV release in 9.0 requires XMLReader, while this is usually compiled in by default some distributions like Gentoo don't. Without this ownCloud gives a fatal 500 error instead of telling people to enable XMLReader. Fixes https://github.com/owncloud/core/issues/23003
* | | Select queries in the default share provider should query for file/folderRoeland Jago Douma2016-03-091-10/+51
|/ / | | | | | | | | There can be leftover calendar and contacts shares in the oc_share table. We need to filter those out properly.
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-094-2/+4
| |
* | Fix share mounting recursionVincent Petry2016-03-082-3/+8
| |
* | Merge pull request #22800 from owncloud/fix-20536Thomas Müller2016-03-081-0/+3
|\ \ | | | | | | don't hide server not available exception, fixes #20536
| * | don't hide server not available exception, fixes #20536Arthur Schiwon2016-03-031-0/+3
| | |
* | | Merge pull request #22918 from owncloud/remove-double-encoding-in-nameThomas Müller2016-03-081-4/+0
|\ \ \ | | | | | | | | Remove double URL encoding
| * | | Remove double URL encodingLukas Reschke2016-03-071-4/+0
| | |/ | |/| | | | | | | | | | | | | ZipStreamer as bundled with 9.0 will properly encode the filename already. Fixes https://github.com/owncloud/core/issues/22836#issuecomment-193336245
* / | [tx-robot] updated from transifexJenkins for ownCloud2016-03-082-0/+2
|/ /
* | Merge pull request #22900 from owncloud/diskfreespace-filesworkaroundThomas Müller2016-03-071-1/+9
|\ \ | | | | | | Fix call to disk_free_space when a file is provided
| * | Fix call to disk_free_space when a file is providedVincent Petry2016-03-071-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of shared files, we have to call free_space() on the file name. This has the side-effect that when uploading to a local storage without quota set, it will call disk_free_space with the file name, which fails. This fix uses the parent folder in case the given path is a file.
* | | Merge pull request #22812 from owncloud/node-lockThomas Müller2016-03-072-0/+75
|\ \ \ | | | | | | | | Add locking to the node api
| * | | Add locking to the node apiRobin Appelman2016-03-032-0/+75
| | | |
* | | | Make sure that the return value is an arrayJoas Schilling2016-03-071-1/+1
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-074-0/+4
| | |
* | | Merge pull request #22807 from owncloud/remove-empty-translationsThomas Müller2016-03-068-72/+0
|\ \ \ | | | | | | | | ne, or_IN, uz and yo have been removed from transifex and will be rem…
| * | | ne, or_IN, uz and yo have been removed from transifex and will be removed ↵Thomas Müller2016-03-038-72/+0
| |/ / | | | | | | | | | from git here now as well
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-056-12/+24
| | |
* | | Merge branch 'master' into fix-db-locking-cleanupC. Montero Luque2016-03-041-5/+12
|\ \ \
| * \ \ Merge pull request #22816 from owncloud/external-unavailable-recheckThomas Müller2016-03-041-5/+12
| |\ \ \ | | | | | | | | | | allow availability recheck for external storages
| | * | | allow availability recheck for external storagesRobin Appelman2016-03-031-5/+12
| | |/ /
* | / / Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-041-15/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #22819 The old way fired a DELETE statement on each destruction of the DBLockingProvider. Which could cause a lot of queries. It's enough to run this every 5 minutes in a background job, which in the end could result in file locks that exists 5 minutes longer - in the worst case and for not properly released locks. This makes the DB based locking a lot more performant and could result in a similar performance to the Redis based locking provider.
* | | ucwords does not support delimiter on 5.4Joas Schilling2016-03-041-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-044-2/+30
| | |
* | | Merge pull request #22796 from owncloud/fix-encryption-on-version-restoreThomas Müller2016-03-031-9/+28
|\ \ \ | | | | | | | | Keep "encryptedVersion" when calling `\OC\Files\View::copy`
| * | | Keep "encryptedVersion" when calling `\OC\Files\View::copy`Lukas Reschke2016-03-031-9/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling `\OC\Files\View::copy` we should also keep the version to ensure that the file will always have the correct version attached and can be successfully decrypted. To test this the following steps are necessary (from https://github.com/owncloud/core/issues/22781#issuecomment-191328982): 1. setup a new ownCloud 9.0 beta2 2. enable encryption 2. upload a docx (5.7MB large) 3. upload the same file again and overwrite the existing file 4. I can download the original file and the first version 5. I restore the first version 6. restored version can no longer be downloaded with the error described above The manual cache operation in `\OCA\Files_Versions\Storage` is unfortunately necessary since `\OCA\Files_Versions\Storage::copyFileContents` is not using `\OCP\Files\Storage::moveFromStorage` in the case when an object storage is used. Due to the workaround added in https://github.com/owncloud/core/commit/54cea05271b887f1c8062c034741df869bc0f055 the stream is directly copied and thus bypassing the FS.
* / / Exclude the assets folder from integrity checkLukas Reschke2016-03-031-2/+3
|/ / | | | | | | We should not scan the assets folder as this can contain user specific content. Partially addresses https://github.com/owncloud/core/issues/22803
* / [tx-robot] updated from transifexJenkins for ownCloud2016-03-032-0/+6
|/
* Merge pull request #22757 from owncloud/apply-licenseC. Montero Luque2016-03-01121-93/+140
|\ | | | | Update copyright information and author file
| * Remove Scrutinizer Auto FixerLukas Reschke2016-03-0148-48/+0
| |
| * Map MaciLukas Reschke2016-03-012-1/+2
| |
| * Update author informationLukas Reschke2016-03-01119-65/+159
| | | | | | | | Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
* | Exclude custom data directory from integrity checkerLukas Reschke2016-03-011-2/+8
|/ | | | | | | | | | | | We should not scan any custom data directory in the integrity checker as well. Otherwise this would lead to a massive increased update time that may likely exceed the timeout. To test this: 1. Install ownCloud 8.2.2, set as data dir another folder than `data` such as `data-asdf`. Make sure that folder lives in the web root as well. 2. Update that instance to 9.0.0 beta2 => Errors are shown in the code integrity check 3. Apply this patch and trigger the rescan in the admin settings => No errors are shown anymore (can also do a new update with that patch applied) Fixes https://github.com/owncloud/core/issues/22698
* Merge pull request #22681 from owncloud/add-autodiscovery-for-ocsThomas Müller2016-03-013-12/+23
|\ | | | | Add autodiscovery support to server-to-server sharing implementation
| * Add autodiscovery support to server-to-server sharingLukas Reschke2016-02-263-12/+23
| | | | | | | | Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.