Commit Graph

1260 Commits

Author SHA1 Message Date
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 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 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
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 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 33222d59c2 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-12 17:23:16 +08:00
Gordon adb7da7aaf group add field 2022-07-12 17:22:45 +08:00
skiffer-git 58847c7fb6 Update group member nickname when personal nickname is updated 2022-07-12 16:22:13 +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 7ffe857f52 fix bug 2022-07-01 20:13:36 +08:00
Gordon f2b0f54c0b test 2022-07-01 19:48:03 +08:00
Gordon a1025d8eee test 2022-07-01 19:41:15 +08:00
Gordon b8cd9484dc test 2022-07-01 19:29:17 +08:00
Gordon 1650165f4b group add verify 2022-07-01 14:47:29 +08:00
wangchuxiao f51fbecfee callback 2022-06-30 18:50:10 +08:00
skiffer-git 26bd3bf76d fix bug 2022-06-28 20:43:52 +08:00
skiffer-git d17d7a792a fix bug 2022-06-28 20:39:27 +08:00
skiffer-git 722b5d0726 debug 2022-06-28 15:47:55 +08:00
wenxu12345 5b8ef3a17c verification gor joining group chat 2022-06-23 18:56:52 +08:00
wenxu12345 2f5d8dfb80 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-23 09:24:20 +08:00
wenxu12345 218340e138 Rpc Register IP 2022-06-23 09:24:05 +08:00
wangchuxiao 6b78b75638 fix bug 2022-06-22 19:48:35 +08:00
wenxu12345 49797ce6ab super group notification 2022-06-21 14:54:42 +08:00
wangchuxiao b80f510de5 quit superGroup add notification 2022-06-20 11:57:53 +08:00
wangchuxiao 007065b40e 入职流程 2022-06-17 12:36:05 +08:00
wangchuxiao c5eb8a3f9b 入职流程 2022-06-17 12:09:42 +08:00
skiffer-git f1b5f56294 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 10:43:44 +08:00
skiffer-git ed3b62480c log for etcd 2022-06-17 10:43:24 +08:00
Gordon 29dbb36961 user proto modify 2022-06-16 19:33:35 +08:00