IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,105 Commits 35 Branches 142 Tags
aac22db8fc659df8de7ccaf89cf65e682dff88bc
Commit Graph

385 Commits

Author SHA1 Message Date
withchao 2a33eaf4ea Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-29 10:16:03 +08:00
withchao 8ec04f46b0 third 2023-03-29 10:15:21 +08:00
wangchuxiao 2fd768df75 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-28 19:25:05 +08:00
wangchuxiao 55c79c805f group 2023-03-28 19:24:59 +08:00
withchao 3613787a6b third 2023-03-28 16:26:02 +08:00
wangchuxiao 01f4a206c7 group 2023-03-27 19:24:16 +08:00
wangchuxiao cb26321847 group 2023-03-27 17:20:36 +08:00
wangchuxiao cfb157d2e4 group 2023-03-27 15:05:40 +08:00
wangchuxiao 4706d830a2 group 2023-03-27 10:07:41 +08:00
wangchuxiao fa477c2d17 cache 2023-03-24 18:42:19 +08:00
wangchuxiao 862fca1019 cache 2023-03-24 18:38:14 +08:00
wangchuxiao 83d91c7dc9 cache 2023-03-24 18:32:25 +08:00
wangchuxiao 8a073a9dfb conversation 2023-03-24 17:34:33 +08:00
wangchuxiao 6fb9992957 conversation 2023-03-24 16:41:11 +08:00
wangchuxiao 2baf208c02 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-23 19:05:20 +08:00
wangchuxiao 132e1b987c cache 2023-03-23 19:02:20 +08:00
Gordon 11ebe4e234 msg update 2023-03-22 18:35:21 +08:00
Gordon c036d27b36 msg update 2023-03-21 12:28:21 +08:00
wangchuxiao 13adde5223 group 2023-03-17 19:41:44 +08:00
wangchuxiao 7c8c809fb8 errcode 2023-03-17 16:01:56 +08:00
wangchuxiao 40333d62e3 friend 2023-03-17 14:59:32 +08:00
wangchuxiao a765160ee3 friend 2023-03-17 14:19:53 +08:00
wangchuxiao 40da937c4c friend 2023-03-17 13:44:30 +08:00
wangchuxiao 91e2f3caeb err 2023-03-17 12:41:04 +08:00
wangchuxiao befd5c8636 err 2023-03-17 12:36:26 +08:00
wangchuxiao 1921e5b030 err 2023-03-17 12:32:26 +08:00
wangchuxiao 506a417b0b err 2023-03-17 12:29:19 +08:00
wangchuxiao 9716d478bd freind 2023-03-17 12:23:49 +08:00
wangchuxiao 553606d2a8 err 2023-03-17 12:18:33 +08:00
wangchuxiao 7fd9a84271 error 2023-03-17 12:12:32 +08:00
wangchuxiao 67e1faefd8 friend db 2023-03-17 11:26:34 +08:00
wangchuxiao ea9c9a496b friend 2023-03-17 11:02:54 +08:00
wangchuxiao ba6dddf986 fix add friend 2023-03-16 20:21:10 +08:00
Gordon f3937499fa user update 2023-03-16 17:00:10 +08:00
Gordon e99753f188 user update 2023-03-16 12:07:21 +08:00
wangchuxiao be847d5d5e db 2023-03-16 11:41:38 +08:00
wangchuxiao 690a2195da Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	pkg/common/db/controller/friend.go
 2023-03-16 11:03:57 +08:00
wangchuxiao 63f5169dbe db 2023-03-16 11:03:14 +08:00
withchao a529ba4f5b packet name pb 2023-03-16 10:52:50 +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 cc93335d7f db 2023-03-15 18:36:00 +08:00
wangchuxiao 74d1d760aa db 2023-03-15 18:35:06 +08:00
wangchuxiao d75d1f57e4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 16:45:17 +08:00
wangchuxiao 8dea2cacf4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
 2023-03-15 16:29:04 +08:00
withchao e9865539de s3 2023-03-15 11:24:59 +08:00
withchao acb7a8be2d s3 2023-03-14 19:40:35 +08:00
withchao 188dc6d322 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/controller/storage.go
 2023-03-14 19:39:34 +08:00
withchao 6a95025e41 s3 2023-03-14 19:33:44 +08:00
wangchuxiao 6b98f27656 zap 2023-03-14 19:27:43 +08:00