1847 Commits

Author SHA1 Message Date
wangchuxiao
189d5aed69 promethues 2022-09-09 17:02:23 +08:00
wangchuxiao
ea38953b47 promethues 2022-09-09 17:00:07 +08:00
wangchuxiao
9130881875 promethues 2022-09-09 16:53:07 +08:00
wangchuxiao
46b1803086 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-09 16:27:23 +08:00
wangchuxiao
98dde67f65 v2.3.2 2022-09-09 16:26:57 +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
74c2bafc9b merge 2022-09-09 15:33:50 +08:00
wangchuxiao
912da395c9 merge 2022-09-09 15:29:22 +08:00
Gordon
b5deceaa3b put client msg id to offline callback 2022-09-09 11:00:15 +08:00
Gordon
22099d82be Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-09 10:59:00 +08:00
Gordon
07e1de2f62 put client msg id to offline callback 2022-09-09 10:58:38 +08:00
wangchuxiao
5ef7123f78 promethues 2022-09-09 10:29:30 +08:00
wangchuxiao
5ae9b84cce prome 2022-09-09 02:05:04 +08:00
wangchuxiao
f41cebe776 prometheus 2022-09-09 01:39:00 +08:00
wangchuxiao
aebcd1db2e docker-compose 2022-09-09 01:10:06 +08:00
wangchuxiao
602ac1ffb8 prome 2022-09-08 02:15:21 +08:00
Gordon
f3a9c47c2a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-07 20:39:26 +08:00
wangchuxiao
9842e5624e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-07 17:01:22 +08:00
wangchuxiao
d00b265347 prome 2022-09-07 16:53:53 +08:00
Gordon
c72f898238 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-07 16:43:40 +08:00
Gordon
4a2a9eb997 fcm push modify 2022-09-07 16:41:18 +08:00
skiffer-git
5b399d0d06 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-07 14:05:28 +08:00
skiffer-git
8edacbff2f log 2022-09-07 14:05:16 +08:00
wangchuxiao
156e9e2fc7 cms 2022-09-06 20:41:46 +08:00
wangchuxiao
4682abf4c1 cms 2022-09-06 20:35:32 +08:00
wangchuxiao
099461dbbf cms 2022-09-06 17:19:13 +08:00
wangchuxiao
5233e4c097 fix bug 2022-09-06 16:08:28 +08:00
wangchuxiao
70e8811d5c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-06 15:51:30 +08:00
wangchuxiao
7208dd6b2a cms 2022-09-06 15:51:18 +08:00
Gordon
44af6740c7 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-06 12:00:43 +08:00
Gordon
8d1dd92df7 opid add 2022-09-06 11:57:22 +08:00
wangchuxiao
a5cacaceda Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-06 01:14:51 +08:00
wangchuxiao
821e704b5b cms 2022-09-06 01:14:36 +08:00
Gordon
bde0adfbd0 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
2022-09-05 21:00:18 +08:00
Gordon
6c8b115479 conversation unread modify 2022-09-05 19:07:16 +08:00
wangchuxiao
82a8f18e88 merge cms into v2.3.0release 2022-09-05 18:28:11 +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
Gordon
f6137dfc34 fcm ios push badge 2022-09-02 22:03:35 +08:00
wangchuxiao
6dfbb90b80 fix signal 2022-09-02 17:22:27 +08:00
Gordon
72aff32024 fcm ios push badge 2022-09-02 16:36:47 +08:00
wangchuxiao
9f4c367249 cms 2022-09-02 14:57:08 +08:00
Gordon
3f87958328 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-02 12:04:11 +08:00
Gordon
a0e689c437 fcm ios push badge 2022-09-02 12:03:28 +08:00
wangchuxiao
49f05d334d cms 2022-09-02 12:01:10 +08:00
wangchuxiao
06e48516bb cms 2022-09-02 11:28:01 +08:00
wangchuxiao
a317ebd8e7 cms 2022-09-02 11:26:25 +08:00
wangchuxiao
6774a8594f cms 2022-09-02 02:01:42 +08:00
wangchuxiao
56fb579da2 Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang 2022-09-01 21:59:09 +08:00