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

216 Commits

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
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 574c7600e0 tag 2022-03-28 16:02:31 +08:00
wangchuxiao dc1a0f050e tag 2022-03-28 14:54:46 +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 e7b95892ff minio upload api 2022-03-23 17:40:51 +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 e6c36411cb mongo 2022-03-23 15:44:34 +08:00
wangchuxiao 8034ddc413 mongo 2022-03-22 14:30:07 +08:00
wangchuxiao e75adb165a mongo 2022-03-21 19:36:10 +08:00
wangchuxiao 09ce0d5285 mongo 2022-03-21 19:19:33 +08:00
wangchuxiao 8a38646bc5 mongo 2022-03-21 16:56:52 +08:00
Gordon a2b65f52f6 fix group create bug 2022-03-21 15:45:26 +08:00
jaonzyx c16d8da784 管理员创建群组bug fix (#168) 2022-03-21 15:43:43 +08:00
Gordon ea6d472002 pr modify and update 2022-03-21 14:59:00 +08:00
hxnets 6c43f75f9f 新增阿里云OSS文件上传参数获取接口 (#115) 
* configure update

* mongo:4.0

* open-im-server -> open_im_server

* sleep 15

* 0.0.0.0

* sleep 10 15

* Update config.yaml

* config

* Update docker-compose.yaml

* Update config.yaml

* Create ISSUE_TEMPLATE.md

* Update ISSUE_TEMPLATE.md

* Create ISSUE_TEMPLATE

* add issue template

* add issue template

* add issue template

* add issue template

* Update README.md

* script

* script

* script

* config

* script

* config update

* script update

* image: openim/open_im_server:v1.0.6

* script

* script

* script

* version update

* sender message sync

* version update

* 阿里云oss sts上传参数

* 阿里云oss sts上传参数

Co-authored-by: wenxu12345 <44203734@qq.com>
Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>
Co-authored-by: Gordon <1432970085@qq.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
 2022-03-21 14:43:41 +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 58cea3e947 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-17 12:49:00 +08:00
wangchuxiao f02fb7ba15 rtc add 2022-03-17 12:48:54 +08:00
wenxu12345 7bdf6717e1 add log 2022-03-17 11:57:21 +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 3693d2e93d conversation table 2022-03-13 10:07:31 +08:00
wangchuxiao 51c2f845d8 opt 2022-03-11 17:37:01 +08:00
wenxu12345 0e575a9366 keepalive ttl * 3 
add user.ex
 2022-03-08 18:48:36 +08:00
wangchuxiao bcae7720e1 add callback 2022-03-04 14:27:54 +08:00
wangchuxiao 60e29cc894 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-02 19:07:28 +08:00
wangchuxiao dcfd802757 callback add 2022-03-02 19:07:17 +08:00
Gordon 0e9e02de0b statistics code 2022-03-01 15:53:33 +08:00
wangchuxiao 0bed7ee669 merge code 2022-02-28 17:57:03 +08:00
wangchuxiao 7d8d314962 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-28 17:52:25 +08:00
wangchuxiao f01a6e82dc fix minio bug 2022-02-28 17:52:13 +08:00
wangchuxiao 67d7ee2751 fix bug 2022-02-28 17:47:53 +08:00
Gordon 0410003ceb api update 2022-02-24 18:08:53 +08:00
wangchuxiao a3fb32dfc6 fix bug and add reset pwd api 2022-02-21 16:41:56 +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 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
wenxu12345 17954dfdc9 Refactoring code 2022-02-16 19:41:44 +08:00
wenxu12345 8c357ec213 Refactoring code 2022-02-16 18:30:24 +08:00
wangchuxiao 648a852ba7 conversation opt 2022-02-15 14:11:20 +08:00
wangchuxiao 22bfb6be4b merge code 2022-02-14 10:46:32 +08:00
wenxu12345 3103c33dda Refactor code 2022-02-11 18:57:37 +08:00