Merge branch 'master' into manual-filters

This commit is contained in:
Vignesh Joglekar 2021-05-27 17:08:47 -05:00 committed by GitHub
commit f689642204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions

View File

@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file.
- New parameter `metrics` for the `/api/v1/stats/timeseries` endpoint plausible/analytics#952
- CSV export now includes pageviews, bounce rate and visit duration in addition to visitors plausible/analytics#952
- Send stats to multiple dashboards by configuring a comma-separated list of domains plausible/analytics#968
- To authenticate against a local postgresql via socket authentication, the environment-variables
`DATABASE_SOCKET_DIR` & `DATABASE_NAME` were added.
- Time on Page metric available in detailed Top Pages report plausible/analytics#1007
- Glob (wildcard) based page, entry page and exit page filters plausible/analytics#1067
- Exclusion filters for page, entry page and exit page filters plausible/analytics#1067

View File

@ -63,7 +63,7 @@ class ReferrerDrilldownModal extends React.Component {
<Link className="block truncate hover:underline dark:text-gray-200" to={{search: query.toString(), pathname: '/' + this.props.site.domain}} title={referrer.name}>
{referrer.name}
</Link>
{ this.renderExternalLink(name) }
{ this.renderExternalLink(referrer.name) }
</span>
)
}

View File

@ -109,7 +109,15 @@ config :plausible, PlausibleWeb.Endpoint,
http: [port: port],
secret_key_base: secret_key_base
config :plausible, Plausible.Repo, url: db_url
case System.get_env("DATABASE_SOCKET_DIR", "") do
"" ->
config :plausible, Plausible.Repo, url: db_url
x ->
config :plausible, Plausible.Repo,
socket_dir: x,
database: System.get_env("DATABASE_NAME")
end
config :sentry,
dsn: sentry_dsn,

View File

@ -1156,7 +1156,7 @@ defmodule Plausible.Stats.Clickhouse do
)
q =
if query.filters["source"] || query.filters['referrer'] || query.filters["utm_medium"] ||
if query.filters["source"] || query.filters["referrer"] || query.filters["utm_medium"] ||
query.filters["utm_source"] || query.filters["utm_campaign"] || query.filters["screen"] ||
query.filters["browser"] || query.filters["browser_version"] || query.filters["os"] ||
query.filters["os_version"] || query.filters["country"] || query.filters["entry_page"] ||
@ -1210,7 +1210,7 @@ defmodule Plausible.Stats.Clickhouse do
where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime
)
if query.filters["source"] || query.filters['referrer'] || query.filters["utm_medium"] ||
if query.filters["source"] || query.filters["referrer"] || query.filters["utm_medium"] ||
query.filters["utm_source"] || query.filters["utm_campaign"] || query.filters["screen"] ||
query.filters["browser"] || query.filters["browser_version"] || query.filters["os"] ||
query.filters["os_version"] || query.filters["country"] || query.filters["entry_page"] ||