Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2018-07-25 22:09:18 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2018-07-25 22:09:18 +0300
commitef9c48cc48587776107b1500dc14eef3ffa19154 (patch)
treecbf32df66ecef4c6c30f0ce1a3ba91d1a272e6ad /plugins/CoreAdminHome/lang
parent7230b6d2173ee9f9f9237f71f3ca44c97be143c2 (diff)
Make CORS domains configurable in UI (#13174)
* Make CORS domain configureable in UI * Move trusted host settings to SystemSettings class * Use unique id for pluginSettings * Improve styling * Improve help text * improve code & naming * Implements new UI field array type * review adjustments * reorganize form demo * update UI files * update system test files * Improve handling of Config Settings
Diffstat (limited to 'plugins/CoreAdminHome/lang')
-rw-r--r--plugins/CoreAdminHome/lang/en.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json
index 2f5a0f26b0..349a838f3d 100644
--- a/plugins/CoreAdminHome/lang/en.json
+++ b/plugins/CoreAdminHome/lang/en.json
@@ -7,6 +7,8 @@
"ReleaseChannel": "Release channel",
"ClickHereToOptIn": "Click here to opt in.",
"ClickHereToOptOut": "Click here to opt out.",
+ "CorsDomains": "Cross-Origin Resource Sharing (CORS) domains",
+ "CorsDomainsHelp": "You can define domains or subdomains like http://example.com or http://stats.example.com. Or to allow cross domain requests for all domains simply add a *",
"CustomLogoFeedbackInfo": "If you customize the Matomo logo, you might also be interested to hide the %1$s link in the top menu. To do so, you can disable the Feedback plugin in the %2$sManage Plugins%3$s page.",
"CustomLogoHelpText": "You can customize the Matomo logo which will be displayed in the user interface and email reports.",
"DevelopmentProcess": "While our %1$sdevelopment process%2$s includes thousands of automated tests, Beta Testers play a key role in achieving the \"No bug policy\" in Matomo.",