wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f42748e1b
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun' into superGroup
						
						
						
						
						
						
						
						# Conflicts:
#	internal/msg_gateway/gate/callback.go
#	internal/msg_transfer/logic/online_history_msg_handler.go
#	internal/push/logic/callback.go
#	internal/push/logic/push_to_client.go
#	pkg/common/db/model.go
#	pkg/common/db/newRedisModel.go
#	pkg/proto/group/group.pb.go
#	pkg/proto/group/group.proto 
						
						
					 | 
					
						2022-06-07 17:42:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							9106e70b37
							
						
					 | 
					
						
						
							
							group administrator access
						
						
						
						
						
						
					 | 
					
						2022-06-07 10:13:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3abc44976
							
						
					 | 
					
						
						
							
							singal offline push
						
						
						
						
						
						
					 | 
					
						2022-06-06 18:15:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							16d33b1c1f
							
						
					 | 
					
						
						
							
							singal offline push
						
						
						
						
						
						
					 | 
					
						2022-06-02 18:17:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ff7ebb04a
							
						
					 | 
					
						
						
							
							tools
						
						
						
						
						
						
					 | 
					
						2022-06-01 15:09:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b4df5be16
							
						
					 | 
					
						
						
							
							Clear personal chat history
						
						
						
						
						
						
					 | 
					
						2022-05-31 19:16:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							10881c8f5b
							
						
					 | 
					
						
						
							
							superGroup
						
						
						
						
						
						
					 | 
					
						2022-05-30 17:12:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							653c0faa18
							
						
					 | 
					
						
						
							
							superGroup
						
						
						
						
						
						
					 | 
					
						2022-05-30 16:23:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe9f86b432
							
						
					 | 
					
						
						
							
							superGroup
						
						
						
						
						
						
					 | 
					
						2022-05-30 11:55:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d104c6dbf4
							
						
					 | 
					
						
						
							
							callback
						
						
						
						
						
						
					 | 
					
						2022-05-27 14:20:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							23b03919e6
							
						
					 | 
					
						
						
							
							office tag async send
						
						
						
						
						
						
					 | 
					
						2022-05-19 10:44:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a78e5d869
							
						
					 | 
					
						
						
							
							update app
						
						
						
						
						
						
					 | 
					
						2022-05-10 16:53:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a3ac012bb
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-05-10 10:45:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							00265a7e8e
							
						
					 | 
					
						
						
							
							cache
						
						
						
						
						
						
					 | 
					
						2022-05-10 10:44:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							0dafb50223
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-05-10 10:13:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac9620c253
							
						
					 | 
					
						
						
							
							add ParseToken
						
						
						
						
						
						
					 | 
					
						2022-05-10 10:12:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e226b165c
							
						
					 | 
					
						
						
							
							sdk version
						
						
						
						
						
						
					 | 
					
						2022-05-10 10:01:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							7de29c29e9
							
						
					 | 
					
						
						
							
							add ParseToken
						
						
						
						
						
						
					 | 
					
						2022-05-10 09:45:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							9303096430
							
						
					 | 
					
						
						
							
							log change
						
						
						
						
						
						
					 | 
					
						2022-05-10 09:09:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							a251d521a1
							
						
					 | 
					
						
						
							
							set api ip in config
						
						
						
						
						
						
					 | 
					
						2022-05-07 19:52:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5065cb52f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-05-07 17:05:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							dca16e83d3
							
						
					 | 
					
						
						
							
							rpc register ip
						
						
						
						
						
						
					 | 
					
						2022-05-07 17:05:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								FG
							
						 
					 | 
					
						
						
						
						
							
						
						
							32b9820725
							
						
					 | 
					
						
						
							
							remove timer and database init
						
						
						
						
						
						
					 | 
					
						2022-05-07 10:37:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9ce8a3b2e
							
						
					 | 
					
						
						
							
							upgrade etcd & grpc
						
						
						
						
						
						
					 | 
					
						2022-05-07 09:34:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d75eb456dc
							
						
					 | 
					
						
						
							
							office
						
						
						
						
						
						
					 | 
					
						2022-05-05 11:58:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a631753a0
							
						
					 | 
					
						
						
							
							add msgToMQSingle && msgToMQGroup
						
						
						
						
						
						
					 | 
					
						2022-05-01 12:04:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							91e03f7cfd
							
						
					 | 
					
						
						
							
							cache
						
						
						
						
						
						
					 | 
					
						2022-04-29 18:53:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							485241d080
							
						
					 | 
					
						
						
							
							cache & workMoments
						
						
						
						
						
						
					 | 
					
						2022-04-29 17:59:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							58a6f9cae3
							
						
					 | 
					
						
						
							
							test
						
						
						
						
						
						
					 | 
					
						2022-04-28 21:17:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							65f02e5139
							
						
					 | 
					
						
						
							
							cache
						
						
						
						
						
						
					 | 
					
						2022-04-28 15:13:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f07f8e9e1
							
						
					 | 
					
						
						
							
							cache rpc
						
						
						
						
						
						
					 | 
					
						2022-04-26 11:19:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e44f7f110
							
						
					 | 
					
						
						
							
							cache rpc
						
						
						
						
						
						
					 | 
					
						2022-04-26 10:33:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							b211a66e99
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-04-26 09:09:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							0bdb066820
							
						
					 | 
					
						
						
							
							add cache
						
						
						
						
						
						
					 | 
					
						2022-04-26 09:09:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab706f4076
							
						
					 | 
					
						
						
							
							fix bug
						
						
						
						
						
						
					 | 
					
						2022-04-25 21:13:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a03f89fb68
							
						
					 | 
					
						
						
							
							cache rpc
						
						
						
						
						
						
					 | 
					
						2022-04-25 20:05:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							51ee2df755
							
						
					 | 
					
						
						
							
							flag parse update
						
						
						
						
						
						
					 | 
					
						2022-04-25 17:13:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							a426c8bb26
							
						
					 | 
					
						
						
							
							Adjust port
						
						
						
						
						
						
					 | 
					
						2022-04-25 15:45:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							db9762c5b2
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-04-24 17:44:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1ebcde725
							
						
					 | 
					
						
						
							
							work_moments
						
						
						
						
						
						
					 | 
					
						2022-04-24 17:42:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							e73f0a916a
							
						
					 | 
					
						
						
							
							add modify conversation api
						
						
						
						
						
						
					 | 
					
						2022-04-24 16:55:47 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							df17dd749f
							
						
					 | 
					
						
						
							
							add rpc conversation
						
						
						
						
						
						
					 | 
					
						2022-04-24 11:23:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a0c206998
							
						
					 | 
					
						
						
							
							add cache
						
						
						
						
						
						
					 | 
					
						2022-04-22 18:56:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							2bdaaa5a33
							
						
					 | 
					
						
						
							
							log
						
						
						
						
						
						
					 | 
					
						2022-04-20 20:58:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e6c42c8ac
							
						
					 | 
					
						
						
							
							workMoments
						
						
						
						
						
						
					 | 
					
						2022-04-20 16:33:19 +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 | 
					
					
						
						
							
							
							
						
					 |