blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,259 Commits 40 Branches 130 Tags
Commit Graph

3259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangchuxiao
f9eee19cbe dtm 2022-07-21 10:48:15 +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
e64cf47d31 rename 2022-07-20 21:41:32 +08:00
skiffer-git
3f79409a11 rename 2022-07-20 21:40:11 +08:00
skiffer-git
dd0d518ecd rename 2022-07-20 21:36:10 +08:00
skiffer-git
6d236a2dd6 rename 2022-07-20 21:30:37 +08:00
skiffer-git
663db12594 rename 2022-07-20 21:29:33 +08:00
skiffer-git
f383d6c636 rename 2022-07-20 21:26:52 +08:00
skiffer-git
2b3bb92357 rename 2022-07-20 21:20:46 +08:00
skiffer-git
87a2944837 rename 2022-07-20 21:19:19 +08:00
skiffer-git
ea32c88d85 rename 2022-07-20 21:17:47 +08:00
skiffer-git
725f8ce761 rename 2022-07-20 21:17:11 +08:00
skiffer-git
3f42390f2f rename 2022-07-20 21:15:30 +08:00
skiffer-git
4d3343d0d0 rename 2022-07-20 21:11:30 +08:00
skiffer-git
4b22eb946c rename 2022-07-20 21:07:46 +08:00
skiffer-git
53eebb0638 rename 2022-07-20 21:05:12 +08:00
skiffer-git
4546e77d5b rename 2022-07-20 21:04:05 +08:00
skiffer-git
7d2eb31f05 rename 2022-07-20 21:02:25 +08:00
skiffer-git
7c15a53a62 rename 2022-07-20 20:59:52 +08:00
wangchuxiao
1531db0a35 departmentcache 2022-07-20 19:09:20 +08:00
wangchuxiao
6d91f766e7 docker-compose fix 2022-07-20 18:12:39 +08:00
wangchuxiao
bf5bce9e64 rocks cache 2022-07-20 16:07:30 +08:00
wangchuxiao
5afa3380a6 docker-compose fix 2022-07-20 15:49:21 +08:00
wangchuxiao
85f5c59781 docker-compose fix 2022-07-20 12:08:58 +08:00
wangchuxiao
8ee4ca0357 docker-compose fix 2022-07-20 12:05:57 +08:00
wangchuxiao
656241c23f docker-compose fix 2022-07-20 11:35:19 +08:00
skiffer-git
5936492f76 Filter out disbanded groups 2022-07-20 10:18:43 +08:00
wangchuxiao
abe06b8753 docker-compose fix 2022-07-19 17:05:25 +08:00
Gordon
ac536c48cd sub moudule update 2022-07-19 16:42:14 +08:00
wangchuxiao
1b4b2b9bb1 docker-compose fix 2022-07-19 16:15:23 +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
2187f44ed7 docker-compose fix 2022-07-15 16:53:19 +08:00
wangchuxiao
026f61126a Merge branch 'v2.3.0release' 2022-07-15 16:49:44 +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
99873e2136 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	docker-compose.yaml
 2022-07-15 15:23:06 +08:00
skiffer-git
e904651541 new image 2022-07-15 15:21:42 +08:00
skiffer-git
d65a0dbbc7 new image v2.3.0-rc0 2022-07-15 15:17:54 +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
skiffer-git
8ad22f8148 fix bug 2022-07-14 13:44:36 +08:00
wangchuxiao
e667ec944b Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-07-14 12:11:53 +08:00
wangchuxiao
b064244907 rocks cache 2022-07-14 12:08:28 +08:00
skiffer-git
a01156feb6 fix bug 2022-07-14 11:50:58 +08:00
skiffer-git
af1d8fa834 fix bug 2022-07-14 11:43:01 +08:00
skiffer-git
0234795200 fix bug 2022-07-13 18:25:00 +08:00
skiffer-git
58f4ebe411 Limit the number of members invited to join the group 2022-07-13 14:28:49 +08:00