Commit Graph

42626 Commits

Author SHA1 Message Date
Julius Härtl e3fb91756a
Make sure theming logo css only applies when a logo is set
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-09 17:46:47 +01:00
Nextcloud bot 9c9c438c8b
[tx-robot] updated from transifex 2018-02-09 15:29:20 +00:00
Morris Jobke 832c0c480b
Merge pull request #8271 from nextcloud/13-8270
[stable13] Update CRL to revoke files_rightclick
2018-02-09 09:57:36 +01:00
Morris Jobke 9586dc6c92
Merge pull request #8145 from nextcloud/13-unperl-l10n
[stable13] Remove old perl script to update l10n files
2018-02-09 09:56:26 +01:00
Morris Jobke 9bc0de9ab6
Update CRL to revoke files_rightclick
See https://github.com/nextcloud/app-certificate-requests/pull/134

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-09 09:44:55 +01:00
Nextcloud bot 2845166e2a
[tx-robot] updated from transifex 2018-02-09 01:11:05 +00:00
Roeland Jago Douma 71cadf465b
Merge pull request #8264 from nextcloud/fix_dev_man_link_13
[stable13] Link to NC13 dev manual
2018-02-08 20:05:35 +01:00
Morris Jobke 95ac2e31ae
Remove old perl script to update l10n files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-08 18:22:04 +01:00
Roeland Jago Douma a6bb42d3e8
[stable13] Link to NC13 dev manual
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-08 15:13:51 +01:00
Morris Jobke 197c97e242
Merge pull request #8102 from nextcloud/s3-uploader-13
[13] Use S3Client::upload instead of splitting single/multipart upload ourselves
2018-02-08 14:31:23 +01:00
Morris Jobke e2cb6a3b3c
Merge pull request #8183 from robert-scheck/pki-validation-stable13
[stable13] Handle SSL certificate verifications for others than Let's Encrypt
2018-02-08 11:02:33 +01:00
Joas Schilling 78e3b6400a
Merge pull request #8253 from nextcloud/13-8252
[stable13] Remove invalid link to documentation
2018-02-08 10:20:39 +01:00
Roeland Jago Douma 55d5868da5
Update tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-08 10:16:38 +01:00
Roeland Jago Douma f1cd334281
Don't perform CSRF check on OCS routes with Bearer auth
Fixes #5694

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-08 10:16:38 +01:00
Roeland Jago Douma 202dd62951
Merge pull request #8250 from nextcloud/8233_13
[stable13] actually return stream from swift
2018-02-08 09:07:33 +01:00
Morris Jobke 7701c7fab6
Remove invalid link to documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-08 08:46:36 +01:00
Robin Appelman 6296c498b2
actually return stream from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-08 08:10:08 +01:00
Nextcloud bot 5e3cb24efa
[tx-robot] updated from transifex 2018-02-08 01:10:40 +00:00
Joas Schilling 36eb93deac
Merge pull request #8228 from nextcloud/dav-dir-exception-previous-13
[13] keep previous exception when transforming to dav exception
2018-02-07 17:05:27 +01:00
Robin Appelman 38cb28db1f
keep previous exception when transforming to dav exception
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-07 14:44:11 +01:00
Nextcloud bot f8740a1f0c
[tx-robot] updated from transifex 2018-02-07 11:32:08 +00:00
Roeland Jago Douma 7486d021b1
Merge pull request #8197 from nextcloud/stable13-8144
[stable13] Repair step to clear frontend related caches
2018-02-07 09:02:37 +01:00
Nextcloud bot 1ec43c8265
[tx-robot] updated from transifex 2018-02-07 01:10:36 +00:00
Morris Jobke b16824db31
Merge pull request #8195 from nextcloud/13-8172
[stable13] Use a phan version instead of master
2018-02-06 16:41:58 +01:00
Roeland Jago Douma b55b1b5854
Merge pull request #8045 from nextcloud/8002_13
[stable13] Dont polute the log on DAV emaillogin
2018-02-06 15:34:28 +01:00
Roeland Jago Douma c1423eec24
Use a phan version instead of master
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-06 14:20:30 +01:00
Roeland Jago Douma b837d3f332
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-06 12:32:51 +01:00
Julius Härtl 69b22c2d61
Move depsCache clearing to SCSSCacher/JSCombiner
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-06 12:32:50 +01:00
Julius Härtl bf24b4db24
Add tests and class mapping
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-06 12:32:50 +01:00
Julius Härtl 31313178a5
Add repair step to clear frontend related caches
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-06 12:32:48 +01:00
Morris Jobke b2068704e7
Merge pull request #8156 from nextcloud/stable13-8078
[Stable13] Scss hardening
2018-02-06 12:17:45 +01:00
Morris Jobke 0fc97b2104
Merge pull request #8177 from nextcloud/8160_13
[stable13] Do not try to get the jailed path if we can't find the id
2018-02-06 11:18:46 +01:00
Nextcloud bot 9da8032b39
[tx-robot] updated from transifex 2018-02-06 01:10:34 +00:00
Morris Jobke 3b4285e13f
Merge pull request #8187 from nextcloud/13-final
Final 13.0.0
2018-02-06 01:24:06 +01:00
Morris Jobke bc171d46e6
Final 13.0.0
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-05 18:20:47 +01:00
Robert Scheck de07c82a4d Handle SSL certificate verifications for others than Let's Encrypt
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>
2018-02-05 15:37:23 +01:00
Roeland Jago Douma b88aeb2166
Do not try to get the jailed path if we can't find the id
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>
2018-02-05 12:42:47 +01:00
Nextcloud bot 976e5e35f7
[tx-robot] updated from transifex 2018-02-05 01:10:30 +00:00
Nextcloud bot e268181b84
[tx-robot] updated from transifex 2018-02-04 01:10:40 +00:00
Nextcloud bot 064ff027fd
[tx-robot] updated from transifex 2018-02-03 01:10:43 +00:00
Morris Jobke 9e907901a0
Merge pull request #8151 from nextcloud/13-8150
[stable13] Update CRL because user_sql cert was lost
2018-02-02 13:34:28 +01:00
Julius Härtl 7870cc2b67
Fix theming tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:06:50 +01:00
Julius Härtl 9915ebb75f
Add tests for URL rewriting
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:06:04 +01:00
Julius Härtl 106af04355
Do not rewrite absolute URLs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:05:58 +01:00
Julius Härtl cee941a6a3
Clear injectect variables when resetting the cache
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:05:52 +01:00
Julius Härtl 76c79ff18f
Only override image styles if the theming values are set
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:05:41 +01:00
Julius Härtl 73ae7b0c5f
Make sure that injected variables do not break the CSS generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:05:25 +01:00
Julius Härtl d8e0a6ee32
SCSS files are only cached if their size is > 0
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:05:03 +01:00
Morris Jobke b2e3e29266
Merge pull request #8142 from nextcloud/13-update-server
[stable13] Use correct update server
2018-02-02 12:18:29 +01:00
Morris Jobke 254be1dacd
Update CRL because user_sql cert was lost
* see https://github.com/nextcloud/app-certificate-requests/pull/129

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-02 11:59:24 +01:00