204 Commits

Author SHA1 Message Date
wangchuxiao
5233e4c097 fix bug 2022-09-06 16:08:28 +08:00
wangchuxiao
bdae1f10d4 merge cms into v2.3.0release 2022-09-05 18:11:03 +08:00
wangchuxiao
6774a8594f cms 2022-09-02 02:01:42 +08:00
skiffer-git
e990118475 fix bug :pushMsg.MsgData.OfflinePushInfo==nil 2022-09-01 21:58:22 +08:00
wangchuxiao
77327f59b9 cms 2022-08-30 16:53:15 +08:00
wangchuxiao
54c56037e7 cms 2022-08-30 14:17:40 +08:00
wangchuxiao
87dfdb2ddc cms 2022-08-30 02:20:04 +08:00
wangchuxiao
2a8b19d319 cms 2022-08-30 01:57:06 +08:00
wangchuxiao
f43c042223 cms 2022-08-30 01:45:41 +08:00
wangchuxiao
b75b46f415 cms 2022-08-30 01:44:34 +08:00
wangchuxiao
8d4e5ad3f1 cms 2022-08-30 01:38:23 +08:00
Gordon
93f8ed223e group file update 2022-08-26 17:41:58 +08:00
Gordon
96e0851563 group file update 2022-08-26 11:39:01 +08:00
Gordon
621051cfb9 pb update 2022-08-21 23:37:43 +08:00
wangchuxiao
d20c89ba21 merge shichuang 2 v2.3.0release 2022-08-21 17:57:44 +08:00
wangchuxiao
6f2451edd3 etcd 2022-08-17 12:12:54 +08:00
Gordon
487d9a6449 notification 2022-08-16 19:54:04 +08:00
wangchuxiao
e8fdc454db update orgnization after update user 2022-08-16 15:08:12 +08:00
wangchuxiao
69da4410dc update orgnization after update user 2022-08-16 15:07:19 +08:00
wangchuxiao
a48b2e9edb cms 2022-08-12 18:37:51 +08:00
wangchuxiao
69008e08be cms api rpc 2022-08-12 11:24:21 +08:00
wangchuxiao
c2bd1d0d83 callback kickoff 2022-08-11 19:47:59 +08:00
wangchuxiao
2c0a2d7877 getui debug 2022-08-09 16:38:33 +08:00
wangchuxiao
b4b215a3f8 group hash 2022-08-08 12:10:28 +08:00
wangchuxiao
11f29280b1 group hash 2022-08-08 11:30:10 +08:00
Gordon
ba5edabb2c del conversation bug fix 2022-08-05 15:16:43 +08:00
wangchuxiao
4e69ff196a cache get group 2022-08-04 19:08:08 +08:00
wangchuxiao
db547d60df callback fix 2022-08-04 18:24:17 +08:00
wangchuxiao
3d0827a6da callback fix 2022-08-04 17:20:33 +08:00
wangchuxiao
f202d5f54a fix bug 2022-08-01 17:44:40 +08:00
wangchuxiao
ef9c291d9a fix bug 2022-08-01 11:52:43 +08:00
wangchuxiao
6e826cf369 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-29 14:36:33 +08:00
wangchuxiao
8f12fa52b4 mongodb superGroup to cache 2022-07-29 14:36:07 +08:00
Gordon
787cef54f5 manger send msg modify 2022-07-28 18:14:58 +08:00
wangchuxiao
337d01008b script 2022-07-22 10:44:49 +08:00
skiffer-git
8bb82be2b9 fix bug : Two group owners 2022-07-21 18:12:38 +08:00
wangchuxiao
eb1aeefc8c Merge branch 'dtm' into v2.3.0release
# Conflicts:
#	internal/rpc/group/group.go
2022-07-21 10:41:48 +08:00
skiffer-git
f383d6c636 rename 2022-07-20 21:26:52 +08:00
wangchuxiao
6d91f766e7 docker-compose fix 2022-07-20 18:12:39 +08:00
wangchuxiao
5afa3380a6 docker-compose fix 2022-07-20 15:49:21 +08:00
wangchuxiao
8ee4ca0357 docker-compose fix 2022-07-20 12:05:57 +08:00
skiffer-git
5936492f76 Filter out disbanded groups 2022-07-20 10:18:43 +08:00
skiffer-git
ad1d759840 Application for joining the group: JoinSource && InviterUserID 2022-07-19 12:13:20 +08:00
skiffer-git
a55134ae63 fix bug: two group owners 2022-07-19 11:15:27 +08:00
wangchuxiao
67b20d073e docker-compose fix 2022-07-15 18:47:04 +08:00
wangchuxiao
8a8fce927e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model.go
2022-07-15 16:39:09 +08:00
skiffer-git
2b2ecad437 fix bug 2022-07-15 10:33:03 +08:00
wangchuxiao
89406f1c57 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model.go
2022-07-14 14:08:51 +08:00
wangchuxiao
ea93e97e79 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model.go
2022-07-14 14:07:50 +08:00
wangchuxiao
1e6a93b4b6 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	internal/rpc/group/group.go
#	internal/rpc/user/user.go
#	pkg/common/db/mysql_model/im_mysql_model/group_model.go
2022-07-14 14:06:30 +08:00