677 Commits

Author	SHA1	Message	Date
wangchuxiao	7e937d7d29	tag	2022-03-29 16:04:54 +08:00
skiffer-git	fe4b534b78	mute group	2022-03-29 16:04:15 +08:00
wangchuxiao	d0a65c7c68	tag	2022-03-29 15:58:42 +08:00
wangchuxiao	416f87f4bb	tag	2022-03-29 15:50:20 +08:00
wangchuxiao	7eeb67be28	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-03-29 15:35:18 +08:00
wangchuxiao	7ed6ee5075	tag	2022-03-29 15:35:03 +08:00
skiffer-git	1aeff25316	mute group	2022-03-29 11:48:17 +08:00
Gordon	fef33795d0	group add	2022-03-29 11:16:03 +08:00
Gordon	d2c04b761d	ali cloud oss	2022-03-29 11:01:54 +08:00
Gordon	c5828aba91	Merge branch 'tuoyun' ... # Conflicts: # cmd/open_im_api/main.go # config/config.yaml # go.sum # pkg/common/config/config.go # pkg/common/db/model.go	2022-03-29 10:58:01 +08:00
skiffer-git	1286f9dcb6	mute group	2022-03-29 09:34:45 +08:00
wangchuxiao	a11c4fcb58	tag	2022-03-28 19:05:58 +08:00
wangchuxiao	c67a937d40	tag	2022-03-28 18:53:57 +08:00
wangchuxiao	03fa7137b9	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-03-28 18:52:02 +08:00
wangchuxiao	e95400988e	tag	2022-03-28 18:51:48 +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	5e78697a69	tag	2022-03-28 17:22:18 +08:00
wangchuxiao	a0e6a78496	tag	2022-03-28 17:18:03 +08:00
wangchuxiao	af99a93536	tag	2022-03-28 17:12:36 +08:00
Gordon	679c913f3a	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-03-28 16:57:24 +08:00
Gordon	03fb7947c3	add oa notification	2022-03-28 16:57:08 +08:00
wangchuxiao	c39f5a27b2	tag	2022-03-28 16:49:19 +08:00
wangchuxiao	dbdb516f3c	tag	2022-03-28 16:42:18 +08:00
wangchuxiao	574c7600e0	tag	2022-03-28 16:02:31 +08:00
wangchuxiao	13c29d2c1e	tag	2022-03-28 15:04:42 +08:00
wangchuxiao	dc1a0f050e	tag	2022-03-28 14:54:46 +08:00
wangchuxiao	9d619d520d	tag	2022-03-28 12:17:07 +08:00
wangchuxiao	46605479e9	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into office_tag	2022-03-25 18:48:30 +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
wangchuxiao	e7b95892ff	minio upload api	2022-03-23 17:40:51 +08:00
wangchuxiao	df4a75f4b0	mongo	2022-03-23 17:15:46 +08:00
wangchuxiao	4bdb4cbbb5	mongo	2022-03-23 16:13:18 +08:00
wangchuxiao	4cdcdee8e4	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-03-23 15:44:59 +08:00
wangchuxiao	e6c36411cb	mongo	2022-03-23 15:44:34 +08:00
Gordon	b5de638c0b	ws remove log	2022-03-23 11:32:58 +08:00
Gordon	1d09ffa529	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-03-22 18:13:48 +08:00
Gordon	eef9d15aaa	ws remove log	2022-03-22 18:13:34 +08:00
wangchuxiao	8034ddc413	mongo	2022-03-22 14:30:07 +08:00
wangchuxiao	e75adb165a	mongo	2022-03-21 19:36:10 +08:00
wangchuxiao	09ce0d5285	mongo	2022-03-21 19:19:33 +08:00
wangchuxiao	cc1ad41e94	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-03-21 16:57:14 +08:00
wangchuxiao	8a38646bc5	mongo	2022-03-21 16:56:52 +08:00
Gordon	a2b65f52f6	fix group create bug	2022-03-21 15:45:26 +08:00
jaonzyx	c16d8da784	管理员创建群组bug fix (#168)	2022-03-21 15:43:43 +08:00
goubo	a55582a018	方便测试导入数据 (#148)	2022-03-21 15:25:41 +08:00
Gordon	ea6d472002	pr modify and update	2022-03-21 14:59:00 +08:00
Gordon	3dc4290f2a	pr modify and update	2022-03-21 14:57:35 +08:00