mirror of
https://github.com/umami-software/umami.git
synced 2026-02-04 04:37:11 +01:00
Merge branch 'master' into dev
# Conflicts: # .github/workflows/cd-manual.yml # .github/workflows/cd.yml # .github/workflows/ci.yml # src/lib/detect.ts
This commit is contained in:
commit
c51dd7e606
5 changed files with 106 additions and 36 deletions
|
|
@ -10,7 +10,15 @@ import {
|
|||
MenuSection,
|
||||
} from '@umami/react-zen';
|
||||
import { useMessages, useLoginQuery, useNavigation, useConfig } from '@/components/hooks';
|
||||
import { LogOut, LockKeyhole, Settings, UserCircle, LifeBuoy, BookText } from '@/components/icons';
|
||||
import {
|
||||
LogOut,
|
||||
LockKeyhole,
|
||||
Settings,
|
||||
UserCircle,
|
||||
LifeBuoy,
|
||||
BookText,
|
||||
ExternalLink,
|
||||
} from '@/components/icons';
|
||||
import { DOCS_URL } from '@/lib/constants';
|
||||
|
||||
export function SettingsButton() {
|
||||
|
|
@ -54,7 +62,11 @@ export function SettingsButton() {
|
|||
id="/docs"
|
||||
icon={<BookText />}
|
||||
label={formatMessage(labels.documentation)}
|
||||
/>
|
||||
>
|
||||
<Icon color="muted">
|
||||
<ExternalLink />
|
||||
</Icon>
|
||||
</MenuItem>
|
||||
<MenuItem
|
||||
id="/settings/support"
|
||||
icon={<LifeBuoy />}
|
||||
|
|
|
|||
|
|
@ -361,8 +361,10 @@ export const MAP_FILE = '/datamaps.world.json';
|
|||
export const ISO_COUNTRIES = {
|
||||
ANT: 'AN',
|
||||
ARE: 'AE',
|
||||
AUT: 'AT',
|
||||
BLM: 'BL',
|
||||
CHE: 'CH',
|
||||
DEU: 'DE',
|
||||
ESH: 'EH',
|
||||
ESP: 'ES',
|
||||
FSM: 'FM',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue