ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	lib/auth.js
pull/1600/head
Mike Cao 2022-10-25 10:46:32 -07:00
parent ac070d3ce9 ebf439c598
commit 2ad5cd9335
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/forms/EventDataForm.js
View File

@ -22,7 +22,7 @@ export const filterOptions = [
{ label: 'Count', value: 'count' }, { label: 'Count', value: 'count' },
{ label: 'Average', value: 'avg' }, { label: 'Average', value: 'avg' },
{ label: 'Minimum', value: 'min' }, { label: 'Minimum', value: 'min' },
{ label: 'Maxmimum', value: 'max' }, { label: 'Maximum', value: 'max' },
{ label: 'Sum', value: 'sum' }, { label: 'Sum', value: 'sum' },
]; ];

2
db/postgresql/migrations/04_add_uuid/migration.sql
View File

@ -1,3 +1,5 @@
-- CreateExtension
CREATE EXTENSION IF NOT EXISTS pgcrypto;
-- AlterTable -- AlterTable
ALTER TABLE "account" ADD COLUMN "account_uuid" UUID NULL; ALTER TABLE "account" ADD COLUMN "account_uuid" UUID NULL;