206 Commits

Author	SHA1	Message	Date
Gordon	18e92ccbd3	push update	2022-09-20 10:39:43 +08:00
wangchuxiao	af2baba1e3	merge shichuang	2022-09-16 17:23:28 +08:00
wangchuxiao	78ce5c3f69	prometheus	2022-09-15 16:39:49 +08:00
wangchuxiao	1f81bd121f	Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release	2022-09-15 16:27:46 +08:00
wangchuxiao	02fa9142fe	prometheus	2022-09-15 16:27:36 +08:00
skiffer-git	d6abbacbf7	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release ... # Conflicts: # internal/rpc/msg/rpcChat.go # pkg/common/prometheus/gather.go	2022-09-15 12:27:55 +08:00
skiffer-git	979100850c	prometheus for statistics	2022-09-15 12:07:28 +08:00
wangchuxiao	144cf279f9	prome	2022-09-15 08:45:10 +08:00
wangchuxiao	aa6b439e8c	prome	2022-09-15 01:35:08 +08:00
wangchuxiao	a1f79f4508	prome	2022-09-15 01:22:20 +08:00
wangchuxiao	ef66b10501	prome	2022-09-12 19:32:24 +08:00
Gordon	b5deceaa3b	put client msg id to offline callback	2022-09-09 11:00:15 +08:00
Gordon	07e1de2f62	put client msg id to offline callback	2022-09-09 10:58:38 +08:00
wangchuxiao	3d184c95ba	Merge branch 'shichuang' of https://github.com/OpenIMSDK/Open-IM-Server into shichuang	2022-09-07 18:23:06 +08:00
wangchuxiao	6754fdb580	getui	2022-09-07 18:20:41 +08:00
Gordon	4a2a9eb997	fcm push modify	2022-09-07 16:41:18 +08:00
wangchuxiao	82a8f18e88	merge cms into v2.3.0release	2022-09-05 18:28:11 +08:00
Gordon	f6137dfc34	fcm ios push badge	2022-09-02 22:03:35 +08:00
wangchuxiao	6dfbb90b80	fix signal	2022-09-02 17:22:27 +08:00
Gordon	3f87958328	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release	2022-09-02 12:04:11 +08:00
Gordon	a0e689c437	fcm ios push badge	2022-09-02 12:03:28 +08:00
skiffer-git	e990118475	fix bug :pushMsg.MsgData.OfflinePushInfo==nil	2022-09-01 21:58:22 +08:00
Gordon	67e5e3b56b	fcm ios push badge	2022-09-01 21:05:16 +08:00
wangchuxiao	d622f1df3d	fcm	2022-08-31 15:11:09 +08:00
wangchuxiao	caea072f7d	fcm	2022-08-31 14:53:16 +08:00
wangchuxiao	04b22c1a76	Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release	2022-08-31 11:56:50 +08:00
wangchuxiao	26d9d7630c	fcm	2022-08-31 11:55:55 +08:00
skiffer-git	e5a7810d6e	add group member cache in msg rpc	2022-08-30 22:04:13 +08:00
skiffer-git	99e913637a	add group member cache in push	2022-08-30 21:31:53 +08:00
skiffer-git	67319031ea	log	2022-08-30 21:22:14 +08:00
skiffer-git	6ff8fc7f87	merge code : Filter push data by time	2022-08-29 09:48:55 +08:00
skiffer-git	0f0e99b42e	merge code : Filter push data by time	2022-08-29 09:34:52 +08:00
Gordon	93f8ed223e	group file update	2022-08-26 17:41:58 +08:00
wangchuxiao	9590d2865a	conversation	2022-08-23 19:08:20 +08:00
wangchuxiao	d20c89ba21	merge shichuang 2 v2.3.0release	2022-08-21 17:57:44 +08:00
Gordon	9a82dd356c	callback add offline info	2022-08-19 13:04:38 +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
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	12a4c12753	notification	2022-08-16 19:15:54 +08:00
Gordon	b8aa54a159	mark message	2022-08-12 20:05:01 +08:00
Gordon	9c7ae3b0ef	mark message	2022-08-12 19:24:30 +08:00
wangchuxiao	6bfa8643d6	fix delete	2022-08-10 19:31:57 +08:00
wangchuxiao	cd65d42004	getui debug	2022-08-08 16:46:43 +08:00
wangchuxiao	b294a8138c	Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release	2022-08-04 14:22:27 +08:00