watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-20 20:45:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'dev' into feat/um-202-event-data-new

Browse source
This commit is contained in:
Brian Cao 2023-03-23 00:39:39 -07:00
commit f4b32bab43
92 changed files with 479 additions and 479 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pages/404.js
View file

@ -1,10 +1,9 @@
import { Row, Column, Flexbox } from 'react-basics';
import { useIntl } from 'react-intl';
import AppLayout from 'components/layout/AppLayout';
import { labels } from 'components/messages';
import useMessages from 'hooks/useMessages';
export default function Custom404() {
const { formatMessage } = useIntl();
const { formatMessage, labels } = useMessages();
return (
<AppLayout>

2
pages/_app.js
View file

@ -29,7 +29,7 @@ export default function App({ Component, pageProps }) {
const Wrapper = ({ children }) => <span className={locale}>{children}</span>;
if (!config || config.uiDisabled) {
if (config?.uiDisabled) {
return null;
}