Commit Graph

1059 Commits

Author SHA1 Message Date
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 ccad06b7b6 conf script 2022-11-14 15:37:32 +08:00
wangchuxiao 08a4b92f3a mute member cant send msg 2022-11-11 18:06:15 +08:00
wangchuxiao d6e14eafef k8s version update 2022-11-11 15:18:04 +08:00
wangchuxiao 08f3a79e6e add usualConfig 2022-11-10 18:23:11 +08:00
wangchuxiao 9a9d6ac524 config 2022-11-10 15:32:01 +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 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 1b3fbf56d0 test cron 2022-11-04 16:18:45 +08:00
skiffer-git d33e15a2bb log 2022-11-04 15:00:42 +08:00
skiffer-git a9b60b8052 encryption 2022-11-04 15:00:42 +08:00
wangchuxiao 741cfec1ec test cron 2022-11-03 19:16:23 +08:00
wangchuxiao 9326b10d3a Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-03 18:31:51 +08:00
wangchuxiao 6d90cd59f2 test cron 2022-11-03 18:31:29 +08:00
Gordon 5c503e71ed message update 2022-11-02 15:32:36 +08:00
wangchuxiao cdf851d196 test cron 2022-11-02 12:00:23 +08:00
wangchuxiao bf09e49164 test cron 2022-11-02 11:55:48 +08:00
wangchuxiao d391a4d023 test cron 2022-11-02 11:40:55 +08:00
wangchuxiao 9182f15ee0 test cron 2022-11-02 11:17:20 +08:00
wangchuxiao be6811ddbd test cron 2022-11-01 19:51:10 +08:00
wangchuxiao 10d299d1b3 test cron 2022-11-01 19:49:19 +08:00
wangchuxiao 4989bb07f6 test cron 2022-11-01 19:39:56 +08:00
wangchuxiao 0d46349386 test cron 2022-11-01 19:18:17 +08:00
wangchuxiao 267e7c3b08 test cron 2022-11-01 19:14:33 +08:00
wangchuxiao cad689b337 test cron 2022-11-01 19:03:54 +08:00
wangchuxiao e54d5a13e8 test cron 2022-11-01 18:57:53 +08:00
wangchuxiao ac7619de55 test cron 2022-11-01 18:51:14 +08:00
wangchuxiao c75e258f81 test cron 2022-11-01 17:41:08 +08:00
wangchuxiao e4ed6dde0c test cron 2022-11-01 17:05:48 +08:00
wangchuxiao 9025d8bd90 test cron 2022-11-01 16:54:23 +08:00
wangchuxiao 2433e27eb5 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-10-28 15:43:18 +08:00
wangchuxiao 2610a27894 add birthStr field 2022-10-28 15:42:37 +08:00
Gordon eba25f1bb8 ws add logout remove push token 2022-10-27 17:15:06 +08:00
Gordon 59b625b7c0 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-10-27 11:46:13 +08:00
Gordon 0eeb2f6752 log 2022-10-27 11:45:42 +08:00
Gordon cd7b484fc2 message pull 2022-10-22 17:53:15 +08:00
wangchuxiao 16b3ea8b7e callback update 2022-10-21 15:44:55 +08:00
wangchuxiao 942afd7fec callback update 2022-10-20 12:01:06 +08:00
wangchuxiao de271d5b76 callback update 2022-10-20 12:00:32 +08:00
wangchuxiao 162478563c add friend callback 2022-10-19 21:06:48 +08:00
wangchuxiao 6b30097bde index fix 2022-09-30 18:58:19 +08:00
wangchuxiao 7dc1f9b81b index fix 2022-09-30 18:39:10 +08:00
wangchuxiao 9964650014 Merge branch 'main' into v2.3.0release 2022-09-30 17:59:46 +08:00
wangchuxiao b18813689d workmoment 2022-09-27 15:45:47 +08:00
wangchuxiao 79999edcea Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-27 15:35:50 +08:00
wangchuxiao 764b34d947 workmoment 2022-09-27 15:35:36 +08:00
liu ming e000dc18aa 添加袤博推送 (#284)
Co-authored-by: liuming <liuming@example.com>
2022-09-23 17:40:48 +08:00