Commit Graph

14384 Commits

Author SHA1 Message Date
Morris Jobke 51b79a5df4
Fix 500 on setup page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-06 13:28:31 +01:00
Robin Müller e359640899
Don't use double quotes in MySQL queries
MySQL databases with the ANSI_QUOTES mode enabled treat " as an identifier
quote (see https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi_quotes).
So for such databases the 'occ upgrade' fails with an error message like this:
... unknown column 'oc_*' in where clause.

This fix replaces the doulbe quotes with single quotes that should be always
used in MySQL queries to quote literal strings.

Signed-off-by: Robin Müller <robin.mueller@1und1.de>
2018-03-06 11:25:37 +01:00
Nextcloud bot ac8d572102
[tx-robot] updated from transifex 2018-03-06 01:13:03 +00:00
Morris Jobke 66cba3e01b
Merge pull request #8611 from nextcloud/css-file-suffix-with-apps-versions-backport
[stable12] Use apps versions to generate suffix when possible
2018-03-05 15:05:14 +01:00
Joas Schilling af8d300bd2
Merge pull request #8632 from nextcloud/stable12-8372
[12] Properly encapsulate require_once for app.php
2018-03-05 12:35:38 +01:00
Nextcloud bot d2283aaf17
[tx-robot] updated from transifex 2018-03-05 01:12:58 +00:00
Nextcloud bot 665e8fa6fa
[tx-robot] updated from transifex 2018-03-04 01:13:33 +00:00
Julius Härtl 251b21bb74
Add throws annotation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-02 17:17:44 +01:00
Julius Härtl 4bd0a3fe4d
Properly encapsulate require_once for app.php
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-02 17:17:44 +01:00
Nextcloud bot e225f9548b
[tx-robot] updated from transifex 2018-03-02 01:13:08 +00:00
John Molakvoæ (skjnldsv) a7e7b874e4
Use apps versions to generate suffix when possible
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-01 20:43:12 +01:00
Nextcloud bot ec18b5ee33
[tx-robot] updated from transifex 2018-03-01 01:13:01 +00:00
Nextcloud bot 22e9568664
[tx-robot] updated from transifex 2018-02-28 01:13:25 +00:00
Morris Jobke 6f4b6bea1c
Merge pull request #8130 from nextcloud/fix-own-avatar-not-updated-when-display-name-is-changed
[stable12] Fix own avatar not updated when display name is changed
2018-02-27 18:40:42 +01:00
Nextcloud bot 73dd68802a
[tx-robot] updated from transifex 2018-02-27 01:15:16 +00:00
Nextcloud bot 8687f809f3
[tx-robot] updated from transifex 2018-02-23 01:13:07 +00:00
Nextcloud bot 5cbbf9c9b7
[tx-robot] updated from transifex 2018-02-21 01:12:58 +00:00
Nextcloud bot c635602809
[tx-robot] updated from transifex 2018-02-20 01:12:44 +00:00
Nextcloud bot 82d077df32
[tx-robot] updated from transifex 2018-02-19 01:12:43 +00:00
Nextcloud bot 245ededfb4
[tx-robot] updated from transifex 2018-02-17 01:12:55 +00:00
Nextcloud bot 48c4328b06
[tx-robot] updated from transifex 2018-02-14 21:38:20 +00:00
Nextcloud bot 363b1da044
[tx-robot] updated from transifex 2018-02-14 01:12:43 +00:00
Nextcloud bot deeed1664f
[tx-robot] updated from transifex 2018-02-12 21:34:26 +00:00
Nextcloud bot 966010f87f
[tx-robot] updated from transifex 2018-02-09 15:29:41 +00:00
Morris Jobke 08a13dde4a
Merge pull request #8101 from nextcloud/s3-uploader-12
[12] Use S3Client::upload instead of splitting single/multipart upload ourselves
2018-02-08 14:31:36 +01:00
Morris Jobke e328ced179
Merge pull request #8184 from robert-scheck/pki-validation-stable12
[stable12] Handle SSL certificate verifications for others than Let's Encrypt
2018-02-08 11:02:56 +01:00
Morris Jobke 2be70b1a65
Merge pull request #8216 from nextcloud/6830_12
Nextcloud 12 is not compatible with newer than php 7.1
2018-02-08 09:17:56 +01:00
Robin Appelman ce4f74bec2
actually return stream from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-08 08:12:51 +01:00
Nextcloud bot d36b9c7479
[tx-robot] updated from transifex 2018-02-08 01:10:51 +00:00
Roeland Jago Douma 88e4da2a83
Nextcloud 12 is not compatible with newer than php 7.1
Just to avoid users from trying this with a to new (untested) php version

* Moved the check logic to 1 place
* All directly callable scripts just require this on top
* exit hard (-1) so we know scripts won't continue
* Return status 500 so no sync clients will try fancy stuff

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-07 13:38:37 +01:00
Nextcloud bot e2fddd29d1
[tx-robot] updated from transifex 2018-02-07 11:32:21 +00:00
Nextcloud bot 1a6f21d6d3
[tx-robot] updated from transifex 2018-02-07 01:10:47 +00:00
Roeland Jago Douma 10efe528ed
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-06 12:21:27 +01:00
Robert Scheck 38c12ca764 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:39:13 +01:00
Nextcloud bot b63c93367f
[tx-robot] updated from transifex 2018-02-03 01:10:55 +00:00
Nextcloud bot 26beb5b7f3
[tx-robot] updated from transifex 2018-02-02 01:10:40 +00:00
Nextcloud bot 6fe9d1b57b
[tx-robot] updated from transifex 2018-02-01 18:28:32 +00:00
Nextcloud bot 4620eb8515
[tx-robot] updated from transifex 2018-02-01 17:20:21 +00:00
Nextcloud bot e6fef3b529
[tx-robot] updated from transifex 2018-02-01 01:11:19 +00:00
Daniel Calviño Sánchez 16b0b3f418 Fix own avatar not updated when display name is changed
The avatar endpoint returns the avatar image or, if the user has no
avatar, the display name. In that later case the avatar is generated on
the browser based on the display name. The avatar endpoint response is
cached, so when the display name changes and the avatar is got again the
browser could use the cached value, in which case it would use the same
display name as before and the avatar would not change.

When the avatar is an image the cache is invalidated with the use of
the "version" parameter, which is increased when the image changes. When
the avatar cache was first introduced only the image avatars were
cached, but it was later changed to cache all avatar responses to limit
the requests made to the server. Thus, now the cache of the display name
is invalidated too by increasing the version of the avatar if the
display name changes and there is no explicit avatar set.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-31 18:32:36 +01:00
Robin Appelman 8d5b86c159
Use S3Client::upload instead of splitting single/multipart upload ourselves
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-29 16:11:23 +01:00
Nextcloud bot 355bc845ee
[tx-robot] updated from transifex 2018-01-26 01:11:18 +00:00
Nextcloud bot c3aa2fcacc
[tx-robot] updated from transifex 2018-01-25 01:11:30 +00:00
Nextcloud bot ae0641fccc
[tx-robot] updated from transifex 2018-01-21 01:11:18 +00:00
Joas Schilling c7485fa1ad
Keep all shipped apps enabled because they should be okay
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-16 13:41:33 +01:00
Nextcloud bot 5738662032
[tx-robot] updated from transifex 2018-01-11 01:11:50 +00:00
Roeland Jago Douma 323dc4acb1
Merge pull request #7758 from nextcloud/12-7570
[stable12] add option to use legacy v2 auth with s3
2018-01-09 21:19:24 +01:00
Robin Appelman 4ec4a7df93
add option to use legacy v2 auth with s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-09 18:21:47 +01:00
Roeland Jago Douma e2c77e46ab
Use correct L10N files for jsconfig
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-09 16:09:57 +01:00
Morris Jobke 1b43184aeb
Merge pull request #7747 from nextcloud/composer_up_12
Update of composer
2018-01-09 11:45:37 +01:00