1477 Commits

Author	SHA1	Message	Date
wangchuxiao	92fc43cb3d	conversation	2022-08-22 16:14:31 +08:00
wangchuxiao	73a73b7bc7	conversation	2022-08-22 16:03:59 +08:00
wangchuxiao	3391bd8322	conversation	2022-08-22 15:59:45 +08:00
wangchuxiao	3d5876a8c0	Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release	2022-08-22 15:48:05 +08:00
wangchuxiao	7d04f06f7d	conversation fix	2022-08-22 15:47:50 +08:00
Gordon	2c21bf3e0e	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release	2022-08-21 23:32:00 +08:00
Gordon	c1a2dee0e9	pb update	2022-08-21 23:25:39 +08:00
wangchuxiao	782ad07940	fix bug	2022-08-21 22:28:10 +08:00
wangchuxiao	d57729d3d7	fix bug	2022-08-21 22:22:59 +08:00
wangchuxiao	d4d9e08ae2	fix bug	2022-08-21 21:55:46 +08:00
wangchuxiao	6553ada66f	add set client init	2022-08-21 21:54:32 +08:00
Gordon	c0b49ff219	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release	2022-08-21 19:07:03 +08:00
wangchuxiao	d20c89ba21	merge shichuang 2 v2.3.0release	2022-08-21 17:57:44 +08:00
wangchuxiao	ee577cae4c	add conversationCache	2022-08-21 17:33:40 +08:00
Gordon	ed5b215bbb	pc terminal can login at same time	2022-08-21 16:05:58 +08:00
skiffer-git	9f002172db	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release	2022-08-19 21:37:56 +08:00
skiffer-git	5d661f2fc6	add user register IP	2022-08-19 21:37:39 +08:00
Gordon	9a82dd356c	callback add offline info	2022-08-19 13:04:38 +08:00
wangchuxiao	840e08fc8a	Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang	2022-08-19 12:09:21 +08:00
wangchuxiao	761b8c40d6	conversation cache function	2022-08-19 12:09:05 +08:00
Gordon	40b7314f6d	model add update time	2022-08-19 11:58:46 +08:00
wangchuxiao	5c3a43f602	fix bug	2022-08-18 11:14:38 +08:00
wangchuxiao	5a995a8624	rtc pb	2022-08-17 21:32:34 +08:00
wangchuxiao	4614107b2b	Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release	2022-08-17 18:21:49 +08:00
wangchuxiao	d6dd99bb4a	add	2022-08-17 15:34:07 +08:00
wangchuxiao	d0a200f652	etcd	2022-08-17 14:57:57 +08:00
wangchuxiao	9138f90843	etcd	2022-08-17 12:58:51 +08:00
wangchuxiao	766a8fa4dd	Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang	2022-08-17 12:24:49 +08:00
wangchuxiao	6f2451edd3	etcd	2022-08-17 12:12:54 +08:00
skiffer-git	864fccbdb2	get grpc conn from config	2022-08-17 11:58:23 +08:00
wangchuxiao	8956df9599	etcd	2022-08-17 11:51:37 +08:00
skiffer-git	a3daaa55b5	get grpc conn from config	2022-08-17 11:46:11 +08:00
skiffer-git	85a52f5d6b	get grpc conn from config	2022-08-17 11:42:12 +08:00
skiffer-git	cdf09aa1bd	get grpc conn from config	2022-08-17 11:35:33 +08:00
wangchuxiao	b5166acada	update orgnization after update user	2022-08-17 10:42:17 +08:00
skiffer-git	5b06791a6c	set max PlatformID = 9	2022-08-16 23:26:13 +08:00
Gordon	97b1a774fb	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release	2022-08-16 19:16:20 +08:00
Gordon	12a4c12753	notification	2022-08-16 19:15:54 +08:00
wangchuxiao	2016a1656b	Merge branch 'v2.3.0release' into del	2022-08-16 12:17:07 +08:00
wangchuxiao	3f74022142	Merge branch 'main' into del	2022-08-15 21:51:12 +08:00
wangchuxiao	ad1015c8b0	fix code	2022-08-15 20:41:46 +08:00
wangchuxiao	d666f0245d	Merge pull request #267 from ouyangshi/del ... 封禁用户列表	2022-08-15 20:37:36 +08:00
wangchuxiao	7f252909fc	fix code	2022-08-15 20:36:16 +08:00
欧阳氏	7b9d0b4f1f	封禁用户列表	2022-08-15 20:33:09 +08:00
wangchuxiao	1747ae8984	fix code	2022-08-15 20:21:06 +08:00
wangchuxiao	dfee8891d3	fix code	2022-08-15 20:16:15 +08:00
wangchuxiao	cb10df7c9f	fix code	2022-08-15 20:11:08 +08:00
wangchuxiao	919e2543ca	fix code	2022-08-15 19:50:13 +08:00
wangchuxiao	b705ac24fa	fix code	2022-08-15 19:27:23 +08:00
wangchuxiao	4ec255917d	Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del	2022-08-15 18:59:52 +08:00