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,696 Commits 35 Branches 142 Tags
f2fdb74f23b66feccac8a53e202b83ced08a4367
Commit Graph

88 Commits

Author SHA1 Message Date
wangchuxiao 2e6c42c8ac workMoments 2022-04-20 16:33:19 +08:00
skiffer-git f53f34559a organization 2022-04-19 16:40:57 +08:00
wangchuxiao 3625befc0b Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 
# Conflicts:
#	pkg/common/constant/constant.go
 2022-04-18 19:26:26 +08:00
wangchuxiao 6e6508aafd workMoments 2022-04-18 19:24:36 +08:00
skiffer-git 42242daf9b organization 2022-04-18 16:18:10 +08:00
skiffer-git c59dc129a8 /user/get_users_online_status 2022-04-18 14:27:12 +08:00
skiffer-git 248de7f1f2 set groupmember nickname 2022-04-18 11:52:17 +08:00
skiffer-git 3bbf84861e organization 2022-04-18 10:53:23 +08:00
skiffer-git 7c64239b36 organization 2022-04-17 14:39:48 +08:00
skiffer-git 6d55f35404 organization 2022-04-17 11:59:31 +08:00
skiffer-git cc405b83e2 organization 2022-04-16 20:10:10 +08:00
skiffer-git c65f5b7279 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-15 20:37:26 +08:00
skiffer-git c216340120 organization 2022-04-15 19:48:17 +08:00
wangchuxiao 1bb634bc6f merge code 2022-04-15 12:03:23 +08:00
wenxu12345 ef4d0c3c42 log 2022-04-06 15:33:16 +08:00
wenxu12345 aa673a3a5c log 2022-04-05 20:06:08 +08:00
wenxu12345 0232f52281 log 2022-04-05 19:31:35 +08:00
wenxu12345 6efe13d142 log 2022-04-05 16:41:37 +08:00
wenxu12345 f87038622b set gin log 2022-04-05 15:07:34 +08:00
wangchuxiao 929c5e7a5b Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-31 14:50:17 +08:00
wangchuxiao d600042110 tag and set private tips 2022-03-31 14:50:02 +08:00
wenxu12345 ecd2f0e2bf Merge log files 2022-03-31 11:15:06 +08:00
skiffer-git 1aeff25316 mute group 2022-03-29 11:48:17 +08:00
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
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 9d29d49ada group dismissed 2022-03-24 15:33:30 +08:00
wangchuxiao e6c36411cb mongo 2022-03-23 15:44:34 +08:00
马守越 1ab3e04cba 新增mongo.dbUrl配置 (#174) 
* 当dbUri值不为空则直接使用该值

* 新增支持ali oss

Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn>
 2022-03-21 11:13:17 +08:00
wangchuxiao 366f7621fa rtc add 2022-03-17 19:00:05 +08:00
wangchuxiao f02fb7ba15 rtc add 2022-03-17 12:48:54 +08:00
wangchuxiao 8fef1f975a rtc add 2022-03-16 20:37:37 +08:00
wangchuxiao b0aa168c9a rtc add 2022-03-16 18:02:26 +08:00
wangchuxiao 51c2f845d8 opt 2022-03-11 17:37:01 +08:00
wangchuxiao bcae7720e1 add callback 2022-03-04 14:27:54 +08:00
wangchuxiao 6e9b9341d4 mini cr 2022-02-18 17:06:27 +08:00
wangchuxiao b80c8013c0 add user req group reqlist api 2022-02-09 19:19:22 +08:00
Gordon e4f87b53b4 protocol modify 2022-01-20 11:53:57 +08:00
wenxu12345 14ccbf335d Refactor code 2022-01-19 17:17:51 +08:00
wenxu12345 a2440a2e80 Refactor code 2022-01-15 15:30:48 +08:00
wenxu12345 17b96dd7c1 Refactor code 2022-01-15 15:25:12 +08:00
Gordon 0db2c271a0 proto json tag modify 2022-01-14 09:51:43 +08:00
wenxu12345 89eb39ca3e Refactor code 2022-01-13 11:10:29 +08:00
wenxu12345 eb417c7e22 Refactor code 2021-12-30 21:03:52 +08:00
Gordon 627419aa5f add null value handle 2021-12-30 17:56:12 +08:00
Gordon aa99e710d1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 
# Conflicts:
#	cmd/open_im_api/main.go
#	internal/api/group/group.go
 2021-12-30 17:55:32 +08:00
Gordon fdf1c0448b add null value handle 2021-12-30 17:48:20 +08:00
wenxu12345 0c02afa54e Refactor code 2021-12-30 17:34:54 +08:00
Gordon 7301bc30b1 add null value handle 2021-12-30 16:53:06 +08:00