5271 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
wangchuxiao	7445f96e66	Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode	2023-03-17 11:42:57 +08:00
wangchuxiao	cf968c0b4c	friend	2023-03-17 11:41:20 +08:00
withchao	26341a5187	Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode ... # Conflicts: # internal/rpc/friend/friend.go	2023-03-17 11:33:40 +08:00
withchao	2ce1bc84f2	pkg	2023-03-17 11:27:34 +08:00
wangchuxiao	67e1faefd8	friend db	2023-03-17 11:26:34 +08:00
withchao	835cd6d14a	pkg	2023-03-17 11:14:14 +08:00
wangchuxiao	22fa9dc0ba	Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode	2023-03-17 11:03:02 +08:00
wangchuxiao	ea9c9a496b	friend	2023-03-17 11:02:54 +08:00
withchao	15610438d8	is all fields private	2023-03-17 09:40:45 +08:00
wangchuxiao	2966afca6b	friend	2023-03-16 20:35:55 +08:00
wangchuxiao	47637175d7	friend	2023-03-16 20:32:58 +08:00
wangchuxiao	3f65376a35	fix friend	2023-03-16 20:30:28 +08:00
wangchuxiao	3d9945393a	Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode	2023-03-16 20:21:17 +08:00
wangchuxiao	ba6dddf986	fix add friend	2023-03-16 20:21:10 +08:00
withchao	f38bac44b4	Merge remote-tracking branch 'origin/errcode' into errcode	2023-03-16 19:16:03 +08:00
withchao	202f033c02	is empty struct	2023-03-16 19:15:45 +08:00
wangchuxiao	0ffce32f62	black	2023-03-16 19:06:57 +08:00
wangchuxiao	d2cd3618e0	Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode	2023-03-16 19:02:21 +08:00
wangchuxiao	e7b1377444	black bug	2023-03-16 19:01:15 +08:00
wangchuxiao	73e6fbbe91	black bug	2023-03-16 19:00:17 +08:00
withchao	c331d6f200	code error	2023-03-16 18:54:01 +08:00
Gordon	5c38ffa15e	user update	2023-03-16 18:18:59 +08:00
Gordon	a60dc3189c	user update	2023-03-16 18:11:03 +08:00
Gordon	92d941b747	user update	2023-03-16 17:49:36 +08:00
Gordon	007e0cff26	Merge remote-tracking branch 'origin/errcode' into errcode	2023-03-16 17:44:03 +08:00
Gordon	1117488eec	user update	2023-03-16 17:43:30 +08:00
wangchuxiao	57c082c545	Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode	2023-03-16 17:01:31 +08:00
wangchuxiao	5a886f6837	db	2023-03-16 17:01:17 +08:00
Gordon	f3937499fa	user update	2023-03-16 17:00:10 +08:00
withchao	0fd1e785fe	Merge remote-tracking branch 'origin/errcode' into errcode	2023-03-16 16:33:33 +08:00
withchao	1f935531f6	code error	2023-03-16 16:32:42 +08:00
wangchuxiao	d725b9538f	db	2023-03-16 16:23:56 +08:00
wangchuxiao	962c39f3c2	db	2023-03-16 16:11:34 +08:00
wangchuxiao	62920d3dd0	Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode	2023-03-16 16:10:29 +08:00
wangchuxiao	12d25e91bf	db	2023-03-16 16:10:08 +08:00
Gordon	9539f93640	Merge remote-tracking branch 'origin/errcode' into errcode	2023-03-16 15:11:35 +08:00
wangchuxiao	23c704e93b	Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode	2023-03-16 15:10:37 +08:00
Gordon	ce87ef0a04	conversation update	2023-03-16 15:10:23 +08:00
wangchuxiao	31833d06ba	db	2023-03-16 15:10:21 +08:00
Gordon	38d3c5d94d	user update	2023-03-16 13:01:42 +08:00
Gordon	1f03ebdbe7	user update	2023-03-16 12:53:29 +08:00
Gordon	6ce1c6c048	user update	2023-03-16 12:42:34 +08:00
Gordon	9a0f9c2270	user update	2023-03-16 12:32:25 +08:00
Gordon	baae7875aa	Merge remote-tracking branch 'origin/errcode' into errcode	2023-03-16 12:07:57 +08:00
Gordon	e99753f188	user update	2023-03-16 12:07:21 +08:00
wangchuxiao	a8dd306196	db	2023-03-16 12:00:14 +08:00
wangchuxiao	642743957e	db	2023-03-16 11:43:08 +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