IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,914 Commits 35 Branches 142 Tags
15df8e0a086ca71a07f2cee3b8a5a97b1a4e5a49
Commit Graph

294 Commits

Author SHA1 Message Date
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
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 decef23751 config 2022-11-09 12:36:55 +08:00
wangchuxiao 16b3ea8b7e callback update 2022-10-21 15:44:55 +08:00
wangchuxiao 162478563c add friend callback 2022-10-19 21:06:48 +08:00
wangchuxiao 9964650014 Merge branch 'main' into v2.3.0release 2022-09-30 17:59:46 +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
wangchuxiao af2baba1e3 merge shichuang 2022-09-16 17:23:28 +08:00
skiffer-git 93cb01e7e6 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-16 16:52:15 +08:00
skiffer-git 139285c46a Support mongodb cluster 2022-09-16 16:52:03 +08:00
wangchuxiao dc401c784a Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-16 16:51:25 +08:00
wangchuxiao bb0f5e97a2 kafka 2022-09-16 16:51:12 +08:00
skiffer-git 06117c98b1 Support mongodb cluster 2022-09-16 16:17:21 +08:00
skiffer-git 3bdafc2a11 Support mongodb cluster 2022-09-16 15:11:13 +08:00
skiffer-git 3c4227696c Support mongodb cluster 2022-09-16 15:08:48 +08:00
wangchuxiao 665e2e3e83 add mysql 2022-09-16 11:57:01 +08:00
wangchuxiao d534f026b0 promethues 2022-09-14 17:45:38 +08:00
wangchuxiao ef66b10501 prome 2022-09-12 19:32:24 +08:00
wangchuxiao aebcd1db2e docker-compose 2022-09-09 01:10:06 +08:00
wangchuxiao 95910f5c17 prome 2022-09-08 01:27:05 +08:00
wangchuxiao 6754fdb580 getui 2022-09-07 18:20:41 +08:00
skiffer-git 67319031ea log 2022-08-30 21:22:14 +08:00
skiffer-git 49a127d97d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-29 22:31:38 +08:00
skiffer-git 8cfb604a0d set mysql connection 2022-08-29 22:31:14 +08:00
wangchuxiao c3d3f0986e join groups 2022-08-29 14:34:07 +08:00
Gordon 06a75a0a0e add version 2022-08-24 18:12:18 +08:00
Gordon 221b4587d4 shell update 2022-08-24 16:20:31 +08:00
Gordon e172364e86 shell update 2022-08-24 15:51:23 +08:00
Gordon 0befceef9a callback add ex field and sdk server shell update 2022-08-24 15:26:33 +08:00
Gordon 203bfbe411 callback add ex field and sdk server shell update 2022-08-24 15:20:01 +08:00
Gordon aa2d07ca8d callback add ex field and sdk server shell update 2022-08-24 14:22:47 +08:00
wangchuxiao d20c89ba21 merge shichuang 2 v2.3.0release 2022-08-21 17:57:44 +08:00
skiffer-git 85a52f5d6b get grpc conn from config 2022-08-17 11:42:12 +08:00
skiffer-git cdf09aa1bd get grpc conn from config 2022-08-17 11:35:33 +08:00
skiffer-git 723e304ed8 set mysql max conn 2022-08-16 23:52:53 +08:00
skiffer-git 1deb7e9f95 config 2022-08-16 11:59:00 +08:00