1712 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gordon	318eb2f47d	shell update	2022-04-24 17:54:02 +08:00
Gordon	545f9cad2d	add modify conversation api	2022-04-24 17:30:53 +08:00
Gordon	3247d84b6b	add modify conversation api	2022-04-24 17:27:26 +08:00
Gordon	e73f0a916a	add modify conversation api	2022-04-24 16:55:47 +08:00
Gordon	150af5ff8b	@ people update	2022-04-24 15:55:19 +08:00
wangchuxiao	86e17d38d4	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-04-24 11:54:08 +08:00
Gordon	1809c59f25	config	2022-04-24 11:53:50 +08:00
wangchuxiao	4eb9661730	fix docker-compose	2022-04-24 11:50:36 +08:00
Gordon	4acbe4b31a	config	2022-04-24 11:49:01 +08:00
Gordon	df17dd749f	add rpc conversation	2022-04-24 11:23:54 +08:00
wangchuxiao	0a939a5b91	Merge branch 'tuoyun' ... # Conflicts: # config/config.yaml	2022-04-24 10:38:22 +08:00
Gordon	91303acdbe	conversation update	2022-04-22 19:45:29 +08:00
Gordon	1273af4b1b	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-04-22 19:45:10 +08:00
Gordon	e682b408f3	conversation update	2022-04-22 19:44:58 +08:00
wangchuxiao	53ec93c8f8	minio config	2022-04-22 18:36:02 +08:00
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	9c62f38345	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-04-21 18:39:01 +08:00
wangchuxiao	1443f5f997	workMoments	2022-04-21 18:38:48 +08:00
Gordon	17d8a124cd	kick group invite group update	2022-04-21 18:09:20 +08:00
Gordon	5cd565306e	kick group invite group update	2022-04-21 17:23:40 +08:00
Gordon	67010e20d7	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-04-21 16:47:10 +08:00
Gordon	704604f6fe	kick group invite group update	2022-04-21 16:46:48 +08:00
wangchuxiao	e687f56c7f	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-04-21 16:14:41 +08:00
wangchuxiao	ff85575e98	workMoments	2022-04-21 16:14:26 +08:00
Gordon	26be25c218	quit group and dismiss group update	2022-04-21 14:58:57 +08:00
Gordon	d3d5e0cbfb	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-04-21 12:53:39 +08:00
Gordon	4796bf632c	quit group and dismiss group update	2022-04-21 12:53:28 +08:00
wangchuxiao	5eef365baf	workMoments	2022-04-21 11:52:31 +08:00
wangchuxiao	937ff63af9	workMoments	2022-04-21 11:34:15 +08:00
wangchuxiao	33211bfb27	workMoments	2022-04-21 11:18:11 +08:00
wangchuxiao	a243da8b1e	Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun	2022-04-21 10:43:46 +08:00
wangchuxiao	62e605a443	workMoments	2022-04-21 10:43:31 +08:00
Gordon	bcad3c1ced	add save message to mysql switch	2022-04-20 18:53:23 +08:00
Gordon	b865f5d6e7	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-04-20 18:47:31 +08:00
Gordon	00664822ec	conversation add fields	2022-04-20 18:47:21 +08:00
skiffer-git	4594c15de7	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-04-20 18:39:23 +08:00
skiffer-git	2b6ec1672c	Organization	2022-04-20 18:39:12 +08:00
Gordon	d44d5711cb	Merge remote-tracking branch 'origin/tuoyun' into tuoyun	2022-04-20 18:06:53 +08:00
Gordon	54cb13ba62	pb file	2022-04-20 18:06:43 +08:00
Gordon	c32f5dd951	pb file	2022-04-20 18:06:24 +08:00
wangchuxiao	2e6c42c8ac	workMoments	2022-04-20 16:33:19 +08:00
wangchuxiao	5757b86d39	workMoments	2022-04-20 16:32:22 +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	030d619910	Organization	2022-04-20 11:53:32 +08:00
skiffer-git	c56fd399c1	Organization	2022-04-20 09:07:35 +08:00