Commit Graph

3697 Commits

Author SHA1 Message Date
skiffer-git d6abbacbf7 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	internal/rpc/msg/rpcChat.go
#	pkg/common/prometheus/gather.go
2022-09-15 12:27:55 +08:00
skiffer-git 979100850c prometheus for statistics 2022-09-15 12:07:28 +08:00
wangchuxiao 7f1acb4532 prome 2022-09-15 09:30:23 +08:00
wangchuxiao 9afaba4382 prome 2022-09-15 09:16:08 +08:00
wangchuxiao 355c672ed1 prome 2022-09-15 08:50:29 +08:00
wangchuxiao 144cf279f9 prome 2022-09-15 08:45:10 +08:00
wangchuxiao c1a94a1b6c prome 2022-09-15 01:48:24 +08:00
wangchuxiao c091b5f385 prome 2022-09-15 01:46:22 +08:00
wangchuxiao aa6b439e8c prome 2022-09-15 01:35:08 +08:00
wangchuxiao 07170135e6 prome 2022-09-15 01:28:56 +08:00
wangchuxiao 024ee6e602 prome 2022-09-15 01:23:57 +08:00
wangchuxiao a1f79f4508 prome 2022-09-15 01:22:20 +08:00
skiffer-git 6a6009827c prometheus for statistics 2022-09-14 21:42:04 +08:00
skiffer-git 375fc0c89e prometheus for statistics 2022-09-14 21:11:40 +08:00
skiffer-git a110b4c26b prometheus for statistics 2022-09-14 20:27:54 +08:00
skiffer-git ebdb875c56 prometheus for statistics 2022-09-14 19:36:59 +08:00
wangchuxiao 266a2b4c76 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-14 19:28:56 +08:00
wangchuxiao 7e5b62377f add 2022-09-14 19:28:17 +08:00
skiffer-git 8dce5396b0 prometheus for statistics 2022-09-14 18:58:30 +08:00
skiffer-git e78f7a2a37 prometheus for statistics 2022-09-14 18:47:11 +08:00
Gordon aafbda47d4 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-14 18:33:18 +08:00
Gordon e1b1af9a48 private message cache update 2022-09-14 18:31:56 +08:00
wangchuxiao 5ce0cf1aad prome 2022-09-14 18:16:02 +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 939eb95cdc log 2022-09-14 16:39:03 +08:00
skiffer-git 46d3dd409a log 2022-09-14 16:29:22 +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 285cb346b9 log 2022-09-14 14:52:14 +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 1f36d970f9 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-14 12:31:46 +08:00
skiffer-git 60f0c80c36 log 2022-09-14 12:31:24 +08:00
wangchuxiao c018d63117 add log 2022-09-14 12:24:29 +08:00
wangchuxiao 88af048e90 add log 2022-09-14 12:19:17 +08:00
wangchuxiao c0190e21c6 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-14 11:00:42 +08:00
wangchuxiao 2368a8fba3 fix transfer 2022-09-14 11:00:27 +08:00
skiffer-git e9ad462f9e log 2022-09-14 10:42:02 +08:00
wangchuxiao 4d6e05989e prome 2022-09-14 10:25:44 +08:00
wangchuxiao 54a3a755d6 prome 2022-09-14 10:25:31 +08:00
wangchuxiao e32a3fbfca hash 2022-09-13 19:58:48 +08:00
wangchuxiao f498f67f1e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-13 18:32:01 +08:00
wangchuxiao d491c482a5 hash 2022-09-13 18:31:47 +08:00
skiffer-git 7062676f9a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-13 18:15:50 +08:00
skiffer-git 0d52759455 fix bug : messages can be sent after the group is disbanded 2022-09-13 18:15:33 +08:00
wangchuxiao 9a5c0bae50 hash 2022-09-13 18:02:37 +08:00