667 Commits

Author SHA1 Message Date
withchao
6bf5b86227 user active 2023-07-04 20:11:51 +08:00
withchao
ffe7cc3b10 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-04 18:46:34 +08:00
withchao
c2d02cbc4c group active 2023-07-04 18:46:21 +08:00
Gordon
3dba5495a6 feat: group notification show to conversation 2023-07-04 18:25:38 +08:00
Gordon
387ac6e930 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-04 17:38:29 +08:00
Gordon
ea4335bb24 feat: group notification show to conversation 2023-07-04 17:38:03 +08:00
withchao
1e93297968 group create 2023-07-04 17:16:38 +08:00
withchao
f80372ded4 group create 2023-07-04 17:16:25 +08:00
withchao
bb667238f2 active user 2023-07-04 16:55:34 +08:00
withchao
be9c8fcab7 active user 2023-07-04 16:36:02 +08:00
withchao
000c68dddd
Merge pull request #467 from BanTanger/v3dev
add tx_oss cos
2023-07-04 14:43:38 +08:00
BanTanger
2e99a45dae add tx_oss cos 2023-07-04 12:23:58 +08:00
Gordon
5d115bf651 feat: conn update token 2023-07-04 11:28:43 +08:00
Gordon
49737a2dda feat: conn update token 2023-07-04 11:26:33 +08:00
Gordon
4df0f78af5 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-04 10:33:25 +08:00
Gordon
94b4a18f2d feat: conn update token 2023-07-04 10:32:54 +08:00
withchao
9f32e3a9bc active user 2023-07-04 09:56:02 +08:00
Gordon
e416ace264 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-04 09:40:11 +08:00
Gordon
dbc4fd5e4a feat: conn update token 2023-07-04 09:39:50 +08:00
withchao
0cb1fc3e52 active user 2023-07-04 09:33:59 +08:00
withchao
898adbb833 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-04 09:32:56 +08:00
withchao
aaa1fb29cd active user 2023-07-04 09:32:40 +08:00
Gordon
92f64ddf7c feat: conn update token 2023-07-03 21:30:22 +08:00
Gordon
1f94357498 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-03 21:17:22 +08:00
Gordon
e6c2568f6b refactor: errcode update 2023-07-03 21:15:52 +08:00
withchao
80f25c54c9 active user 2023-07-03 21:01:50 +08:00
withchao
807c6eae15 active user 2023-07-03 20:59:05 +08:00
withchao
28b4506395 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-03 20:54:21 +08:00
withchao
dd6b47fbbb active user 2023-07-03 20:54:03 +08:00
Gordon
4ca3e757bd Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-03 18:29:14 +08:00
Gordon
3a3784329e refactor: errcode update 2023-07-03 18:28:40 +08:00
withchao
bedd554269 revoke userID 2023-07-03 18:28:38 +08:00
withchao
e2be0fc093 msgs statistics 2023-07-03 18:24:52 +08:00
withchao
d787668911 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-03 18:24:34 +08:00
withchao
cae8b377b0 msgs statistics 2023-07-03 18:20:01 +08:00
Gordon
ba20fa90f7 refactor:pb file 2023-07-03 17:34:46 +08:00
Gordon
d325eed4a3 refactor: user pb update 2023-07-03 17:16:39 +08:00
Gordon
48a6265465 Merge remote-tracking branch 'origin/v3dev' into v3dev
# Conflicts:
#	pkg/proto/user/user.pb.go
2023-07-03 17:14:33 +08:00
wangchuxiao
1ac6279569 remove online push close grpc conn 2023-07-03 17:02:42 +08:00
Gordon
2095e0839d refactor: user pb update 2023-07-03 17:02:31 +08:00
wangchuxiao
8bb177a693 Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev 2023-07-03 16:36:57 +08:00
wangchuxiao
01d3fefd5d push use local conn 2023-07-03 16:36:52 +08:00
withchao
3de21d13bd UserRegisterCount 2023-07-03 15:59:42 +08:00
withchao
840e79ca16 Merge remote-tracking branch 'origin/main' into v3dev 2023-07-03 15:49:04 +08:00
WangchuXiao
941c1f954e
V3dev (#463)
* statistics user register

* refactor: router change

* minio init

---------

Co-authored-by: withchao <993506633@qq.com>
Co-authored-by: Gordon <1432970085@qq.com>
2023-07-03 15:21:17 +08:00
withchao
12dd42c60d minio init 2023-07-03 15:09:39 +08:00
Gordon
0642f97e12 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-03 14:30:38 +08:00
Gordon
a9569a2a97 refactor: router change 2023-07-03 14:26:45 +08:00
Xinwei Xiong
e50b8bd8f1
feat: adding actions (#461) 2023-07-03 12:16:34 +08:00
withchao
09ffe40011 statistics user register 2023-07-03 12:11:09 +08:00