summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-02-09250-8838/+4978
|
* Merge pull request #8271 from nextcloud/13-8270Morris Jobke2018-02-091-9/+10
|\ | | | | [stable13] Update CRL to revoke files_rightclick
| * Update CRL to revoke files_rightclickMorris Jobke2018-02-091-9/+10
| | | | | | | | | | | | See https://github.com/nextcloud/app-certificate-requests/pull/134 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8145 from nextcloud/13-unperl-l10nMorris Jobke2018-02-098-443/+132
|\ \ | |/ |/| [stable13] Remove old perl script to update l10n files
| * Remove old perl script to update l10n filesMorris Jobke2018-02-088-443/+132
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-02-09136-346/+468
| |
* | Merge pull request #8264 from nextcloud/fix_dev_man_link_13Roeland Jago Douma2018-02-081-1/+1
|\ \ | |/ |/| [stable13] Link to NC13 dev manual
| * [stable13] Link to NC13 dev manualRoeland Jago Douma2018-02-081-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8102 from nextcloud/s3-uploader-13Morris Jobke2018-02-082-48/+14
|\ \ | | | | | | [13] Use S3Client::upload instead of splitting single/multipart upload ourselves
| * | Use S3Client::upload instead of splitting single/multipart upload ourselvesRobin Appelman2018-01-292-48/+14
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #8183 from robert-scheck/pki-validation-stable13Morris Jobke2018-02-082-2/+2
|\ \ \ | | | | | | | | [stable13] Handle SSL certificate verifications for others than Let's Encrypt
| * | | Handle SSL certificate verifications for others than Let's EncryptRobert Scheck2018-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do no longer (wrongly) rewrite URLs like * http://example.net/.well-known/pki-validation/file.txt (Comodo) * http://example.net/.well-known/pki-validation/fileauth.txt (DigiCert, Thawte, GeoTrust) * http://example.net/.well-known/pki-validation/gsdv.txt (GlobalSign) * http://example.net/.well-known/pki-validation/starfield.htm (Starfield, GoDaddy) * http://example.net/.well-known/pki-validation/swisssign-check.txt (SwissSign) for automated SSL certificate verifications. All (common commercial) certificate authorities (CA) except Let's Encrypt (via ACME) seem to use "pki-validation" rather "acme-challenge" for their domain control validation (DCV). Signed-off-by: Robert Scheck <robert@fedoraproject.org>
* | | | Merge pull request #8253 from nextcloud/13-8252Joas Schilling2018-02-081-1/+0
|\ \ \ \ | | | | | | | | | | [stable13] Remove invalid link to documentation
| * | | | Remove invalid link to documentationMorris Jobke2018-02-081-1/+0
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #8250 from nextcloud/8233_13Roeland Jago Douma2018-02-081-1/+1
|\ \ \ \ | |/ / / |/| | | [stable13] actually return stream from swift
| * | | actually return stream from swiftRobin Appelman2018-02-081-1/+1
|/ / / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-02-0818-48/+160
| | |
* | | Merge pull request #8228 from nextcloud/dav-dir-exception-previous-13Joas Schilling2018-02-072-5/+6
|\ \ \ | | | | | | | | [13] keep previous exception when transforming to dav exception
| * | | keep previous exception when transforming to dav exceptionRobin Appelman2018-02-072-5/+6
|/ / / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-02-0744-46/+102
| | |
* | | Merge pull request #8197 from nextcloud/stable13-8144Roeland Jago Douma2018-02-0710-9/+235
|\ \ \ | | | | | | | | [stable13] Repair step to clear frontend related caches
| * | | Fix testsRoeland Jago Douma2018-02-061-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Move depsCache clearing to SCSSCacher/JSCombinerJulius Härtl2018-02-066-31/+45
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add tests and class mappingJulius Härtl2018-02-063-0/+96
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add repair step to clear frontend related cachesJulius Härtl2018-02-065-6/+118
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2018-02-0720-16/+240
| | | |
* | | | Merge pull request #8195 from nextcloud/13-8172Morris Jobke2018-02-061-2/+2
|\ \ \ \ | | | | | | | | | | [stable13] Use a phan version instead of master
| * | | | Use a phan version instead of masterRoeland Jago Douma2018-02-061-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #8045 from nextcloud/8002_13Roeland Jago Douma2018-02-063-59/+84
|\ \ \ \ \ | |_|/ / / |/| | | | [stable13] Dont polute the log on DAV emaillogin
| * | | | Fix testsRoeland Jago Douma2018-01-252-48/+53
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Don't polute log when loggin into dav with emailRoeland Jago Douma2018-01-252-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * We first try the email as username but this fails * Then we get the uid from the email and try again We should not log the first attempt since it polutes the log with failed login attempts while the login actually is valid. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #8156 from nextcloud/stable13-8078Morris Jobke2018-02-065-24/+47
|\ \ \ \ \ | |_|/ / / |/| | | | [Stable13] Scss hardening
| * | | | Fix theming testsJulius Härtl2018-02-021-8/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add tests for URL rewritingJulius Härtl2018-02-021-4/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Do not rewrite absolute URLsJulius Härtl2018-02-022-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Clear injectect variables when resetting the cacheJulius Härtl2018-02-021-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Only override image styles if the theming values are setJulius Härtl2018-02-021-8/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Make sure that injected variables do not break the CSS generationJulius Härtl2018-02-021-0/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | SCSS files are only cached if their size is > 0Julius Härtl2018-02-021-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #8177 from nextcloud/8160_13Morris Jobke2018-02-061-0/+4
|\ \ \ \ \ | | | | | | | | | | | | [stable13] Do not try to get the jailed path if we can't find the id
| * | | | | Do not try to get the jailed path if we can't find the idRoeland Jago Douma2018-02-051-0/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8047 If we can't find the file by id there we should just return null instead of trying to get the jailed path of null. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-02-064-24/+162
| | | | |
* | | | | Merge pull request #8187 from nextcloud/13-finalv13.0.0Morris Jobke2018-02-061-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Final 13.0.0
| * | | | Final 13.0.0Morris Jobke2018-02-051-2/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-02-056-2/+34
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-02-0410-10/+44
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-02-0374-104/+1280
| | | |
* | | | Merge pull request #8151 from nextcloud/13-8150Morris Jobke2018-02-021-10/+10
|\ \ \ \ | |/ / / |/| | | [stable13] Update CRL because user_sql cert was lost
| * | | Update CRL because user_sql cert was lostMorris Jobke2018-02-021-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | * see https://github.com/nextcloud/app-certificate-requests/pull/129 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #8142 from nextcloud/13-update-serverMorris Jobke2018-02-022-7/+7
|\ \ \ \ | |/ / / |/| | | [stable13] Use correct update server