Commit Graph

1154 Commits

Author SHA1 Message Date
wangchuxiao 52c71e3843 dtm 2022-07-21 11:13:47 +08:00
wangchuxiao 960e3d34eb dtm 2022-07-21 11:03:02 +08:00
wangchuxiao cbb127ff38 Merge branch 'dtm' into v2.3.0release 2022-07-21 10:57:03 +08:00
wangchuxiao db1a043261 dtm 2022-07-21 10:56:50 +08:00
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 f383d6c636 rename 2022-07-20 21:26:52 +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
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
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 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
skiffer-git d4e575f777 Show group notification editor 2022-07-13 11:43:37 +08:00
skiffer-git 2d110deb09 Show group notification editor 2022-07-13 11:09:29 +08:00
skiffer-git fb4cef7ccb Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-12 19:24:31 +08:00
skiffer-git 3b6b88fd62 Source of joining the group 2022-07-12 19:24:06 +08:00
Gordon 95630c6d61 group add field 2022-07-12 18:09:51 +08:00
Gordon adb7da7aaf group add field 2022-07-12 17:22:45 +08:00
Gordon 504e4cc6a3 add super delete 2022-07-12 16:16:04 +08:00
skiffer-git ec5177342e Set friend remark to empty 2022-07-11 21:33:56 +08:00
wangchuxiao 9e0e2fe124 fix bug 2022-07-08 19:26:44 +08:00
Gordon 9cfbd8107e add redis username 2022-07-08 16:34:38 +08:00
Gordon b70a4070f2 add redis username 2022-07-08 16:34:23 +08:00
Gordon d3b302ce66 add redis username 2022-07-08 16:22:52 +08:00
Gordon 5a423f88dd add redis username 2022-07-08 16:18:31 +08:00
Gordon f89c1edadf add redis username 2022-07-08 15:17:46 +08:00
Gordon 1aa106ba4a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-06 15:29:06 +08:00
Gordon c638072902 super group add 2022-07-06 15:28:34 +08:00
wangchuxiao 4035f037d2 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-05 16:58:46 +08:00
Gordon 2b6f861f3b test group file 2022-07-05 16:35:12 +08:00
wangchuxiao 3ad3b30d97 demo 2022-07-05 14:30:53 +08:00
wangchuxiao d0e7147911 demo 2022-07-05 11:01:10 +08:00
skiffer-git d7ce455f2f Super code can be disabled 2022-07-02 09:50:25 +08:00