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,063 Commits 40 Branches 130 Tags
Commit Graph

3063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
04eb85d279 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-12 16:22:40 +08:00
skiffer-git
58847c7fb6 Update group member nickname when personal nickname is updated 2022-07-12 16:22:13 +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
Gordon
4d982ab816 config update 2022-07-11 11:02:56 +08:00
Gordon
c390617151 config update 2022-07-11 11:01:41 +08:00
Gordon
fff7f30005 config update 2022-07-11 11:00:32 +08:00
Gordon
ca72d4840a config update 2022-07-11 10:50:08 +08:00
Gordon
7ccb1b6a6f shell udpate 2022-07-11 10:45:12 +08:00
wangchuxiao
c94fb80cb0 Merge branch 'superGroup' of https://github.com/OpenIMSDK/Open-IM-Server into superGroup 2022-07-10 13:07:05 +08:00
wangchuxiao
2db194b9d1 k8s 2022-07-10 13:03:46 +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
b47877235f add redis username 2022-07-08 16:17:32 +08:00
Gordon
f89c1edadf add redis username 2022-07-08 15:17:46 +08:00
Gordon
bc5774c934 password test 2022-07-07 16:30:12 +08:00
wangchuxiao
9e885c2379 Merge branch 'v2.3.0release' into superGroup 2022-07-07 10:28:02 +08:00
skiffer-git
1380d2c1e9 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 
# Conflicts:
#	pkg/common/constant/constant.go
 2022-07-07 07:54:21 +08:00
skiffer-git
4895323200 fix bug 2022-07-07 07:51:40 +08:00
Gordon
f737d2e8ce Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-06 16:14:44 +08:00
Gordon
3157f97ae6 push fix bug 2022-07-06 16:14:31 +08:00
wangchuxiao
278329b73c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-06 16:12:33 +08:00
wangchuxiao
033ec6bc76 fix bug 2022-07-06 16:12:17 +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
6eb9041df4 Merge branch 'v2.3.0release' into superGroup 2022-07-06 14:46:30 +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
Gordon
9a813030a3 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-05 16:33:26 +08:00
Gordon
04b7dd719c test group 2022-07-05 16:33:05 +08:00
wangchuxiao
3ad3b30d97 demo 2022-07-05 14:30:53 +08:00