89 Commits

Author SHA1 Message Date
wangchuxiao
121523626d msg 2023-05-06 18:51:10 +08:00
wangchuxiao
72aa6d5eab msg 2023-05-05 21:30:32 +08:00
wangchuxiao
6b612ec345 pull msg 2023-05-05 12:19:04 +08:00
wangchuxiao
c0f8b9910a conversation 2023-05-04 20:07:20 +08:00
wangchuxiao
9c76988225 merge 2023-05-04 16:00:06 +08:00
wangchuxiao
4f01e10f65 merge 2023-05-04 15:54:04 +08:00
wangchuxiao
8793271541 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-04 15:53:58 +08:00
wangchuxiao
5c8208e0f8 sourceID2conversationID 2023-05-04 15:06:23 +08:00
withchao
3e1f97e300 notification 2023-05-04 12:11:29 +08:00
withchao
469458dd2a group 2023-04-24 19:45:29 +08:00
wangchuxiao
f6cebdbdef notification 2023-04-23 20:07:41 +08:00
wangchuxiao
2ab6136b2f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-23 14:21:45 +08:00
wangchuxiao
4dccfd0a81 notification 2023-04-23 14:21:36 +08:00
withchao
f815e9bd9a s3 2023-04-23 10:46:52 +08:00
wangchuxiao
8ad343e97c conversationID 2023-04-21 14:51:57 +08:00
wangchuxiao
2bd22b42b7 conversation 2023-04-21 11:26:48 +08:00
wangchuxiao
934e531840 conversation 2023-04-20 16:23:41 +08:00
withchao
e860991f06 group 2023-04-18 14:48:06 +08:00
wangchuxiao
1578176f39 log level 2023-04-17 11:57:38 +08:00
withchao
ffecab72d8 user db model 2023-03-31 09:45:15 +08:00
withchao
8843933d45 third 2023-03-30 10:52:45 +08:00
wangchuxiao
b4e228c33e groupMember 2023-03-29 14:30:38 +08:00
withchao
8ec04f46b0 third 2023-03-29 10:15:21 +08:00
wangchuxiao
132e1b987c cache 2023-03-23 19:02:20 +08:00
wangchuxiao
c8fd03a693 friend 2023-03-17 15:04:01 +08:00
wangchuxiao
40333d62e3 friend 2023-03-17 14:59:32 +08:00
Gordon
e99753f188 user update 2023-03-16 12:07:21 +08:00
withchao
1680b96b65 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	cmd/api/main.go
#	internal/api/a2r/api2rpc.go
#	internal/apiresp/resp.go
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/push/consumer_init.go
#	pkg/common/db/controller/conversation.go
#	pkg/common/mw/gin.go
#	pkg/statistics/statistics.go
2023-03-16 10:51:00 +08:00
withchao
17de3e7927 packet name pb 2023-03-16 10:46:06 +08:00
wangchuxiao
74d1d760aa db 2023-03-15 18:35:06 +08:00
wangchuxiao
f6600edea0 log 2023-03-10 11:42:06 +08:00
wangchuxiao
5447f27c80 script 2023-03-09 15:47:00 +08:00
wangchuxiao
9ce50095b5 cobra 2023-03-08 17:29:03 +08:00
wangchuxiao
ca1cdbdeb7 cobra 2023-03-08 16:35:18 +08:00
withchao
5ca36ebc10 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-06 17:43:48 +08:00
withchao
3ea0d1f765 s3 complete 2023-03-06 16:40:57 +08:00
wangchuxiao
23c24308f7 makefile 2023-03-06 16:23:16 +08:00
wangchuxiao
a6562e5a0e modify dictory 2023-03-06 12:06:50 +08:00
wangchuxiao
77b2d4aad0 modify dictory 2023-03-06 12:04:44 +08:00
wangchuxiao
f177715ada Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/api/auth.go
	internal/api/route.go
	internal/api/user.go
	internal/rpc/third/third.go
2023-03-03 17:45:15 +08:00
wangchuxiao
96d9b25b57 proto modify 2023-03-03 17:42:26 +08:00
withchao
e93425c574 api rpc third 2023-03-03 17:20:36 +08:00
wangchuxiao
d991947d4c proto modify 2023-03-02 12:00:31 +08:00
wangchuxiao
7930c230e4 config path 2023-02-23 19:51:58 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00
skiffer-git
5751062605 Error code standardization 2023-02-21 16:48:10 +08:00
skiffer-git
ae40c8c8c0 Error code standardization 2023-02-21 14:38:01 +08:00
skiffer-git
6201e5c206 Error code standardization 2023-02-21 13:14:19 +08:00
skiffer-git
be1bf240ad Error code standardization 2023-02-21 12:59:44 +08:00
withchao
762c49625c group db tx 2023-02-20 17:43:09 +08:00