mirror of
https://github.com/kremalicious/umami.git
synced 2025-02-01 12:29:35 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
0cb28e9fde
@ -1,5 +1,5 @@
|
|||||||
.bar {
|
.bar {
|
||||||
font-size: 11px;
|
font-size: 14px;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
color: var(--base600);
|
color: var(--base600);
|
||||||
|
@ -15,6 +15,7 @@ export const labels = defineMessages({
|
|||||||
username: { id: 'label.username', defaultMessage: 'Username' },
|
username: { id: 'label.username', defaultMessage: 'Username' },
|
||||||
password: { id: 'label.password', defaultMessage: 'Password' },
|
password: { id: 'label.password', defaultMessage: 'Password' },
|
||||||
role: { id: 'label.role', defaultMessage: 'Role' },
|
role: { id: 'label.role', defaultMessage: 'Role' },
|
||||||
|
admin: { id: 'label.admin', defaultMessage: 'Admin' },
|
||||||
user: { id: 'label.user', defaultMessage: 'User' },
|
user: { id: 'label.user', defaultMessage: 'User' },
|
||||||
viewOnly: { id: 'label.view-only', defaultMessage: 'View only' },
|
viewOnly: { id: 'label.view-only', defaultMessage: 'View only' },
|
||||||
manage: { id: 'label.manage', defaultMessage: 'Manage' },
|
manage: { id: 'label.manage', defaultMessage: 'Manage' },
|
||||||
|
@ -48,7 +48,7 @@ export function setConfig(config: object) {
|
|||||||
store.setState({ config });
|
store.setState({ config });
|
||||||
}
|
}
|
||||||
|
|
||||||
export function setDateRange(dateRange: object) {
|
export function setDateRange(dateRange: string | object) {
|
||||||
store.setState({ dateRange });
|
store.setState({ dateRange });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user