Commit Graph

3938 Commits

Author SHA1 Message Date
wangchuxiao 051f73013c etcd conf 2022-11-14 19:36:49 +08:00
wangchuxiao 6484b796cd etcd conf 2022-11-14 19:24:20 +08:00
wangchuxiao 7a5a308c9b etcd conf 2022-11-14 19:21:56 +08:00
wangchuxiao 4709e536ee etcd conf 2022-11-14 19:19:56 +08:00
wangchuxiao 4eb5df3f28 etcd conf 2022-11-14 19:14:51 +08:00
wangchuxiao d3751da0e4 etcd conf 2022-11-14 19:07:44 +08:00
wangchuxiao de90205b66 etcd conf 2022-11-14 19:07:34 +08:00
wangchuxiao 5d54225f9d etcd conf 2022-11-14 19:04:34 +08:00
wangchuxiao a556cfcd40 etcd conf 2022-11-14 18:37:42 +08:00
wangchuxiao 405a60c4f8 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	config/usualConfig.yaml
2022-11-14 18:35:53 +08:00
wangchuxiao de528270a2 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	config/usualConfig.yaml
2022-11-14 18:18:48 +08:00
wangchuxiao ea0365b9da Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	config/usualConfig.yaml
2022-11-14 18:17:41 +08:00
wangchuxiao f8ca38b7e3 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	config/usualConfig.yaml
2022-11-14 18:07:14 +08:00
wangchuxiao bfeb434920 conf script 2022-11-14 18:03:44 +08:00
skiffer-git 7101ba472d config 2022-11-14 16:02:00 +08:00
wangchuxiao a314f2d1cb conf script 2022-11-14 15:42:50 +08:00
wangchuxiao 99e1c53a41 conf script 2022-11-14 15:41:24 +08:00
wangchuxiao b21cc930af Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-14 15:37:51 +08:00
wangchuxiao ccad06b7b6 conf script 2022-11-14 15:37:32 +08:00
wangchuxiao 7364dc1989 fix config 2022-11-12 17:12:06 +08:00
wangchuxiao 5b816b095d fix conf 2022-11-11 19:01:23 +08:00
wangchuxiao 08a4b92f3a mute member cant send msg 2022-11-11 18:06:15 +08:00
wangchuxiao 3c8a0bb011 k8s version update 2022-11-11 15:24:37 +08:00
wangchuxiao d6e14eafef k8s version update 2022-11-11 15:18:04 +08:00
wangchuxiao 15df8e0a08 k8s version update 2022-11-11 12:17:04 +08:00
wangchuxiao 42d9e7175f k8s version update 2022-11-11 11:22:45 +08:00
wangchuxiao 2aa7d6095d Merge branch 'main' into v2.3.0release 2022-11-11 11:21:22 +08:00
wangchuxiao 31aa75d745 k8s version update 2022-11-11 11:16:17 +08:00
wangchuxiao dfd2847c12 Merge branch 'v2.3.0release' 2022-11-11 11:04:30 +08:00
wangchuxiao db5f9572b1 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server
# Conflicts:
#	.env
#	config/config.yaml
#	script/.env
2022-11-11 11:03:02 +08:00
wangchuxiao cb9db10052 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server
# Conflicts:
#	.env
#	config/config.yaml
#	script/.env
2022-11-11 10:56:47 +08:00
skiffer-git 66960b147a nginx config 2022-11-10 22:09:05 +08:00
wangchuxiao 8ec4f2e814 add usualConfig` 2022-11-10 19:09:15 +08:00
wangchuxiao 081e34f953 add usualConfig` 2022-11-10 18:45:46 +08:00
wangchuxiao 2800eef199 add usualConfig` 2022-11-10 18:41:16 +08:00
wangchuxiao 08f3a79e6e add usualConfig 2022-11-10 18:23:11 +08:00
wangchuxiao 1c528b0f04 fix friend bug 2022-11-10 18:05:14 +08:00
wangchuxiao c5d144bcc4 fix friend bug 2022-11-10 17:37:46 +08:00
wangchuxiao 9a9d6ac524 config 2022-11-10 15:32:01 +08:00
skiffer-git 6ced618c1c nginx config 2022-11-10 14:56:29 +08:00
wangchuxiao bb1babad11 config 2022-11-10 14:51:35 +08:00
wangchuxiao 1a93592253 Merge branch 'main' into v2.3.0release
# Conflicts:
#	.env
#	install_im_server.sh
2022-11-10 14:30:00 +08:00
skiffer-git e52be45659 slack 2022-11-10 14:26:39 +08:00
skiffer-git e7e08a94a9 slack 2022-11-10 14:24:30 +08:00
skiffer-git d22c3867c1 slack 2022-11-10 09:23:28 +08:00
skiffer-git e52f65f690 slack 2022-11-10 09:23:19 +08:00
skiffer-git dfcfa643f0 nginx config 2022-11-09 21:05:14 +08:00
wangchuxiao a986068cbb Merge branch 'main' into v2.3.0release
# Conflicts:
#	.env
#	install_im_server.sh
2022-11-09 19:40:16 +08:00
skiffer-git af6915b1b0 install_im_server 2022-11-09 18:24:45 +08:00
wangchuxiao af46999a16 Merge branch 'main' into v2.3.0release
# Conflicts:
#	.env
#	install_im_server.sh
2022-11-09 18:18:35 +08:00