IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-04-28 22:39:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,621 Commits 35 Branches 142 Tags
210d04d4882482ffbde72cecfa71dcbc48619436
Commit Graph

2020 Commits

Author SHA1 Message Date
withchao 210d04d488 rpc GroupApplicationResponse 2023-02-06 15:32:20 +08:00
withchao 8c30bde86e 1 2023-02-06 11:55:10 +08:00
withchao 32d99595fb 1 2023-02-06 11:53:19 +08:00
withchao d91039c99d Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-03 18:10:57 +08:00
withchao 516285952d 1 2023-02-03 18:10:49 +08:00
withchao bec4a89f7b 1 2023-02-03 17:27:56 +08:00
skiffer-git d59c4367fb Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-03 16:51:57 +08:00
skiffer-git 22c63ecdbd Error code standardization 2023-02-03 16:51:35 +08:00
Gordon 99504eec2e Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/cache/conversation.go
 2023-02-03 16:23:47 +08:00
skiffer-git 795a90a194 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-03 16:12:07 +08:00
skiffer-git 1aa3ac9399 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/controller/friend.go
#	pkg/common/db/relation/friend_model_k.go
#	pkg/common/db/relation/friend_request_model.go
 2023-02-03 16:11:29 +08:00
withchao a2c4bccdb6 1 2023-02-03 16:10:51 +08:00
skiffer-git 3320f81c8f Error code standardization 2023-02-03 16:10:33 +08:00
withchao 64dee9f989 1 2023-02-03 16:10:07 +08:00
Gordon 3b4c227519 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/relation/conversation_model.go
 2023-02-03 15:54:23 +08:00
withchao f98d894a4b 1 2023-02-03 14:36:38 +08:00
withchao 4d4a451926 1 2023-02-03 14:26:54 +08:00
withchao adfcfac711 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/table/relation.go
 2023-02-03 14:24:57 +08:00
withchao 8e49d7e567 1 2023-02-03 14:23:29 +08:00
wangchuxiao 2243e8194d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-03 12:17:04 +08:00
wangchuxiao b637a29348 errcode 2023-02-03 12:16:48 +08:00
withchao d5a9647902 1 2023-02-03 11:50:23 +08:00
Gordon e167d80469 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/relation/conversation_model.go
 2023-02-03 10:26:26 +08:00
Gordon 730be9db47 conversation update 2023-02-02 19:47:21 +08:00
wangchuxiao 01f7262d3a errcode 2023-02-02 19:43:51 +08:00
wangchuxiao 83eba5a9ea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-02 19:41:11 +08:00
wangchuxiao 47b725ac69 errcode 2023-02-02 19:40:54 +08:00
withchao dec0c8cc47 1 2023-02-02 18:45:43 +08:00
withchao b7f0e2e6f3 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 17:54:21 +08:00
withchao e8a24ab59e 1 2023-02-02 17:54:02 +08:00
withchao 778e3e5cd2 1 2023-02-02 17:49:19 +08:00
skiffer-git e175ef2b4e Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 16:39:45 +08:00
skiffer-git 5402d33519 Error code standardization 2023-02-02 16:39:29 +08:00
wangchuxiao 174c3e5fae Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-02 16:11:33 +08:00
wangchuxiao f6cc91d7db errcode 2023-02-02 16:11:24 +08:00
withchao 94b0e60e83 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 16:08:19 +08:00
withchao 0eb77e9b35 1 2023-02-02 16:08:08 +08:00
withchao c3f6a0fa15 1 2023-02-02 15:42:14 +08:00
Gordon eb810f8dca Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 12:06:55 +08:00
Gordon 645b8dc0a9 pb file 2023-02-02 12:06:36 +08:00
Gordon a9151868b0 pb file 2023-02-02 12:06:25 +08:00
withchao c1af64854c 1 2023-02-02 12:00:18 +08:00
withchao dab552aed4 1 2023-02-02 11:55:48 +08:00
withchao 26b5ed72df 1 2023-02-02 11:52:00 +08:00
withchao eb3bb7948f 1 2023-02-02 11:47:27 +08:00
withchao c55785783d 1 2023-02-02 11:24:03 +08:00
withchao 7ed60bd8f9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 10:47:46 +08:00
withchao 4649ce5354 1 2023-02-02 10:47:19 +08:00
wangchuxiao 803ecd3f92 errcode 2023-02-01 19:31:39 +08:00
wangchuxiao 5bb731f884 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	pkg/common/db/relation/black.go
 2023-02-01 18:42:38 +08:00