Commit Graph

1965 Commits

Author SHA1 Message Date
Brian Cao
dd54fb3d2c combine logic 2022-09-13 09:18:58 -07:00
Brian Cao
c73d07d329 clarified var 2022-09-13 09:16:21 -07:00
Mike Cao
ea427f9366 Merge branch 'master' into dev 2022-09-12 14:38:50 -07:00
Mike Cao
0cb14f3f6c
Merge pull request #1508 from roywangdev/patch-1
Update package.json
2022-09-12 14:38:10 -07:00
Mike Cao
fb6aabaf06 Updated language bundles. 2022-09-12 14:36:27 -07:00
Brian Cao
8e068310b8 remove CH migration 2022-09-12 10:12:17 -07:00
Brian Cao
52e036964b Merge Session/Event/Pageview CH 2022-09-12 09:55:34 -07:00
ROYWANG
a4a3cdeb9f
Update package.json 2022-09-09 22:33:39 +08:00
Mike Cao
6941efa26d
Merge pull request #1499 from AliMickey/patch-1
Update README.md
2022-09-07 14:04:32 -07:00
Micky
04c028697f
Update README.md
Change docker-compose to docker compose as per latest changes with Docker packaging.
2022-09-07 12:55:15 +10:00
Brian Cao
d377ef86e7 Merge branch 'dev' into brian/uc-35-merge-tables-ch 2022-09-06 12:13:47 -07:00
Mike Cao
24b2322987 Merge branch 'master' into dev 2022-09-06 12:04:37 -07:00
Mike Cao
405d264ad6 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-09-06 12:04:34 -07:00
Mike Cao
bf8ebde0b1 Bump version. 2022-09-06 12:04:08 -07:00
Mike Cao
d469a42189
Merge pull request #1492 from bilguun0203/master
Update mn-MN
2022-09-06 12:03:38 -07:00
Mike Cao
e2de28bbe2
Merge pull request #1493 from rebron1900/patch-1
Update zh-CN.json
2022-09-06 12:03:08 -07:00
Mike Cao
39803274aa
Merge pull request #1494 from umami-software/brian/um-38-redis-reconnect
Add retry connection to redis.  Clean up up redis/session logic
2022-09-06 11:55:36 -07:00
Brian Cao
99914d6e98 Add retry connection to redis. Clean up up redis/session logic 2022-09-05 22:47:45 -07:00
1900
73b0981788
Update zh-CN.json 2022-09-06 13:41:52 +08:00
Bilguun Ochirbat
4282b1fa28 Update mn-MN 2022-09-06 03:04:53 +00:00
Mike Cao
9916265150
Merge pull request #1479 from umami-software/dev
Merge Dev into Master
2022-09-05 18:40:21 -07:00
Mike Cao
81ca9c9665 Bump version. 2022-09-05 16:44:44 -07:00
Mike Cao
b829d84fc1 Merge remote-tracking branch 'origin/dev' into dev 2022-09-05 15:36:10 -07:00
Mike Cao
13cf286874 Fix www replace. 2022-09-05 15:35:36 -07:00
Mike Cao
52bbc3692d Fix issue with generating URLs. 2022-09-05 12:04:30 -07:00
Brian Cao
42bdfccdf4 Fix website get during collection/session check 2022-09-05 11:36:57 -07:00
Mike Cao
912b63da82 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2022-09-05 10:44:28 -07:00
Mike Cao
44e017c14a
Merge branch 'master' into dev 2022-09-03 23:19:08 -07:00
Mike Cao
9f6834925b
Merge pull request #1465 from aidanm1999/feature/2022-09/admin-website-assigning
Admins can assign websites to non-admins
2022-09-03 23:17:06 -07:00
Mike Cao
8175791576
Merge pull request #1478 from Dhravya/patch-1
Fixed `TypeError: Cannot read properties of undefined (reading 'website_id')`
2022-09-03 23:15:11 -07:00
Mike Cao
ee3c9debb2
Merge branch 'dev' into patch-1 2022-09-03 23:15:03 -07:00
mike
935143d499 Updated language bundles. 2022-09-03 21:28:25 -07:00
Mike Cao
edfe3ad163
Merge pull request #1476 from umami-software/dependabot/npm_and_yarn/moment-timezone-0.5.35
Bump moment-timezone from 0.5.34 to 0.5.35
2022-09-03 21:24:47 -07:00
Mike Cao
0bbfbc04c3
Merge pull request #1463 from guigrpa/add-yesterday
Add yesterday option
2022-09-03 21:23:51 -07:00
Mike Cao
825daeee32
Merge pull request #1484 from Maxime-J/fr
Update fr-FR
2022-09-03 21:21:52 -07:00
Maxime-J
b37918acbb Update fr-FR 2022-09-03 14:45:08 +00:00
Brian Cao
0c33bb9e2d fix schema file. 2022-09-01 14:54:25 -07:00
Brian Cao
afe6d8994b fix redis connection. fix delete account 2022-09-01 11:11:11 -07:00
Mike Cao
04e9061dcf Updated language bundle. 2022-09-01 10:58:01 -07:00
Dhravya Shah
aaf0effcbb
Fixed TypeError: Cannot read properties of undefined (reading 'website_id') 2022-09-01 19:48:21 +05:30
Brian Cao
12704c81e5 set experiment. 2022-08-31 21:44:49 -07:00
dependabot[bot]
8bcdc54f93
Bump moment-timezone from 0.5.34 to 0.5.35
Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.34 to 0.5.35.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](https://github.com/moment/moment-timezone/compare/0.5.34...0.5.35)

---
updated-dependencies:
- dependency-name: moment-timezone
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-31 05:34:17 +00:00
Brian Cao
7c05a54ffe allow event data CH 2022-08-30 17:29:30 -07:00
Brian Cao
f3312732dc fix redis.client call 2022-08-30 15:54:33 -07:00
Brian Cao
f18b5a20e3 remove bigint 2022-08-30 13:56:37 -07:00
Mike Cao
2f21bb351e
Merge pull request #1474 from umami-software/brian/big-int-rollback
roll back bigint. add loading
2022-08-30 02:06:19 -05:00
Brian Cao
d53b4a8895 roll back bigint. add loading 2022-08-30 00:03:22 -07:00
Mike Cao
2da51ee931 Merge remote-tracking branch 'origin/dev' into dev 2022-08-29 20:57:58 -07:00
Mike Cao
fb39ce8822 Fixed dashboard ordering issue. Closes #1414 2022-08-29 20:57:34 -07:00
Mike Cao
4cae9b261e
Merge pull request #1466 from guigrpa/bugfix-metric-card-keep-sign
Fixed bug in MetricCard: plus sign disappears on click.
2022-08-29 22:39:49 -05:00