Commit Graph

1422 Commits

Author SHA1 Message Date
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
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 e7ab59a932 log 2022-09-14 15:24:56 +08:00
skiffer-git 285cb346b9 log 2022-09-14 14:52:14 +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 d491c482a5 hash 2022-09-13 18:31:47 +08:00
wangchuxiao 82f2ec24fb group 2022-09-13 15:27:00 +08:00
wangchuxiao d59f699937 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-12 19:34:21 +08:00
wangchuxiao ef66b10501 prome 2022-09-12 19:32:24 +08:00
Gordon 765e8d4f79 log test 2022-09-10 00:15:31 +08:00
Gordon 8e7e496b44 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-09 23:40:53 +08:00
Gordon cf14b19bf6 log test 2022-09-09 23:40:35 +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
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 2203638fc5 promethues 2022-09-09 10:37:09 +08:00
wangchuxiao f41cebe776 prometheus 2022-09-09 01:39:00 +08:00
wangchuxiao dd47dbffe8 docker-compose 2022-09-09 01:14:24 +08:00
wangchuxiao aebcd1db2e docker-compose 2022-09-09 01:10:06 +08:00
Gordon 4a2a9eb997 fcm push modify 2022-09-07 16:41:18 +08:00
wangchuxiao 4682abf4c1 cms 2022-09-06 20:35:32 +08:00
wangchuxiao 6871c7e665 fix bug 2022-09-06 17:57:12 +08:00
wangchuxiao a508dd2c0f fix bug 2022-09-06 17:51:29 +08:00
wangchuxiao 5469bb6508 fix bug 2022-09-06 17:46:55 +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 7208dd6b2a cms 2022-09-06 15:51:18 +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 82c79bd91c conversation unread modify 2022-09-05 21:21:16 +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
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