Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Matias Griese
2020-11-16 15:41:24 +02:00

View File

@@ -658,6 +658,8 @@ PLUGIN_ADMIN:
EXTERNAL_URL: "External URL"
SESSION_PATH: "The session path"
SESSION_PATH_HELP: "Use only if you choose a custom base URL (you rewrite the site domain / subfolder)"
SESSION_SAMESITE: "The session SameSite attribute"
SESSION_SAMESITE_HELP: "Lax|Strict|None. See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite for more info"
CUSTOM_BASE_URL: "Custom base URL"
CUSTOM_BASE_URL_HELP: "Use if you want to rewrite the site domain or use a different subfolder than the one used by Grav. Example: http://localhost"
FILEUPLOAD_PREVENT_SELF: 'Cannot use "%s" outside of pages.'