5166 Commits

Author SHA1 Message Date
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
skiffer-git
322ec26829 install_im_server 2022-11-09 15:52:59 +08:00
skiffer-git
935f80cd8a install_im_server 2022-11-09 15:52:01 +08:00
skiffer-git
8379652ad5 config 2022-11-09 15:49:11 +08:00
skiffer-git
decef23751 config 2022-11-09 12:36:55 +08:00
skiffer-git
c639cf7162 2.3.4 2022-11-09 12:07:17 +08:00
skiffer-git
2785ab6913 Merge remote-tracking branch 'origin/main' 2022-11-09 12:06:35 +08:00
skiffer-git
d92aca5b16 Optimize the script 2022-11-09 12:06:07 +08:00
wangchuxiao
4cf00a4198 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server 2022-11-09 10:49:38 +08:00
wangchuxiao
f6b549678d fix k8s 2022-11-09 10:40:50 +08:00
wangchuxiao
978a7e209e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-08 17:10:45 +08:00
skiffer-git
b06b8e4d2b Optimize the configuration 2022-11-08 17:10:27 +08:00
wangchuxiao
3a3412486a fix callback bug 2022-11-08 17:10:27 +08:00
skiffer-git
624014572c Optimize the configuration 2022-11-08 17:06:18 +08:00
skiffer-git
24d917bb2d Optimize the configuration 2022-11-08 17:04:18 +08:00
skiffer-git
2a4fae4718 Optimize the configuration 2022-11-08 17:01:18 +08:00
skiffer-git
9f4a8952a4 remove log 2022-11-08 11:13:07 +08:00
skiffer-git
029c020fe0 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-11-08 11:12:00 +08:00
skiffer-git
1f0040ceb6 Specify the relative path for the configuration file 2022-11-08 11:08:27 +08:00
wangchuxiao
76a3334f9d test cron 2022-11-04 18:40:38 +08:00
wangchuxiao
22d0d80bfe test cron 2022-11-04 17:56:21 +08:00
wangchuxiao
de13f5edbd test cron 2022-11-04 16:29:38 +08:00
wangchuxiao
953e284566 test cron 2022-11-04 16:24:56 +08:00