Commit Graph

246 Commits

Author SHA1 Message Date
Gordon 1bf4fa0d87 push update 2023-01-02 19:07:05 +08:00
wangchuxiao 972dd5f531 fix bug 2022-12-29 11:00:41 +08:00
wangchuxiao 0e62deed0a test cron 2022-12-27 22:27:44 +08:00
wangchuxiao eb49b27e16 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-26 10:25:53 +08:00
wangchuxiao 4fd31e4367 getui 2022-12-26 10:25:42 +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 e8dc5ce085 push 2022-12-22 17:35:09 +08:00
wangchuxiao fb72f4b1ae push 2022-12-22 17:17:28 +08:00
wangchuxiao 6bf0a3a804 push 2022-12-22 16:28:36 +08:00
wangchuxiao 4bcaa5eaca push 2022-12-22 15:42:16 +08:00
wangchuxiao 8ca6584299 push 2022-12-22 15:23:46 +08:00
wangchuxiao e86e8820f3 push 2022-12-22 11:30:19 +08:00
wangchuxiao 07c300f35f push 2022-12-22 11:10:19 +08:00
wangchuxiao b08936c27e push 2022-12-21 19:56:25 +08:00
wangchuxiao 0b4b408552 push 2022-12-21 18:58:36 +08:00
wangchuxiao 36e37052e0 push 2022-12-21 18:37:58 +08:00
wangchuxiao 9a3373a43d push 2022-12-21 18:29:31 +08:00
wangchuxiao 428e5a7a4e push 2022-12-21 18:15:25 +08:00
wangchuxiao 7445b84756 push 2022-12-21 18:03:39 +08:00
wangchuxiao 49b21fb577 push 2022-12-21 17:39:48 +08:00
wangchuxiao 1f7e788585 push 2022-12-21 17:30:49 +08:00
wangchuxiao e80afa610d getui 2022-12-21 16:46:16 +08:00
Gordon 7c9b4576f0 platform update 2022-12-16 16:17:53 +08:00
Gordon ad814b6cbb add web push 2022-12-12 11:16:55 +08:00
Gordon f2a35fb833 callback add seq 2022-12-06 21:26:47 +08:00
Gordon 6f69653a8b Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-01 14:55:42 +08:00
Gordon 14fd7444e8 callback add seq 2022-12-01 14:55:30 +08:00
wangchuxiao 6f22b37e1d fix groupMuted send msg 2022-11-29 14:41:20 +08:00
wangchuxiao bb1babad11 config 2022-11-10 14:51:35 +08:00
wangchuxiao 3a3412486a fix callback bug 2022-11-08 17:10:27 +08:00
Gordon eba25f1bb8 ws add logout remove push token 2022-10-27 17:15:06 +08:00
wangchuxiao 16b3ea8b7e callback update 2022-10-21 15:44:55 +08:00
wangchuxiao 942afd7fec callback update 2022-10-20 12:01:06 +08:00
wangchuxiao de271d5b76 callback update 2022-10-20 12:00:32 +08:00
wangchuxiao 32561b5616 fix bug 2022-10-06 11:30:45 +08:00
wangchuxiao 9964650014 Merge branch 'main' into v2.3.0release 2022-09-30 17:59:46 +08:00
wangchuxiao 3345b6e242 fix bug 2022-09-29 15:23:28 +08:00
Gordon 51fa675e90 callback update 2022-09-26 12:22:28 +08:00
liu ming e000dc18aa 添加袤博推送 (#284)
Co-authored-by: liuming <liuming@example.com>
2022-09-23 17:40:48 +08:00
Gordon cad23f1672 online push info callback update 2022-09-21 16:09:02 +08:00
Gordon 18e92ccbd3 push update 2022-09-20 10:39:43 +08:00
wangchuxiao af2baba1e3 merge shichuang 2022-09-16 17:23:28 +08:00
wangchuxiao 78ce5c3f69 prometheus 2022-09-15 16:39:49 +08:00
wangchuxiao 1f81bd121f Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-15 16:27:46 +08:00
wangchuxiao 02fa9142fe prometheus 2022-09-15 16:27:36 +08:00
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 144cf279f9 prome 2022-09-15 08:45:10 +08:00
wangchuxiao aa6b439e8c prome 2022-09-15 01:35:08 +08:00
wangchuxiao a1f79f4508 prome 2022-09-15 01:22:20 +08:00