Commit Graph

1639 Commits

Author SHA1 Message Date
wangchuxiao 2ba7fcd628 group hash 2022-08-08 12:22:10 +08:00
wangchuxiao 1f8e161001 group hash 2022-08-08 12:14:46 +08:00
wangchuxiao b4b215a3f8 group hash 2022-08-08 12:10:28 +08:00
wangchuxiao e2ff7ef113 group hash 2022-08-08 12:07:41 +08:00
wangchuxiao 73c998f510 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-08 11:58:30 +08:00
wangchuxiao 11f29280b1 group hash 2022-08-08 11:30:10 +08:00
Gordon 2cf10fce38 del conversation bug fix 2022-08-05 19:10:08 +08:00
Gordon 2436ea6ff9 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-05 16:43:43 +08:00
Gordon 403489865c del conversation bug fix 2022-08-05 16:43:23 +08:00
wangchuxiao c8590b9e9c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-05 15:54:24 +08:00
wangchuxiao d1ffa9b330 callback fix 2022-08-05 15:54:00 +08:00
Gordon 37799ca0be del conversation bug fix 2022-08-05 15:51:34 +08:00
Gordon ba5edabb2c del conversation bug fix 2022-08-05 15:16:43 +08:00
Gordon e77b4f334d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-05 14:43:03 +08:00
Gordon 87c64bdb2b del conversation bug fix 2022-08-05 14:42:39 +08:00
skiffer-git 68eed69221 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	pkg/base_info/group_api_struct.go
2022-08-05 13:40:57 +08:00
skiffer-git 5db5bf17cb add GetGroupAbstractInfo api 2022-08-05 13:40:20 +08:00
Gordon 319631b5c4 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-05 12:08:49 +08:00
Gordon 10c0f3075a unread bug fix 2022-08-05 12:08:00 +08:00
wangchuxiao 91a767b4fb callback fix 2022-08-04 19:18:31 +08:00
wangchuxiao 4e69ff196a cache get group 2022-08-04 19:08:08 +08:00
wangchuxiao db547d60df callback fix 2022-08-04 18:24:17 +08:00
wangchuxiao 3d0827a6da callback fix 2022-08-04 17:20:33 +08:00
Gordon 231d4db71d callback msg content 2022-08-04 16:36:50 +08:00
Gordon ca7bba33e6 docker-compose file update 2022-08-04 14:46:30 +08:00
wangchuxiao b294a8138c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-04 14:22:27 +08:00
wangchuxiao a99dbf634b callback fix 2022-08-04 14:21:03 +08:00
skiffer-git cda0fb6a10 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-04 14:05:05 +08:00
skiffer-git a1392a7677 GetGroupAllMemberListBySplit 2022-08-04 14:04:29 +08:00
Gordon e9da7f28cc Merge branch 'main' into v2.3.0release
# Conflicts:
#	pkg/common/config/config.go
2022-08-04 10:01:45 +08:00
Gordon c4ee293388 docker-compose file update 2022-08-04 10:00:32 +08:00
wangchuxiao d99b0893df fix bug 2022-08-01 19:13:26 +08:00
wangchuxiao b32463df53 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-01 17:45:09 +08:00
wangchuxiao f202d5f54a fix bug 2022-08-01 17:44:40 +08:00
Gordon 18891c554d log add 2022-08-01 17:02:56 +08:00
wangchuxiao 8e445caf26 fix bug 2022-08-01 16:37:40 +08:00
wangchuxiao d99375a536 fix bug 2022-08-01 15:27:51 +08:00
wangchuxiao 4c610abd44 fix bug 2022-08-01 14:56:20 +08:00
wangchuxiao e1a941b998 fix bug 2022-08-01 14:44:29 +08:00
wangchuxiao 9136838b63 fix bug 2022-08-01 14:33:01 +08:00
wangchuxiao ef9c291d9a fix bug 2022-08-01 11:52:43 +08:00
wangchuxiao 6f968342dc fix bug 2022-08-01 11:49:50 +08:00
wangchuxiao 4930906b62 fix bug 2022-08-01 11:47:24 +08:00
wangchuxiao c39df537b4 minio obj locking 2022-08-01 10:58:29 +08:00
wangchuxiao 146cf8750f Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-29 20:49:32 +08:00
wangchuxiao c25352b660 fix bug 2022-07-29 20:49:27 +08:00
Gordon 7cc9d6707c Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 20:23:33 +08:00
Gordon dca2f9323b update server version 2022-07-29 20:23:07 +08:00
wangchuxiao 7cf2fec3ea Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-29 19:09:01 +08:00
wangchuxiao ab6b1f0fca fix bug 2022-07-29 19:08:56 +08:00