140 Commits

Author	SHA1	Message	Date
wangchuxiao	f779ed7628	workMoments	2022-04-22 17:19:35 +08:00
wangchuxiao	f2fdb74f23	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-04-22 16:41:50 +08:00
wangchuxiao	4ba87e3349	workMoments	2022-04-22 16:41:41 +08:00
Gordon	7abee90992	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-04-22 15:12:21 +08:00
Gordon	159a9e00c8	conversation update	2022-04-22 15:12:10 +08:00
wangchuxiao	1443f5f997	workMoments	2022-04-21 18:38:48 +08:00
wangchuxiao	ff85575e98	workMoments	2022-04-21 16:14:26 +08:00
wangchuxiao	62e605a443	workMoments	2022-04-21 10:43:31 +08:00
wangchuxiao	9df4a79827	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-04-20 16:25:48 +08:00
wangchuxiao	071dd46a4c	workMoments	2022-04-20 16:25:33 +08:00
skiffer-git	51c3a753a9	Organization	2022-04-19 20:57:59 +08:00
skiffer-git	c28c592c80	OrganizationChangedNotification	2022-04-19 18:52:28 +08:00
skiffer-git	ab4a5e6719	OrganizationChangedNotification	2022-04-19 18:46:02 +08:00
skiffer-git	f53f34559a	organization	2022-04-19 16:40:57 +08:00
wangchuxiao	3625befc0b	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun ... # Conflicts: # pkg/common/constant/constant.go	2022-04-18 19:26:26 +08:00
wangchuxiao	6e6508aafd	workMoments	2022-04-18 19:24:36 +08:00
skiffer-git	248de7f1f2	set groupmember nickname	2022-04-18 11:52:17 +08:00
skiffer-git	cc405b83e2	organization	2022-04-16 20:10:10 +08:00
Gordon	69aba02c9a	send tag modify	2022-04-06 16:47:22 +08:00
Gordon	f64c40e91f	tag msg	2022-04-06 14:31:25 +08:00
wenxu12345	b0c518a0d6	log	2022-04-05 20:06:15 +08:00
wangchuxiao	a16a75230c	tag and set private tips	2022-04-01 14:43:31 +08:00
wangchuxiao	929c5e7a5b	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-03-31 14:50:17 +08:00
wangchuxiao	d600042110	tag and set private tips	2022-03-31 14:50:02 +08:00
wenxu12345	ecd2f0e2bf	Merge log files	2022-03-31 11:15:06 +08:00
Gordon	170392f0bc	oa notification add	2022-03-30 18:23:05 +08:00
Gordon	6744745152	token add operationID	2022-03-30 15:52:04 +08:00
skiffer-git	8d26aa86b9	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-03-29 16:05:08 +08:00
skiffer-git	fe4b534b78	mute group	2022-03-29 16:04:15 +08:00
wangchuxiao	7ed6ee5075	tag	2022-03-29 15:35:03 +08:00
Gordon	942c9c6a63	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-03-28 18:30:21 +08:00
Gordon	6c45665fde	add tag message conversation update	2022-03-28 18:30:12 +08:00
wangchuxiao	169665da32	tag	2022-03-28 18:13:01 +08:00
wangchuxiao	8197ae6aa7	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-03-28 12:17:32 +08:00
wangchuxiao	6d20eddd43	mongo	2022-03-25 18:46:27 +08:00
skiffer-git	9d29d49ada	group dismissed	2022-03-24 15:33:30 +08:00
Gordon	25adfe5b28	check shell update	2022-03-18 20:06:52 +08:00
Gordon	6b3d984ca6	log update	2022-03-18 19:02:46 +08:00
wangchuxiao	366f7621fa	rtc add	2022-03-17 19:00:05 +08:00
wangchuxiao	f70a20f740	rtc add	2022-03-17 14:12:49 +08:00
wangchuxiao	f02fb7ba15	rtc add	2022-03-17 12:48:54 +08:00
wangchuxiao	b0aa168c9a	rtc add	2022-03-16 18:02:26 +08:00
Gordon	852d3b9f48	add friend and blacklist judge	2022-03-16 11:25:44 +08:00
Gordon	10884b8175	add friend and blacklist judge	2022-03-16 11:18:59 +08:00
Gordon	ab9f3a1635	add friend and blacklist judge	2022-03-15 19:03:22 +08:00
Gordon	011960b159	send msg add protect	2022-03-15 14:16:14 +08:00
wangchuxiao	51c2f845d8	opt	2022-03-11 17:37:01 +08:00
wangchuxiao	fafad9217d	cb	2022-03-04 18:23:58 +08:00
wangchuxiao	1572d9df89	cb	2022-03-04 18:17:44 +08:00
wangchuxiao	4c297164a5	cb	2022-03-04 18:03:22 +08:00