Commit Graph

2357 Commits (fa52e6c83f0455a4bb81e83fdd3ff28c0cfe267d)

Author SHA1 Message Date
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
Francis Cao 5fc96cf5e1 fix logout error 2023-04-12 22:53:38 -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
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 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
Mike Cao 94ed67e339 Responsive updates. 2023-04-09 20:22:28 -07:00
Brian Cao 3e1c1a85e4 update label. 2023-04-09 17:42:34 -07:00
Brian Cao 339085a946 Add 'admin' label 2023-04-09 16:17:30 -07:00
Brian Cao f7119d494b Fix translation. 2023-04-09 16:06:59 -07:00
Brian Cao 9eff565e7a Fix teamWebsite / teamUser. 2023-04-09 16:04:28 -07:00
Mike Cao 53b23420a4 Fixed country names lookup. 2023-04-08 16:31:21 -07:00
Mike Cao 07c92ff9b5 Compiled language bundles. 2023-04-08 15:56:13 -07:00
Mike Cao 0dc6529cf1 Added new languages to lib/lang. 2023-04-08 15:51:49 -07:00
Mike Cao 7b97cb3348 Merged messages. 2023-04-08 14:07:36 -07:00
Mike Cao 2798de0c4c Added de-CH file. 2023-04-08 14:06:43 -07:00
Mike Cao b2bebaea3e Added km-KH, updated be-BY. 2023-04-08 13:58:58 -07:00
Mike Cao e850fbd0bd Merge changes from master. 2023-04-08 13:55:52 -07:00
Mike Cao 2dbc6ce381 Updated languages. 2023-04-08 13:49:58 -07:00
Mike Cao 2656de6682 Updated language bundles with new keys. 2023-04-08 13:14:22 -07:00
Mike Cao 45d3fa4016 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-04-08 01:36:21 -07:00
Brian Cao f45995e8b5 Merge remote-tracking branch 'origin/dev' into dev 2023-04-07 22:45:49 -07:00
Brian Cao 7b07de7a98 Api work for remove user. 2023-04-07 22:45:46 -07:00
Mike Cao f0cddc2743 Fixed messages. 2023-04-07 22:03:52 -07:00
Francis Cao 7a1ac22dde add referrer_domain to getEvent 2023-04-07 14:37:22 -07:00
Francis Cao 24ac7d6be0 fix urlPath clickhouse 2023-04-07 14:23:38 -07:00
Mike Cao 6424100223 Fixed typo in query. 2023-04-07 11:48:43 -07:00