332 Commits

Author SHA1 Message Date
wangchuxiao
6c1525bd62 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-15 15:27:01 +08:00
wangchuxiao
15d48fb0ad Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:26:37 +08:00
withchao
8437c9a38b s3 config 2023-03-15 11:39:56 +08:00
withchao
6a95025e41 s3 2023-03-14 19:33:44 +08:00
wangchuxiao
247c45db9d zap 2023-03-14 14:26:44 +08:00
wangchuxiao
eb946ad181 log 2023-03-13 15:39:47 +08:00
wangchuxiao
0fa6ff2136 log 2023-03-13 13:11:47 +08:00
Gordon
78a30a7663 user bug fix 2023-03-13 12:15:25 +08:00
wangchuxiao
9709271ae3 log 2023-03-13 10:21:50 +08:00
wangchuxiao
15ff930661 modify dictory 2023-03-06 11:24:13 +08:00
wangchuxiao
4c426c7c7c config modify 2023-02-24 17:42:01 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00
wangchuxiao
94d50a6c71 push 2023-02-22 19:51:14 +08:00
wangchuxiao
5be441f4fd errcode 2023-02-20 10:13:29 +08:00
wangchuxiao
6619183a48 errcode 2023-02-15 15:52:32 +08:00
wangchuxiao
00e43cc955 errcode 2023-02-10 18:19:40 +08:00
wangchuxiao
a92dd54354 errcode 2023-02-10 18:13:58 +08:00
wangchuxiao
759432794f errcode 2023-02-09 20:36:34 +08:00
wangchuxiao
2193d380ca errcode 2023-02-08 17:56:04 +08:00
skiffer-git
0e5f3dacd6
Update config.yaml 2023-02-02 17:51:59 +08:00
skiffer-git
082a3b7e65
Update config.yaml 2023-02-02 17:34:11 +08:00
skiffer-git
348cb921eb
Update config.yaml 2023-02-02 17:25:09 +08:00
wangchuxiao
51529eece3 del files 2023-01-13 18:00:18 +08:00
Gordon
1026a6b2b6 Merge remote-tracking branch 'origin/modify' into v2.3.0release
# Conflicts:
#	config/config.yaml
#	pkg/common/constant/constant.go
#	pkg/proto/sdk_ws/ws.pb.go
#	pkg/proto/sdk_ws/ws.proto
2022-12-23 16:16:28 +08:00
wangchuxiao
920a7cfdac set groupMemberInfo callback 2022-12-16 16:54:18 +08:00
wangchuxiao
0f1208dba9 mongo operation 2022-12-12 19:22:50 +08:00
wangchuxiao
4d56dfdfa2 modify 2022-12-09 12:13:14 +08:00
wangchuxiao
be01c4da0c dek jinzhu 2022-12-07 21:12:48 +08:00
skiffer-git
5d4600a080 Separate the notification 2022-12-07 10:00:53 +08:00
wangchuxiao
819ebf0ede add callback and fix cache 2022-11-22 11:07:20 +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
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
d6e14eafef k8s version update 2022-11-11 15:18:04 +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
08f3a79e6e add usualConfig 2022-11-10 18:23:11 +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