2933 Commits

Author SHA1 Message Date
Gordon
e02150cdb0 test 2022-07-01 16:38:11 +08:00
Gordon
5b4f94832d Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 16:23:47 +08:00
Gordon
566d5e832c test 2022-07-01 16:23:28 +08:00
wangchuxiao
36667b8649 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-07-01 15:38:18 +08:00
wangchuxiao
088f9dae9b demo 2022-07-01 15:36:44 +08:00
Gordon
813b6a6a68 test 2022-07-01 15:33:35 +08:00
Gordon
c8d9fc7311 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 15:30:41 +08:00
Gordon
e555a047e6 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 15:29:52 +08:00
skiffer-git
ed52ecb259 fix bug 2022-07-01 15:29:45 +08:00
Gordon
f993ddf876 test 2022-07-01 15:29:22 +08:00
skiffer-git
54566997b2 fix bug 2022-07-01 15:25:06 +08:00
skiffer-git
4783e3d061 log 2022-07-01 15:11:33 +08:00
skiffer-git
658d97ff4e log 2022-07-01 15:07:22 +08:00
skiffer-git
3373925acf Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 15:00:13 +08:00
skiffer-git
9d84bf8f4c log 2022-07-01 14:59:53 +08:00
Gordon
1650165f4b group add verify 2022-07-01 14:47:29 +08:00
wangchuxiao
8849cd46c9 callback 2022-07-01 12:14:15 +08:00
wangchuxiao
0835ecf0ed Merge branch 'tuoyun' into superGroup
# Conflicts:
#	deploy_k8s/k8s_openim_deploy.md
2022-07-01 10:16:48 +08:00
wangchuxiao
8bedfca646 deploy_k8s 2022-07-01 00:14:59 +08:00
Gordon
1fa38a24b6 compose file update 2022-06-30 19:27:23 +08:00
Gordon
1d105dd345 compose file update 2022-06-30 19:19:00 +08:00
wangchuxiao
7823306045 demo 2022-06-30 19:11:44 +08:00
wangchuxiao
53b0d13342 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-30 18:50:28 +08:00
wangchuxiao
f51fbecfee callback 2022-06-30 18:50:10 +08:00
Gordon
1f968a606b compose file update 2022-06-30 18:46:34 +08:00
Gordon
a13397bc17 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-30 18:42:50 +08:00
Gordon
323e8e72cc compose file update 2022-06-30 18:42:30 +08:00
wangchuxiao
80a67d0970 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-30 17:12:46 +08:00
wangchuxiao
4e22970784 minio 2022-06-30 17:12:25 +08:00
Gordon
ddc07ee160 compose file update 2022-06-30 17:07:18 +08:00
Gordon
e96b9b8bf8 compose file update 2022-06-30 16:51:58 +08:00
Gordon
013828eb03 sms test 2022-06-30 16:42:27 +08:00
Gordon
10132879f2 sms test 2022-06-30 16:29:52 +08:00
Gordon
832871d49d sms test 2022-06-30 16:27:39 +08:00
wangchuxiao
e5ccc1dd36 minio 2022-06-30 10:28:11 +08:00
wangchuxiao
61951863ad minio 2022-06-30 10:24:47 +08:00
wangchuxiao
64c6a68d34 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-30 10:14:26 +08:00
wangchuxiao
0054c4cc58 minio 2022-06-30 10:14:12 +08:00
Gordon
5bf494ca7d code update 2022-06-29 19:06:08 +08:00
Gordon
da81f70161 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-29 19:01:16 +08:00
Gordon
f3e21ac814 code update 2022-06-29 19:00:48 +08:00
wangchuxiao
2314c99c36 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-29 18:49:41 +08:00
wangchuxiao
2907cac50f swagger 2022-06-29 18:48:17 +08:00
Gordon
536c62c137 config update 2022-06-29 18:46:27 +08:00
Gordon
c1b855ebf7 config update 2022-06-29 18:45:16 +08:00
Gordon
84d76f0749 config update 2022-06-29 18:37:39 +08:00
Gordon
3ae0a05422 config update 2022-06-29 18:36:35 +08:00
Gordon
f700c15bc7 config update 2022-06-29 18:35:26 +08:00
Gordon
46e24556ef config update 2022-06-29 18:34:07 +08:00
Gordon
e20f953c7f config update 2022-06-29 18:30:33 +08:00