Commit Graph

129 Commits

Author SHA1 Message Date
withchao fe3e17c3ad s3 InitiateMultipartUpload add ExpireTime 2023-07-12 14:27:06 +08:00
withchao 84f8074d6a s3 url 2023-07-12 13:55:17 +08:00
wangchuxiao fd87d70b56 Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev 2023-07-12 13:23:22 +08:00
wangchuxiao 5dbeac7dcf kick user log 2023-07-12 13:21:49 +08:00
withchao 535736bad1 s3 cos test 2023-07-12 12:30:42 +08:00
wangchuxiao 31778c9cdf fix kick user bug 2023-07-12 12:03:53 +08:00
withchao d7c66c6f45 s3 debug log 2023-07-12 11:14:06 +08:00
withchao 95b1d09a3c s3 debug log 2023-07-12 11:06:41 +08:00
withchao 04474c6747 s3 pb 2023-07-10 17:51:57 +08:00
withchao a7a2bd3e4f Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-10 17:08:08 +08:00
withchao e55bd7adae s3 route 2023-07-10 17:07:55 +08:00
wangchuxiao 9468589cc7 Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev 2023-07-10 17:07:14 +08:00
wangchuxiao bcf2f0f443 remove extendMsg code 2023-07-10 17:07:08 +08:00
withchao 29dade90ec s3 minio, cos, oss support 2023-07-10 16:24:59 +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 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 4bdf6be372 set conversations update 2023-07-07 10:52: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 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
withchao 3de21d13bd UserRegisterCount 2023-07-03 15:59:42 +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
kubbot & kubecub 539e0fdfb6 feat: use robot to migrate code
Signed-off-by: kubbot & kubecub <3293172751ysy@gmail.com>
2023-06-30 09:45:02 +08:00
soasurs 2710db63a1 feat: add recvID/groupID for msg modification callback (#351)
Signed-off-by: soasurs <soasurs@gmail.com>
2023-06-29 22:44:20 +08:00
Gordon f42b9a6dfe super group remove unread message 2023-06-29 22:44:16 +08:00
withchao e598d8ad79 agree user join group 2023-06-29 22:44:15 +08:00
wangchuxiao bb65c7293e modify 2023-06-29 22:44:10 +08:00