summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Use proper URLs for search resultsLukas Reschke2016-03-141-4/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23136
* | | | | | | Merge pull request #23240 from owncloud/backport-23222Thomas Müller2016-03-151-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | backport of #23222
| * | | | | | | backport of #23222 (#23225)Phiber20002016-03-141-3/+5
| | |_|_|_|/ / | |/| | | | |
* / | | | | | Generate a valid URL for link notificationRoeland Jago Douma2016-03-151-2/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #23197 * Updated unit test
* | | | | | Merge pull request #22943 from owncloud/backport-22800-stable9Thomas Müller2016-03-141-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [9.0] don't hide server not available exception, fixes #20536
| * | | | | don't hide server not available exception, fixes #20536Arthur Schiwon2016-03-081-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #23065 from owncloud/stable9-add-rewrite-rules-after-setupThomas Müller2016-03-141-2/+3
|\ \ \ \ \ | | | | | | | | | | | | [stable9] Add base rewrite rule only when RewriteBase is defined
| * | | | | Improved rewrite ruleLukas Reschke2016-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/owncloud/core/issues/23098 and https://github.com/owncloud/core/issues/23117
| * | | | | 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.
* | | | | Shorter cache key for URL entriesJoas Schilling2016-03-141-1/+1
| |_|/ / |/| | |
* | | | Explicitly check for portLukas Reschke2016-03-111-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
* | | | Merge pull request #22912 from owncloud/stable9-diskfreespace-filesworkaroundThomas Müller2016-03-101-1/+9
|\ \ \ \ | | | | | | | | | | [stable9] Fix call to disk_free_space when a file is provided
| * | | | Fix call to disk_free_space when a file is providedVincent Petry2016-03-091-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 #23071 from owncloud/backport-23032-no-response-on-cliThomas Müller2016-03-101-1/+3
|\ \ \ \ | |_|_|/ |/| | | [9.0] Do not set response status in CLI in case of error
| * | | Do not set response status in CLI in case of errorVincent Petry2016-03-101-1/+3
| | | |
* | | | Merge pull request #23016 from owncloud/stable9_backport_23008Thomas Müller2016-03-101-10/+51
|\ \ \ \ | |/ / / |/| | | [stable 9] Select queries in the default share provider should query for file/folder
| * | | 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.
* / / 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
* | Merge pull request #22908 from ↵Thomas Müller2016-03-091-1/+1
|\ \ | | | | | | | | | | | | owncloud/backport-22904-group-manager-wrong-return [9.0] Make sure that the return value is an array
| * | Make sure that the return value is an arrayJoas Schilling2016-03-071-1/+1
| |/
* | Merge pull request #22919 from owncloud/backport-double-url-encodingThomas Müller2016-03-091-4/+0
|\ \ | | | | | | [stable9] 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
* / Fix share mounting recursionVincent Petry2016-03-082-3/+8
|/
* 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.
* Merge pull request #22832 from owncloud/external-unavailable-recheck9Thomas Müller2016-03-041-5/+12
|\ | | | | [9.0] allow availability recheck for external storages
| * allow availability recheck for external storagesRobin Appelman2016-03-031-5/+12
| |
* | ucwords does not support delimiter on 5.4Joas Schilling2016-03-041-1/+1
| |
* | Merge pull request #22822 from owncloud/stable9-exclude-assetsThomas Müller2016-03-041-2/+3
|\ \ | | | | | | [stable9] Exclude the assets folder from integrity check
| * | 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
* | | Revert "No longer evaluate appinfo/version"Vincent Petry2016-03-034-6/+19
| |/ |/|
* | 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.
* 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.
* | Merge pull request #17451 from owncloud/apps-disablebrokenappafterenableThomas Müller2016-03-011-2/+18
|\ \ | | | | | | Disable app that bricks the server after enabling
| * | Disable app that bricks the server after enablingVincent Petry2016-02-291-2/+18
| | | | | | | | | | | | | | | | | | If an app is getting enabled in the web UI, an ajax call is now made to make sure the server still works. If it doesn't, it sends an emergency app disabling call to disable the breaking app.
* | | Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotasetThomas Müller2016-03-011-4/+7
|\ \ \ | | | | | | | | Don't return quota when none set
| * | | Return -3 for unlimited quotaVincent Petry2016-02-291-4/+7
| | | | | | | | | | | | | | | | | | | | Returns -3 for unlimited quota in Webdav response. Also adjusted personal page to show unlimited quota when set.
* | | | Merge pull request #22677 from ↵Thomas Müller2016-03-011-2/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/allow-to-overwrite-single-l10n-string-via-theme Allow to overwrite a single language string via the theme folder
| * | | | Allow to overwrite a single language string via the theme folderJoas Schilling2016-02-261-2/+19
| | |_|/ | |/| |
* | | | Merge pull request #22733 from owncloud/size-propagation-new-fileThomas Müller2016-03-011-1/+5
|\ \ \ \ | | | | | | | | | | fix size propagation for new files
| * | | | fix size propagation for new filesRobin Appelman2016-02-291-1/+5
| | |/ / | |/| |
* | | | Merge pull request #22736 from owncloud/propagation-ignore-encryptionThomas Müller2016-03-012-0/+68
|\ \ \ \ | | | | | | | | | | ignore encryption keys for propagation
| * | | | ignore encryption keys for propagationRobin Appelman2016-02-292-0/+68
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-012-2/+2
| | | |
* | | | Merge pull request #22707 from owncloud/use-our-public-apiThomas Müller2016-03-017-28/+32
|\ \ \ \ | |/ / / |/| | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*