Skip to content

Commit

Permalink
Merge branch 'master' into pending-ownership-transfers-usage-cont
Browse files Browse the repository at this point in the history
  • Loading branch information
RobertJoonas committed Jul 1, 2024
2 parents 5ae1270 + c871759 commit 9ec6de7
Show file tree
Hide file tree
Showing 28 changed files with 648 additions and 1,096 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
- Increase hourly request limit for API keys in CE from 600 to 1000000 (practically removing the limit) plausible/analytics#4200
- Make TCP connections try IPv6 first with IPv4 fallback in CE plausible/analytics#4245
- `is` and `is not` filters in dashboard no longer support wildcards. Use contains/does not contain filter instead.
- `bounce_rate` metric now returns 0 instead of null for event:page breakdown when page has never been entry page.

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion assets/js/dashboard/util/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export function apiPath(site, path = '') {
}

export function sitePath(path = '') {
return `/${path}` + window.location.search
return (path.startsWith('/') ? path : '/' + path) + window.location.search
}

export function setQuery(key, value) {
Expand Down
2 changes: 1 addition & 1 deletion lib/plausible/crm_extensions.ex
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ defmodule Plausible.CrmExtensions do
if (cardBody) {
const buttonDOM = document.createElement("div")
buttonDOM.className = "mb-3 w-full text-right"
buttonDOM.innerHTML = '<div><a class="btn btn-outline-primary" href="#{base_url <> "/" <> domain}" target="_blank">Open Dashboard</a></div>'
buttonDOM.innerHTML = '<div><a class="btn btn-outline-primary" href="#{base_url <> "/" <> URI.encode_www_form(domain)}" target="_blank">Open Dashboard</a></div>'
cardBody.prepend(buttonDOM)
}
})()
Expand Down
2 changes: 2 additions & 0 deletions lib/plausible/stats/base.ex
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ defmodule Plausible.Stats.Base do
end

defp select_session_metric(:percentage, _query), do: %{}
defp select_session_metric(:conversion_rate, _query), do: %{}
defp select_session_metric(:group_conversion_rate, _query), do: %{}

def filter_converted_sessions(db_query, site, query) do
if Query.has_event_filters?(query) do
Expand Down
Loading

0 comments on commit 9ec6de7

Please sign in to comment.