IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,551 Commits 35 Branches 142 Tags
fa02c20e1cfec0d9b8849f754c8584e643a3b4d3
Commit Graph

574 Commits

Author SHA1 Message Date
skiffer-git d2474c8a72 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-09 12:49:54 +08:00
skiffer-git 9eb0dd5e70 batch push 2022-06-09 12:49:16 +08:00
wangchuxiao 6525d63459 fix bug 2022-06-09 12:39:28 +08:00
wangchuxiao bd14739a9e fix bug 2022-06-08 18:40:07 +08:00
wangchuxiao a115151616 fix bug 2022-06-08 17:08:47 +08:00
wangchuxiao 26771ee7d0 organization 2022-06-08 17:07:16 +08:00
wangchuxiao a4f69351ce fix bug 2022-06-08 16:46:21 +08:00
wangchuxiao fa5f234a38 fix bug 2022-06-08 15:40:33 +08:00
wangchuxiao 5d2c981368 fix bug 2022-06-08 15:27:50 +08:00
wangchuxiao 4a55842724 fix bug 2022-06-08 15:26:31 +08:00
wangchuxiao e9655ed05e fix bug 2022-06-08 15:15:56 +08:00
wangchuxiao ed7d2bbdd7 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-08 15:07:19 +08:00
wangchuxiao 276328e0fd fix bug 2022-06-08 15:05:57 +08:00
Gordon 7d0c8b0c5f super group add notification 2022-06-07 19:02:19 +08:00
skiffer-git 0463f5e83d fix bug 2022-06-07 18:25:08 +08:00
skiffer-git eb90314b38 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 18:10:02 +08:00
skiffer-git 6ce1d60ebb log 2022-06-07 18:09:11 +08:00
wangchuxiao 5fa62c9fbd Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-07 17:46:53 +08:00
Gordon ef93a1f42e add conversation sync 2022-06-07 17:45:07 +08:00
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
wangchuxiao 269df23851 set group memberInfo 2022-06-07 17:06:47 +08:00
wangchuxiao c40dc64bd0 set group memberInfo 2022-06-07 16:59:05 +08:00
wangchuxiao 8f1e439381 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-07 16:18:32 +08:00
skiffer-git 4418d031e1 log 2022-06-07 16:18:23 +08:00
wangchuxiao f3fc452904 group set memberInfo 2022-06-07 16:18:18 +08:00
skiffer-git dae1569f0e debug userid == "" 2022-06-07 14:02:11 +08:00
skiffer-git dd76c268c5 debug userid == "" 2022-06-07 13:50:35 +08:00
skiffer-git 3adcb9f164 debug userid == "" 2022-06-07 13:44:52 +08:00
skiffer-git eac137a9a9 ForceLogout 2022-06-07 11:50:37 +08:00
skiffer-git 290ae774e0 ForceLogout 2022-06-07 11:42:15 +08:00
skiffer-git 3639f943bf group administrator access 2022-06-07 10:20:56 +08:00
skiffer-git d373369649 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 10:14:21 +08:00
skiffer-git 9106e70b37 group administrator access 2022-06-07 10:13:19 +08:00
Gordon 4678189ed4 pb file 2022-06-07 10:12:15 +08:00
skiffer-git 064b650fac group administrator access 2022-06-06 23:19:07 +08:00
skiffer-git 797e2fea1e group info set 2022-06-06 20:39:45 +08:00
wangchuxiao 16d33b1c1f singal offline push 2022-06-02 18:17:11 +08:00
Gordon a18dcfce9e ws and push update 2022-06-02 16:44:55 +08:00
wenxu12345 da1df91f49 Clear msg 2022-06-01 15:54:40 +08:00
wenxu12345 b2df6e6d41 Clear msg 2022-06-01 15:53:14 +08:00
wenxu12345 2b4df5be16 Clear personal chat history 2022-05-31 19:16:29 +08:00
wangchuxiao f98da25fda organization 2022-05-31 19:14:00 +08:00
wangchuxiao cf094a2048 superGroup 2022-05-30 17:30:55 +08:00
wangchuxiao 653c0faa18 superGroup 2022-05-30 16:23:15 +08:00
wangchuxiao 110f5e02f4 superGroup 2022-05-30 15:27:23 +08:00
wangchuxiao ecf0a4f299 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-05-30 15:10:32 +08:00
wangchuxiao d3fe5cdf34 superGroup 2022-05-30 15:10:26 +08:00
Gordon bda1b0a304 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-05-30 11:56:45 +08:00
Gordon 839f3e52ef pull message update 2022-05-30 11:56:32 +08:00
wangchuxiao a85f6b8287 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-05-30 11:55:45 +08:00