IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-04-28 22:39:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,065 Commits 35 Branches 142 Tags
a2cd7c8007d4e1ca7c7c6e582b6de4d7d2aed87a
Commit Graph

1065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangchuxiao a2cd7c8007 add minio 2022-02-19 18:48:15 +08:00
wangchuxiao 6e9b9341d4 mini cr 2022-02-18 17:06:27 +08:00
Gordon e90d8a87ee config 2022-02-18 15:16:33 +08:00
Gordon 45c43888e7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-18 12:56:53 +08:00
Gordon 68e7dfb1cc conversation add 2022-02-18 12:56:43 +08:00
wangchuxiao f086f33097 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-17 19:41:03 +08:00
wangchuxiao 737ce2c2e7 fix bug 2022-02-17 19:35:17 +08:00
Gordon 3c7c7cde3c close console log 2022-02-17 16:28:59 +08:00
Gordon 3913d9e48e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-17 16:18:47 +08:00
Gordon 84d4645efa close console log 2022-02-17 16:18:37 +08:00
wangchuxiao 8a7442648c Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-17 14:37:54 +08:00
wangchuxiao f1616461f7 add log 2022-02-17 14:36:34 +08:00
Gordon ed2a5af5ed Merge remote-tracking branch 'origin/tuoyun' into tuoyun 
# Conflicts:
#	internal/api/third/tencent_cloud_storage_credential.go
 2022-02-17 11:14:27 +08:00
Gordon 3b73a4c69a send msg modify 2022-02-17 11:13:51 +08:00
wenxu12345 17954dfdc9 Refactoring code 2022-02-16 19:41:44 +08:00
wenxu12345 3aadf61fde Refactoring code 2022-02-16 18:58:02 +08:00
wenxu12345 5e65e394a6 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-16 18:30:36 +08:00
wenxu12345 8c357ec213 Refactoring code 2022-02-16 18:30:24 +08:00
wangchuxiao a599a334a3 alter cfg 2022-02-16 14:11:47 +08:00
wangchuxiao 36d39669e4 alter deploy 2022-02-16 12:23:08 +08:00
wangchuxiao 028171a91a yaml cfg alter 2022-02-16 11:13:13 +08:00
wangchuxiao 2647e1cdac alter yaml cfg 2022-02-16 11:06:35 +08:00
wangchuxiao 994cebea82 makefile 2022-02-15 18:57:41 +08:00
wangchuxiao a533a3e0ef makefile 2022-02-15 18:43:03 +08:00
wangchuxiao caa915b31d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-15 18:29:46 +08:00
wangchuxiao 2996d8537d add makefile 2022-02-15 18:29:38 +08:00
wangchuxiao 65be1263b9 make file 2022-02-15 18:28:54 +08:00
wenxu12345 d81ae835aa Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-15 14:34:20 +08:00
wenxu12345 c405cedc41 Refactoring code 2022-02-15 14:34:03 +08:00
Gordon 2a7f366cbf Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-15 14:32:40 +08:00
Gordon ea580e4c64 send message 2022-02-15 14:31:55 +08:00
wangchuxiao 445100f32d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-15 14:11:30 +08:00
wangchuxiao 648a852ba7 conversation opt 2022-02-15 14:11:20 +08:00
Gordon 9f136fb150 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-15 13:16:41 +08:00
Gordon 6d5b38fc8a send message 2022-02-15 13:16:31 +08:00
skiffer-git 2e7fd5fe93 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-14 17:50:38 +08:00
root 626895166a Merge branch 'tuoyun' of https://github.com/OpenIMSDK/Open-IM-Server into tuoyun 2022-02-14 17:01:26 +08:00
skiffer-git 1ca8d2b2db log 2022-02-14 16:59:52 +08:00
Gordon aa57f25b2c tes log 2022-02-14 16:59:26 +08:00
root a321676b99 Merge branch 'tuoyun' of https://github.com/OpenIMSDK/Open-IM-Server into tuoyun 2022-02-14 16:29:30 +08:00
Gordon 5b49b105f6 config file 2022-02-14 16:29:15 +08:00
Gordon d610b19f4e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-14 16:28:40 +08:00
root b9241288c4 config file 2022-02-14 16:23:05 +08:00
Gordon a7470dc284 update 2022-02-14 16:13:27 +08:00
Gordon 154624a767 update 2022-02-14 16:04:35 +08:00
skiffer-git 6f1a5eb79c log 2022-02-14 16:03:55 +08:00
Judgelight a8334a22f8 Merge pull request #131 from OpenIMSDK/cms-dev 
Cms dev
 2022-02-14 15:18:05 +08:00
wangchuxiao 8cdea2bfeb cms dev 2022-02-14 15:16:59 +08:00
wangchuxiao c413eda330 merge code 2022-02-14 10:57:23 +08:00
wangchuxiao 22bfb6be4b merge code 2022-02-14 10:46:32 +08:00