skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							009ae6a235
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 18:54:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf5f72c00b
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 18:36:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							29a268d476
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 17:33:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							18d7aab703
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-29 17:33:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8517e954d
							
						
					 | 
					
						
						
							
							group add
						
						
						
						
						
						
					 | 
					
						2022-03-29 17:20:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc260fffde
							
						
					 | 
					
						
						
							
							group add
						
						
						
						
						
						
					 | 
					
						2022-03-29 17:15:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							acca147ff2
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:56:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							d53da0e422
							
						
					 | 
					
						
						
							
							group add
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:56:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2b324abc2
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:10:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e937d7d29
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:04:54 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							0797181967
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:18:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							14c5e631ff
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:15:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cdb039c33
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:12:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a11c4fcb58
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:05:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							e95400988e
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:51:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d92ac8f588
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:13:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							169665da32
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:13:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4d80b4844
							
						
					 | 
					
						
						
							
							auto migrate test
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:52:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9ea117985
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:10:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9ddb0140f
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:02:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							228cbb4082
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:59:15 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1a97b7356
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:20:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							574c7600e0
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:02:31 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a38646bc5
							
						
					 | 
					
						
						
							
							mongo
						
						
						
						
						
						
					 | 
					
						2022-03-21 16:56:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								马守越
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1ab3e04cba
							
						
					 | 
					
						
						
							
							新增mongo.dbUrl配置 (#174)
						
						
						
						
						
						
						
						* 当dbUri值不为空则直接使用该值
* 新增支持ali oss
Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn> 
						
						
					 | 
					
						2022-03-21 11:13:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							366f7621fa
							
						
					 | 
					
						
						
							
							rtc add
						
						
						
						
						
						
					 | 
					
						2022-03-17 19:00:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb8f7e0ddb
							
						
					 | 
					
						
						
							
							mongo single node
						
						
						
						
						
						
					 | 
					
						2022-03-17 12:08:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							2fc2801ad4
							
						
					 | 
					
						
						
							
							mongo single node
						
						
						
						
						
						
					 | 
					
						2022-03-17 11:55:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0aa168c9a
							
						
					 | 
					
						
						
							
							rtc add
						
						
						
						
						
						
					 | 
					
						2022-03-16 18:02:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							51c2f845d8
							
						
					 | 
					
						
						
							
							opt
						
						
						
						
						
						
					 | 
					
						2022-03-11 17:37:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							e734b000de
							
						
					 | 
					
						
						
							
							log
						
						
						
						
						
						
					 | 
					
						2022-03-04 19:01:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							04f8a7247d
							
						
					 | 
					
						
						
							
							replace find with take
						
						
						
						
						
						
					 | 
					
						2022-02-28 17:28:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b6ef76d54
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-02-28 17:24:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed65ad842f
							
						
					 | 
					
						
						
							
							Replace find with take
						
						
						
						
						
						
					 | 
					
						2022-02-28 17:20:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							b30da3eea4
							
						
					 | 
					
						
						
							
							database judge modify
						
						
						
						
						
						
					 | 
					
						2022-02-28 17:03:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c26efb5a9
							
						
					 | 
					
						
						
							
							log remove
						
						
						
						
						
						
					 | 
					
						2022-02-25 15:02:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							e31da8bbd0
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-02-23 15:27:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e602975f3
							
						
					 | 
					
						
						
							
							test
						
						
						
						
						
						
					 | 
					
						2022-02-23 15:27:23 +08:00 | 
					
					
						
						
							
							
							
						
					 |