2320 Commits

Author	SHA1	Message	Date
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
skiffer-git	dd001ab0e7	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release	2022-08-18 10:50:39 +08:00
skiffer-git	30b55ce25e	GetSelfUserInfo: Handle the case where the user does not exist	2022-08-18 10:50:09 +08:00
wangchuxiao	943a5b36e3	Merge branch 'del' into v2.3.0release	2022-08-17 21:38:00 +08:00
Gordon	eee98c5175	revoke super group message and push message modify	2022-08-17 20:18:56 +08:00
wangchuxiao	d0a200f652	etcd	2022-08-17 14:57:57 +08:00
wangchuxiao	6f2451edd3	etcd	2022-08-17 12:12:54 +08:00
Gordon	a38291fc17	notification	2022-08-17 10:18:01 +08:00
wangchuxiao	bda96a2175	fix	2022-08-16 23:45:32 +08:00
wangchuxiao	64e1361ef5	fix signal bug	2022-08-16 23:08:16 +08:00
skiffer-git	2f6eb5969e	getui	2022-08-16 21:21:29 +08:00
skiffer-git	125b6fa779	Merge remote-tracking branch 'origin/del' into del	2022-08-16 21:15:37 +08:00
skiffer-git	5e78871c00	getui	2022-08-16 21:15:20 +08:00
Gordon	487d9a6449	notification	2022-08-16 19:54:04 +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	e8fdc454db	update orgnization after update user	2022-08-16 15:08:12 +08:00
wangchuxiao	69da4410dc	update orgnization after update user	2022-08-16 15:07:19 +08:00
wangchuxiao	5fc6f78555	Merge branch 'v2.3.0release' into del	2022-08-16 14:17:19 +08:00
wangchuxiao	15e0a7aa38	update orgnization after update user	2022-08-16 14:15:51 +08:00
wangchuxiao	a37d82e2dd	update orgnization after update user	2022-08-16 13:12:21 +08:00
wangchuxiao	0a14c8b3e6	update orgnization after update user	2022-08-16 13:11:59 +08:00
wangchuxiao	e779280428	Merge branch 'v2.3.0release' into del	2022-08-16 13:06:08 +08:00
wangchuxiao	753cd95a18	update orgnization after update user	2022-08-16 13:05:47 +08:00
wangchuxiao	5bd34f19fe	Merge branch 'v2.3.0release' into del	2022-08-16 13:01:42 +08:00
wangchuxiao	0e5b17adcc	update orgnization after update user	2022-08-16 13:01:14 +08:00
wangchuxiao	b23f10ecde	Merge branch 'v2.3.0release' into del	2022-08-16 12:57:28 +08:00
wangchuxiao	08d6e142c3	update orgnization after update user	2022-08-16 12:57:20 +08:00
wangchuxiao	2016a1656b	Merge branch 'v2.3.0release' into del	2022-08-16 12:17:07 +08:00
wangchuxiao	5a44618289	Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release	2022-08-16 12:16:32 +08:00
wangchuxiao	338d7f0df6	update orgnization after update user	2022-08-16 12:16:16 +08:00
wangchuxiao	6d19af02c9	Merge branch 'v2.3.0release' into del	2022-08-16 12:01:04 +08:00
wangchuxiao	5a6f96f84b	update orgnization after update user	2022-08-16 11:49:20 +08:00
wangchuxiao	3f74022142	Merge branch 'main' into del	2022-08-15 21:51:12 +08:00
wangchuxiao	da8755fcb7	fix code	2022-08-15 21:37:38 +08:00
wangchuxiao	3be284c129	fix code	2022-08-15 21:30:47 +08:00
wangchuxiao	15e2d172a4	fix code	2022-08-15 21:27:05 +08:00
wangchuxiao	4e54cb56e5	fix code	2022-08-15 21:09:21 +08:00
wangchuxiao	1dbe80afc4	Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del	2022-08-15 20:38:41 +08:00
wangchuxiao	0683352c4b	fix code	2022-08-15 20:38:33 +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	37193c48d9	fix code	2022-08-15 20:31:03 +08:00