mirror of
https://github.com/kremalicious/umami.git
synced 2024-12-18 15:23:38 +01:00
Merge branch 'dev' of https://github.com/mikecao/umami into dev
This commit is contained in:
commit
a2b4a2a928
@ -5,6 +5,7 @@
|
|||||||
"label.administrator": "Administrator",
|
"label.administrator": "Administrator",
|
||||||
"label.all": "Alles",
|
"label.all": "Alles",
|
||||||
"label.all-websites": "Alle websites",
|
"label.all-websites": "Alle websites",
|
||||||
|
"label.all-events": "Alle gebeurtenissen",
|
||||||
"label.back": "Terug",
|
"label.back": "Terug",
|
||||||
"label.cancel": "Annuleren",
|
"label.cancel": "Annuleren",
|
||||||
"label.change-password": "Wachtwoord wijzigen",
|
"label.change-password": "Wachtwoord wijzigen",
|
||||||
|
@ -18,7 +18,7 @@ export const urlFilter = (data, { raw }) => {
|
|||||||
return `${pathname}${search}`;
|
return `${pathname}${search}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
return removeTrailingSlash(pathname);
|
return pathname;
|
||||||
} catch {
|
} catch {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@
|
|||||||
"immer": "^8.0.1",
|
"immer": "^8.0.1",
|
||||||
"is-localhost-ip": "^1.4.0",
|
"is-localhost-ip": "^1.4.0",
|
||||||
"isbot": "^3.0.25",
|
"isbot": "^3.0.25",
|
||||||
"jose": "2.0.3",
|
"jose": "2.0.5",
|
||||||
"maxmind": "^4.3.1",
|
"maxmind": "^4.3.1",
|
||||||
"moment-timezone": "^0.5.32",
|
"moment-timezone": "^0.5.32",
|
||||||
"next": "^10.0.9",
|
"next": "^10.0.9",
|
||||||
|
@ -4363,10 +4363,10 @@ jest-worker@^26.2.1:
|
|||||||
merge-stream "^2.0.0"
|
merge-stream "^2.0.0"
|
||||||
supports-color "^7.0.0"
|
supports-color "^7.0.0"
|
||||||
|
|
||||||
jose@2.0.3:
|
jose@2.0.5:
|
||||||
version "2.0.3"
|
version "2.0.5"
|
||||||
resolved "https://registry.yarnpkg.com/jose/-/jose-2.0.3.tgz#9c931ab3e13e2d16a5b9e6183e60b2fc40a8e1b8"
|
resolved "https://registry.yarnpkg.com/jose/-/jose-2.0.5.tgz#29746a18d9fff7dcf9d5d2a6f62cb0c7cd27abd3"
|
||||||
integrity sha512-L+RlDgjO0Tk+Ki6/5IXCSEnmJCV8iMFZoBuEgu2vPQJJ4zfG/k3CAqZUMKDYNRHIDyy0QidJpOvX0NgpsAqFlw==
|
integrity sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@panva/asn1.js" "^1.0.0"
|
"@panva/asn1.js" "^1.0.0"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user