251 Commits

Author SHA1 Message Date
withchao
e82a08bbbd Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-10 16:25:53 +08:00
withchao
29dade90ec s3 minio, cos, oss support 2023-07-10 16:24:59 +08:00
BanTanger
ec6036b5fa
feat: add implement of GetUsersOnlineStatus, #472 (#477) 2023-07-10 16:01:39 +08:00
withchao
fea3c5358a s3 minio, cos, oss support 2023-07-10 15:50:57 +08:00
wangchuxiao
7059d6b5fb msg destruct 2023-07-10 14:47:07 +08:00
wangchuxiao
c02f3cc8d5 set IsMsgDestruct 2023-07-10 11:58:04 +08:00
wangchuxiao
ece2498d18 cron use rpc mw 2023-07-10 10:34:44 +08:00
wangchuxiao
7bf9d5a305 msgDestruct 2023-07-10 10:09:51 +08:00
wangchuxiao
c2e1d5a21e remove unuse rpc 2023-07-07 19:19:23 +08:00
wangchuxiao
5d82447e92 set privateChat 2023-07-07 11:14:15 +08:00
wangchuxiao
0ae58dac79 Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev 2023-07-07 10:53:00 +08:00
wangchuxiao
4bdf6be372 set conversations update 2023-07-07 10:52:54 +08:00
Gordon
ffba76cc6b fix: text update 2023-07-06 18:36:27 +08:00
withchao
f6756008b0 api nil slice map 2023-07-06 15:09:41 +08:00
withchao
b494c73328 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-05 20:31:17 +08:00
withchao
c2b7d3bc2c a2r call option 2023-07-05 20:30:54 +08:00
wangchuxiao
54bba9a867 privateChat 2023-07-05 19:08:06 +08:00
wangchuxiao
325d898695 Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev 2023-07-05 13:22:14 +08:00
wangchuxiao
7a9e0af8ed sendNotificationWithName 2023-07-05 13:22:06 +08:00
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
f80372ded4 group create 2023-07-04 17:16:25 +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
94b4a18f2d feat: conn update token 2023-07-04 10:32:54 +08:00
Gordon
dbc4fd5e4a feat: conn update token 2023-07-04 09:39:50 +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
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
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
withchao
3de21d13bd UserRegisterCount 2023-07-03 15:59:42 +08:00
Gordon
a9569a2a97 refactor: router change 2023-07-03 14:26:45 +08:00
withchao
d345fc80c7 gorm chat_logs init 2023-07-02 18:59:18 +08:00
kubbot & kubecub
64bb62d814 feat: ver3 branch
Signed-off-by: kubbot & kubecub <3293172751ysy@gmail.com>
2023-06-30 23:04:28 +08:00
kubbot & kubecub
74de8825f6 fix bug
Signed-off-by: kubbot & kubecub <3293172751ysy@gmail.com>
2023-06-30 22:32:30 +08:00
Xinwei Xiong(cubxxw-openim)
9394ac658e feat: add copyright permission
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
2023-06-30 17:59:38 +08:00