Mike Cao
|
dfae0c150d
|
Merge branch 'dev'
# Conflicts:
# components/common/Calendar.js
# components/common/EventDataButton.js
# components/forms/EventDataForm.js
# components/layout/Header.js
# db/mysql/migrations/02_add_event_data/migration.sql
# lang/be-BY.json
# lang/de-CH.json
# lang/es-MX.json
# lang/fa-IR.json
# lang/km-KH.json
# lang/lt-LT.json
# lang/th-TH.json
# lib/auth.js
# lib/detect.ts
# lib/lang.js
# lib/middleware.js
# lib/prisma.js
# package.json
# pages/_app.js
# pages/api/accounts/[id]/password.js
# pages/api/collect.js
# pages/api/realtime/init.js
# pages/api/websites/[id]/index.js
# pages/api/websites/[id]/reset.ts
# pages/api/websites/index.js
# public/intl/messages/fa-IR.json
# public/intl/messages/lt-LT.json
# public/intl/messages/pt-BR.json
# public/intl/messages/th-TH.json
# queries/analytics/event/getEventData.js
# queries/analytics/event/getEventMetrics.js
# queries/analytics/pageview/getPageviewMetrics.js
# queries/analytics/pageview/getPageviewParams.js
# queries/analytics/pageview/getPageviewStats.js
# queries/analytics/session/getSessionMetrics.js
# queries/analytics/stats/getActiveVisitors.js
# queries/analytics/stats/getWebsiteStats.js
# sql/schema.mysql.sql
# styles/index.css
# yarn.lock
|
2023-04-17 11:08:17 -07:00 |
|
Mike Cao
|
0e4c071b16
|
Bump version v2.0.0.
|
2023-04-17 10:36:24 -07:00 |
|
Mike Cao
|
d406564af3
|
Manually merge PR #1879.
|
2023-04-17 10:31:50 -07:00 |
|
Mike Cao
|
60984e031c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-17 10:26:37 -07:00 |
|
Mike Cao
|
d2edb0d0d7
|
Manually merge PR #1799.
|
2023-04-17 10:26:08 -07:00 |
|
Mike Cao
|
2bd970ba2b
|
Merge pull request #1883 from screendriver/noindex
Prevent indexing content by search engines
|
2023-04-17 10:23:08 -07:00 |
|
Mike Cao
|
23b98314d6
|
Merge pull request #1831 from vidschofelix/master
Upgrade Postgres to 15
|
2023-04-17 10:10:27 -07:00 |
|
Francis Cao
|
01559c4c63
|
update docker-compose to 15-alpine
|
2023-04-17 10:10:05 -07:00 |
|
Francis Cao
|
43499eb4fd
|
fix region / city filters
|
2023-04-17 00:10:51 -07:00 |
|
Francis Cao
|
672608b2f5
|
re-add pgcrypto extension
|
2023-04-16 21:13:51 -07:00 |
|
Francis Cao
|
b1074c893a
|
01_init schema changes
|
2023-04-16 21:07:36 -07:00 |
|
Mike Cao
|
561770a469
|
Add selected state.
|
2023-04-16 20:46:38 -07:00 |
|
Mike Cao
|
7e79711900
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-16 16:35:28 -07:00 |
|
Mike Cao
|
061d8cd174
|
Fixed incorrect messages.
|
2023-04-16 16:34:49 -07:00 |
|
Francis Cao
|
b7d64a91bd
|
fix check-db workflow
|
2023-04-14 10:24:48 -07:00 |
|
Mike Cao
|
54b018f7ba
|
Merge branch 'dev' of https://github.com/umami-software/umami into dev
|
2023-04-13 23:37:50 -07:00 |
|
Mike Cao
|
43a4357729
|
Updated subdivision save.
|
2023-04-13 23:32:28 -07:00 |
|
Mike Cao
|
fa52e6c83f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-13 23:06:04 -07:00 |
|
Mike Cao
|
b183fc1600
|
Fixed map issue.
|
2023-04-13 23:05:54 -07:00 |
|
Francis Cao
|
06649c2e31
|
at null check for subdivision save
|
2023-04-13 22:59:04 -07:00 |
|
Brian Cao
|
7e096336ce
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-13 22:52:44 -07:00 |
|
Brian Cao
|
3461342601
|
Clean up api.
|
2023-04-13 22:52:41 -07:00 |
|
Mike Cao
|
2890cb4419
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-13 22:44:49 -07:00 |
|
Mike Cao
|
35fbb7321e
|
Added districts for Bangladesh.
|
2023-04-13 22:44:43 -07:00 |
|
Francis Cao
|
42df7695e8
|
Merge branch 'dev' of https://github.com/umami-software/umami into dev
|
2023-04-13 22:40:54 -07:00 |
|
Francis Cao
|
9dd9ab1325
|
concatenate subdivision saves
|
2023-04-13 22:40:48 -07:00 |
|
Mike Cao
|
e286994397
|
Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
# public/iso-3166-2.json
|
2023-04-13 22:30:22 -07:00 |
|
Mike Cao
|
f2edd0d604
|
Added regions and cities support.
|
2023-04-13 22:28:29 -07:00 |
|
Francis Cao
|
44e37ece2d
|
add PH to iso-3166-2 json
|
2023-04-13 22:17:36 -07:00 |
|
Mike Cao
|
ad3ee5e953
|
Added entries for PH.
|
2023-04-13 22:13:30 -07:00 |
|
Brian Cao
|
0335fd3529
|
Remove webisite.teamId related code. Clean up queries.
|
2023-04-13 20:57:22 -07:00 |
|
Brian Cao
|
081a126c01
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-13 20:33:24 -07:00 |
|
Brian Cao
|
baa6d8486b
|
Remove unused code.
|
2023-04-13 20:33:21 -07:00 |
|
Francis Cao
|
aa418e0bed
|
add delete user label for modal
|
2023-04-13 17:20:42 -07:00 |
|
Francis Cao
|
887b3abb29
|
Fix deleteWebsite message
|
2023-04-13 17:10:04 -07:00 |
|
Francis Cao
|
cc9b1d21cb
|
fix delete team confirmation message
|
2023-04-13 16:14:05 -07:00 |
|
Brian Cao
|
ef324fdf73
|
Fix update user.
|
2023-04-13 12:08:53 -07:00 |
|
Christian Rackerseder
|
ab44150532
|
Prevent indexing content by search engines
|
2023-04-13 08:44:34 +02:00 |
|
Francis Cao
|
5fc96cf5e1
|
fix logout error
|
2023-04-12 22:53:38 -07:00 |
|
Mike Cao
|
5997efc276
|
Merge branch 'dev' of https://github.com/umami-software/umami into dev
|
2023-04-12 20:03:16 -07:00 |
|
Mike Cao
|
a30147547b
|
Fix dropdown css.
|
2023-04-12 17:47:11 -07:00 |
|
Mike Cao
|
4e36149e32
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-04-12 17:43:18 -07:00 |
|
Mike Cao
|
b32ced5501
|
Responsive fixes for settings pages.
|
2023-04-12 17:43:08 -07:00 |
|
Mike Cao
|
4a1c6f40a6
|
Fix config.
|
2023-04-12 13:41:00 -07:00 |
|
Mike Cao
|
e2fcd40c2b
|
Added SettingsTable.
|
2023-04-12 13:40:19 -07:00 |
|
Kai Steinke
|
0926a4c310
|
feat: add missing locales and sort alphabetically
|
2023-04-11 10:53:43 +02:00 |
|
Francis Cao
|
21e48c194e
|
fix system user insert mysql
|
2023-04-10 09:56:25 -07:00 |
|
Francis Cao
|
f5f6dc052e
|
fix column name date bug
|
2023-04-10 09:44:25 -07:00 |
|
Mike Cao
|
da79e4c19e
|
Merge branch 'dev' of https://github.com/umami-software/umami into dev
|
2023-04-10 07:29:15 -07:00 |
|
Mike Cao
|
f84e41e198
|
Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
# components/messages.js
|
2023-04-10 07:25:27 -07:00 |
|