Commit Graph

404 Commits

Author SHA1 Message Date
wenxu12345 c962a19eb7 replace mongo driver 2022-02-21 15:03:29 +08:00
Gordon 3ee12221a4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-21 10:10:22 +08:00
Gordon 8915848a52 login modify 2022-02-21 10:10:11 +08:00
wangchuxiao a2cd7c8007 add minio 2022-02-19 18:48:15 +08:00
wangchuxiao 6e9b9341d4 mini cr 2022-02-18 17:06:27 +08:00
wangchuxiao 737ce2c2e7 fix bug 2022-02-17 19:35:17 +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 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 caa915b31d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-15 18:29:46 +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
skiffer-git 1ca8d2b2db log 2022-02-14 16:59:52 +08:00
Gordon aa57f25b2c tes log 2022-02-14 16:59:26 +08:00
wangchuxiao 8cdea2bfeb cms dev 2022-02-14 15:16:59 +08:00
wangchuxiao 22bfb6be4b merge code 2022-02-14 10:46:32 +08:00
Gordon 6bfbf37749 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-14 09:44:18 +08:00
wangchuxiao 7797e47561 add 2022-02-14 00:02:15 +08:00
wangchuxiao 52579c5fab add 2022-02-12 17:13:31 +08:00
wenxu12345 439605bafc Refactor code 2022-02-11 20:31:57 +08:00
wenxu12345 9f6fd3ee6a Refactor code 2022-02-11 19:58:42 +08:00
Gordon 216697d4b5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-11 19:46:04 +08:00
wenxu12345 7e52477908 Refactor code 2022-02-11 19:35:51 +08:00
wenxu12345 45816fa84f Refactor code 2022-02-11 19:34:18 +08:00
Gordon df8970f59b demo modify 2022-02-11 19:06:29 +08:00
wenxu12345 3103c33dda Refactor code 2022-02-11 18:57:37 +08:00
Gordon fd59cc6226 demo modify 2022-02-11 17:44:02 +08:00
Gordon 6a8a0f2249 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-11 16:45:28 +08:00
Gordon 8c43b0953b demo modify 2022-02-11 16:36:02 +08:00
Gordon a885d7f003 demo modify 2022-02-11 16:25:28 +08:00
wenxu12345 bf6efc3530 Refactor code 2022-02-10 18:32:02 +08:00
wenxu12345 f67f2a31ee Refactor code 2022-02-10 16:44:58 +08:00
wenxu12345 3d5b8287ce Refactor code 2022-02-10 16:15:57 +08:00
wenxu12345 548a27fe48 Refactor code 2022-02-10 16:14:18 +08:00
wenxu12345 b35d5ded77 Refactor code 2022-02-10 09:35:24 +08:00
wenxu12345 a3f712306e Refactor code 2022-02-10 09:31:50 +08:00
wenxu12345 e455b3ff00 Refactor code 2022-02-10 09:17:48 +08:00
wenxu12345 17dd73834f Refactor code 2022-02-09 20:25:25 +08:00