blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,426 Commits 40 Branches 130 Tags
Commit Graph

1426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gordon
c5828aba91 Merge branch 'tuoyun' 
# Conflicts:
#	cmd/open_im_api/main.go
#	config/config.yaml
#	go.sum
#	pkg/common/config/config.go
#	pkg/common/db/model.go
 2022-03-29 10:58:01 +08:00
skiffer-git
1286f9dcb6 mute group 2022-03-29 09:34:45 +08:00
skiffer-git
391e525fc5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-28 19:27:23 +08:00
skiffer-git
afc32b1cfa mute group 2022-03-28 19:27:05 +08:00
wangchuxiao
0797181967 tag 2022-03-28 19:18:30 +08:00
wangchuxiao
14c5e631ff tag 2022-03-28 19:15:59 +08:00
wangchuxiao
5cdb039c33 tag 2022-03-28 19:12:31 +08:00
wangchuxiao
a11c4fcb58 tag 2022-03-28 19:05:58 +08:00
wangchuxiao
c67a937d40 tag 2022-03-28 18:53:57 +08:00
wangchuxiao
03fa7137b9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 18:52:02 +08:00
wangchuxiao
e95400988e tag 2022-03-28 18:51:48 +08:00
Gordon
942c9c6a63 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-28 18:30:21 +08:00
Gordon
6c45665fde add tag message conversation update 2022-03-28 18:30:12 +08:00
wangchuxiao
d92ac8f588 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 18:13:08 +08:00
wangchuxiao
169665da32 tag 2022-03-28 18:13:01 +08:00
Gordon
c4d80b4844 auto migrate test 2022-03-28 17:52:40 +08:00
Gordon
7827749453 tag notification 2022-03-28 17:37:30 +08:00
wangchuxiao
5e78697a69 tag 2022-03-28 17:22:18 +08:00
wangchuxiao
a0e6a78496 tag 2022-03-28 17:18:03 +08:00
wangchuxiao
af99a93536 tag 2022-03-28 17:12:36 +08:00
wangchuxiao
e9ea117985 tag 2022-03-28 17:10:45 +08:00
wangchuxiao
b9ddb0140f tag 2022-03-28 17:02:03 +08:00
wangchuxiao
dae70371d1 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 16:59:39 +08:00
wangchuxiao
228cbb4082 tag 2022-03-28 16:59:15 +08:00
Gordon
679c913f3a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-28 16:57:24 +08:00
Gordon
03fb7947c3 add oa notification 2022-03-28 16:57:08 +08:00
wangchuxiao
c39f5a27b2 tag 2022-03-28 16:49:19 +08:00
wangchuxiao
dbdb516f3c tag 2022-03-28 16:42:18 +08:00
wangchuxiao
c1a97b7356 tag 2022-03-28 16:20:20 +08:00
wangchuxiao
a6d8f7ea24 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 16:03:16 +08:00
wangchuxiao
574c7600e0 tag 2022-03-28 16:02:31 +08:00
Gordon
d1c0205d77 add oa notification 2022-03-28 15:55:55 +08:00
wangchuxiao
13c29d2c1e tag 2022-03-28 15:04:42 +08:00
wangchuxiao
dc1a0f050e tag 2022-03-28 14:54:46 +08:00
wangchuxiao
e252a00d55 tag 2022-03-28 14:11:47 +08:00
Gordon
5bedbb7c7d script modify 2022-03-28 12:56:59 +08:00
wangchuxiao
e510418152 Merge branch 'office_tag' into tuoyun 2022-03-28 12:17:48 +08:00
wangchuxiao
8197ae6aa7 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 12:17:32 +08:00
wangchuxiao
9d619d520d tag 2022-03-28 12:17:07 +08:00
wangchuxiao
46605479e9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into office_tag 2022-03-25 18:48:30 +08:00
wangchuxiao
6d20eddd43 mongo 2022-03-25 18:46:27 +08:00
skiffer-git
c1ee2a0adb
Update docker-compose.yaml 2022-03-25 12:48:11 +08:00
skiffer-git
9d29d49ada group dismissed v2.0.5 2022-03-24 15:33:30 +08:00
wangchuxiao
e7b95892ff minio upload api 2022-03-23 17:40:51 +08:00
wangchuxiao
4bf5c77374 mongo 2022-03-23 17:18:40 +08:00
wangchuxiao
df4a75f4b0 mongo 2022-03-23 17:15:46 +08:00
wangchuxiao
4bdb4cbbb5 mongo 2022-03-23 16:13:18 +08:00
wangchuxiao
4cdcdee8e4 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-23 15:44:59 +08:00
wangchuxiao
e6c36411cb mongo 2022-03-23 15:44:34 +08:00
skiffer-git
a4788a95af
Update issue templates 2022-03-23 11:33:35 +08:00