diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-07 09:29:01 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-07 09:29:01 +0400 |
| commit | bc4c240385d51b91419f3484819dfc7e35eaf261 (patch) | |
| tree | 6f685c84b68475cf29b497d3b28872b89e0e435b /config | |
| parent | 0d37b7f1de8a5e5eedc29a5b0c9091bb24217173 (diff) | |
| parent | 715cff5e3e0affc9c250eaacbcd5bc05308f4bc0 (diff) | |
Merge branch 'master' into report_and_dimension_refactoring
Conflicts:
core/FrontController.php
core/Log.php
plugins/API/API.php
tests/PHPUnit/Fixture.php
tests/PHPUnit/UI
Diffstat (limited to 'config')
| -rw-r--r-- | config/global.ini.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index c3c68c1de0..51dbba90cb 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -18,7 +18,7 @@ password = dbname = tables_prefix = port = 3306 -adapter = PDO_MYSQL +adapter = PDO\MYSQL type = InnoDB schema = Mysql @@ -34,7 +34,7 @@ password = dbname = piwik_tests tables_prefix = piwiktests_ port = 3306 -adapter = PDO_MYSQL +adapter = PDO\MYSQL type = InnoDB schema = Mysql @@ -267,6 +267,12 @@ login_password_recovery_email_address = "password-recovery@{DOMAIN}" ; name that appears as a Sender in the password recovery email login_password_recovery_email_name = Piwik +; email address that appears as a Repy-to in the password recovery email +; if specified, {DOMAIN} will be replaced by the current Piwik domain +login_password_recovery_replyto_email_address = "no-reply@{DOMAIN}" +; name that appears as a Reply-to in the password recovery email +login_password_recovery_replyto_email_name = "No-reply" + ; By default when user logs out he is redirected to Piwik "homepage" usually the Login form. ; Uncomment the next line to set a URL to redirect the user to after he logs out of Piwik. ; login_logout_url = http://... @@ -289,6 +295,9 @@ noreply_email_address = "noreply@{DOMAIN}" ; when testing, use your own email address or "nobody" feedback_email_address = "feedback@piwik.org" +; using to set reply_to in reports e-mail to login of report creator +scheduled_reports_replyto_is_user_email_and_alias = 0 + ; during archiving, Piwik will limit the number of results recorded, for performance reasons ; maximum number of rows for any of the Referrers tables (keywords, search engines, campaigns, etc.) datatable_archiving_maximum_rows_referrers = 1000 @@ -384,7 +393,7 @@ enable_trusted_host_check = 1 ; The release server is an essential part of the Piwik infrastructure/ecosystem ; to provide the latest software version. -latest_version_url = http://builds.piwik.org/piwik-latest.zip +latest_version_url = http://builds.piwik.org/piwik.zip ; The API server is an essential part of the Piwik infrastructure/ecosystem to ; provide services to Piwik installations, e.g., getLatestVersion and |