293 Commits

Author SHA1 Message Date
Gordon
0a2b6605d7 core version 2023-01-03 16:39:54 +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
386c837f1a pb 2022-12-14 16:14:56 +08:00
wangchuxiao
be8c544da3 proto 2022-12-14 16:14:12 +08:00
skiffer-git
a78e43bfe3 Simplify logs 2022-12-14 15:22:06 +08:00
wangchuxiao
4d56dfdfa2 modify 2022-12-09 12:13:14 +08:00
wangchuxiao
067d23e2bc cron 2022-11-24 19:24:04 +08:00
wangchuxiao
0654ecc9bb cron 2022-11-24 19:17:29 +08:00
wangchuxiao
c0d7f0f5fd cron test 2022-11-18 16:59:31 +08:00
wangchuxiao
a556cfcd40 etcd conf 2022-11-14 18:37:42 +08:00
wangchuxiao
ccad06b7b6 conf script 2022-11-14 15:37:32 +08:00
wangchuxiao
168dd1d01f orgization 2022-09-20 11:08:46 +08:00
skiffer-git
6759e0c25b fix bug: invited/kick failed due to json tag validation 2022-09-15 15:52:48 +08:00
wangchuxiao
a1f79f4508 prome 2022-09-15 01:22:20 +08:00
wangchuxiao
88bcb35a14 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-14 17:45:51 +08:00
wangchuxiao
d534f026b0 promethues 2022-09-14 17:45:38 +08:00
skiffer-git
398be73f5b log 2022-09-14 15:34:09 +08:00
skiffer-git
e7ab59a932 log 2022-09-14 15:24:56 +08:00
skiffer-git
72d0920458 log 2022-09-14 14:42:35 +08:00
skiffer-git
4aaa1a7afa log 2022-09-14 13:09:04 +08:00
skiffer-git
f2f35e115c log 2022-09-14 13:08:15 +08:00
skiffer-git
7295f39d68 log 2022-09-14 12:45:42 +08:00
skiffer-git
685cacf490 log 2022-09-14 12:43:10 +08:00
skiffer-git
60f0c80c36 log 2022-09-14 12:31:24 +08:00
skiffer-git
e9ad462f9e log 2022-09-14 10:42:02 +08:00
wangchuxiao
899e88babe prome 2022-09-13 01:06:18 +08:00
wangchuxiao
83f923aa10 prome 2022-09-13 00:53:17 +08:00
wangchuxiao
04a0614319 prome 2022-09-13 00:22:34 +08:00
wangchuxiao
632ff783c6 fix bug 2022-09-12 23:50:14 +08:00
wangchuxiao
ef66b10501 prome 2022-09-12 19:32:24 +08:00
skiffer-git
34eedd7955 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-09 15:53:07 +08:00
skiffer-git
98d7c7bb86 Limit the number of group members for kick/create/invite 2022-09-09 15:52:47 +08:00
wangchuxiao
aebcd1db2e docker-compose 2022-09-09 01:10:06 +08:00
wangchuxiao
bdae1f10d4 merge cms into v2.3.0release 2022-09-05 18:11:03 +08:00
wangchuxiao
05b5a0ada3 add 2022-09-05 17:52:43 +08:00
skiffer-git
6af9d3129e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-03 10:35:19 +08:00
skiffer-git
d7cff79ac7 log 2022-09-03 10:34:45 +08:00
Gordon
72aff32024 fcm ios push badge 2022-09-02 16:36:47 +08:00
wangchuxiao
c2831e6676 cms 2022-08-31 00:43:06 +08:00
skiffer-git
e5a7810d6e add group member cache in msg rpc 2022-08-30 22:04:13 +08:00
wangchuxiao
8d4e5ad3f1 cms 2022-08-30 01:38:23 +08:00
wangchuxiao
7f5b12d4d2 cms 2022-08-29 15:52:39 +08:00
wangchuxiao
3886d49b0a admin cms 2022-08-26 17:51:01 +08:00
wangchuxiao
6553ada66f add set client init 2022-08-21 21:54:32 +08:00
wangchuxiao
2016a1656b Merge branch 'v2.3.0release' into del 2022-08-16 12:17:07 +08:00
wangchuxiao
3f74022142 Merge branch 'main' into del 2022-08-15 21:51:12 +08:00
wangchuxiao
919e2543ca fix code 2022-08-15 19:50:13 +08:00
wangchuxiao
b705ac24fa fix code 2022-08-15 19:27:23 +08:00
wangchuxiao
9b86a18752 Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/ip_model.go
2022-08-15 18:58:48 +08:00
skiffer-git
8b857f9980 Restrict user login with IP 2022-08-15 17:52:45 +08:00