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

1195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinwei Xiong a2da40ceab Merge pull request #1806 from openimsdk/cubxxw-patch-1 
Fix(release-v3.5) Enhance Component Monitoring with Dual Logging to Screen and File
 2024-01-24 15:05:40 +08:00
Xinwei Xiong add05a5f26 fix: Update openim-tools.sh fix tools check 2024-01-24 15:02:32 +08:00
Brabem 776081b35d fix: add message typing field and fix the CallbackSingleMsgRead callback (#1784) 2024-01-19 18:28:30 +08:00
Xinwei Xiong 77f0b2460b Merge pull request #1774 from openimsdk/feat/set-docker-compose-pull-request 
fix(release-v3.5): Update docker-compose.yml
 2024-01-16 20:14:46 +08:00
Xinwei Xiong 8e5e792a60 Update release.sh 2024-01-16 10:57:45 +08:00
Xinwei Xiong 4c593d2436 Update release.sh 2024-01-16 10:57:30 +08:00
Xinwei Xiong 14838b0ac8 Update util.sh 2024-01-16 10:57:10 +08:00
Xinwei Xiong 2fb6674fc9 Update docker-compose.yml 2024-01-16 10:09:06 +08:00
Xinwei Xiong 3025c61a7a Merge pull request #1750 from AndrewZuo01/release-v3.5local 
fix(realease-v3.5): add more cases for get_users api, so it accept users in older version
 2024-01-16 10:04:05 +08:00
chao 077df0486e Merge pull request #1771 from withchao/release-v3.5 
feat: send msg at text (#1705)
 2024-01-15 17:49:24 +08:00
chao 820bf83102 feat: send msg at text (#1705) 
(cherry picked from commit ceb950a57f)
 2024-01-15 17:43:50 +08:00
Xinwei Xiong 6027d2dfa3 Merge pull request #1763 from openimsdk/cubxxw-patch-2 
Stability Enhancement: Pin Docker Compose Images for minio and openim-web
 2024-01-13 09:37:44 +08:00
Xinwei Xiong e6371f804d Update docker-compose.yml 2024-01-12 22:30:43 +08:00
AndrewZuo01 de54be961f Merge remote-tracking branch 'origin/release-v3.5local' into release-v3.5local 
# Conflicts:
#	pkg/common/db/mgo/user.go
 2024-01-12 21:33:37 +08:00
AndrewZuo01 4cc3e0b194 fix find user 2024-01-12 21:27:34 +08:00
Xinwei Xiong c7a884511b Update docker-compose.yml (#1760) 2024-01-12 21:16:56 +08:00
OpenIM Robot e5083d5809 Merge pull request #1758 from openimsdk/cubxxw-patch-1 
Update openim-tools.sh  tools scripts images
 2024-01-12 20:22:13 +08:00
Xinwei Xiong 266237861b Update openim-tools.sh 2024-01-12 20:21:36 +08:00
Xinwei Xiong 0aae970298 update release-v3.5 (#1755) 
* update release-v3.5

* Update check-all.sh

* Update util.sh
 2024-01-12 18:32:32 +08:00
AndrewZuo01 3be16ce3e8 fix pageFindUser 2024-01-12 15:19:40 +08:00
Xinwei Xiong c4a140043c Merge pull request #1748 from openimsdk/feat/add-openim-docs 
docs: update oepnim docs openim-tools images
 2024-01-12 13:49:04 +08:00
Xinwei Xiong 66bf8496b8 Update openim-tools.sh 2024-01-12 13:43:09 +08:00
Xinwei Xiong ce32c8d9c1 Update openim-tools.sh 2024-01-12 13:42:38 +08:00
Xinwei Xiong 760a119015 docs: update oepnim docs openim-tools images 2024-01-12 13:40:43 +08:00
Xinwei Xiong d236f4070c Merge pull request #1747 from withchao/release-v3.5 
fix: NotificationUserInfoUpdate not notified
 2024-01-12 11:31:44 +08:00
withchao a412ab33a6 fix: NotificationUserInfoUpdate 
(cherry picked from commit 48ff03f854)
 2024-01-12 11:20:53 +08:00
Xinwei Xiong ef19cf4f8d Merge pull request #1744 from AndrewZuo01/3.5 
fix update friends
 2024-01-11 20:56:40 +08:00
AndrewZuo01 07dfde965c fix update friends 2024-01-11 20:41:24 +08:00
Xinwei Xiong afac910ecf Merge pull request #1741 from withchao/release-v3.5 
fix: GroupApplicationRejectedNotification not notification apply for userID
 2024-01-11 18:28:20 +08:00
withchao c2b8279ddc fix: GroupApplicationAcceptedNotification 2024-01-11 16:31:24 +08:00
withchao 0c745782b0 fix: GroupApplicationAcceptedNotification 
(cherry picked from commit 4c3c4555a3)
 2024-01-11 14:51:42 +08:00
Xinwei Xiong 2ba45691c4 Merge pull request #1737 from luhaoling/realea3.5 
fix: fix the mongo search error
 2024-01-10 20:55:12 +08:00
luhaoling 8d5d54af33 fix: fix the mongo search error 2024-01-10 18:24:24 +08:00
Xinwei Xiong 571e239992 Merge pull request #1729 from luhaoling/realea3.5 
fix: fix the getSortedConversationList api
 2024-01-10 10:14:20 +08:00
luhaoling 159822e207 fix: fix the getSortedConversation api 2024-01-09 18:58:17 +08:00
luhaoling 89b59eb82e fix: fix the valiable name 2024-01-09 18:48:58 +08:00
Xinwei Xiong 76b35210aa Merge pull request #1719 from FGadvancer/release-v3.5 
fix: group messages sync failed.
v3.5.1-alpha.1 		2024-01-09 10:57:38 +08:00
Gordon 093f9a3b34 fix: group messages sync failed. 2024-01-09 10:17:39 +08:00
Xinwei Xiong 7ad8a7241d Merge pull request #1712 from luhaoling/realea3.5 
fix: fix some bug
 2024-01-08 21:37:56 +08:00
luhaoling c71bcefcbe fix: fix some bug 2024-01-08 18:27:50 +08:00
Xinwei Xiong c4a8602428 Merge pull request #1690 from openimsdk/feat/optimizing-mongo-env 
fix openim config mongo passwd env
 2024-01-05 10:10:35 +08:00
Xinwei Xiong (cubxxw) b17b364b02 fix openim config mongo passwd env 
Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
 2024-01-05 10:02:37 +08:00
Xinwei Xiong 7e2c535f37 Merge pull request #1687 from openimsdk/main 
rebase openim main to release-v3.5
 2024-01-04 20:57:56 +08:00
Xinwei Xiong e0244d9ca7 Update docker-start-all.sh fix MSG_TRANSFER_PROM_PORT (#1679) 
* fix: fix the bug

* fix: fix the imAdmin permission and searchNoficitaion resp

* 2023 Annual Summary Reflections and Aspirations

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* fix: dissmissGroup and lack of keyword bug (#1678)

* Update docker-start-all.sh

* Update env-template.yaml

* Update docker-start-all.sh

---------

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
Co-authored-by: luhaoling <2198702716@qq.com>
Co-authored-by: Brabem <69128477+luhaoling@users.noreply.github.com>
Co-authored-by: OpenIM Bot <124379614+kubbot@users.noreply.github.com>
 2024-01-04 12:51:21 +00:00
skiffer-git 6764fa5e70 MongoDB supports non-root users (#1684) 
* MongoDB supports non-root users

Signed-off-by: skiffer-git <44203734@qq.com>

* Update component.go

* Update env-template.yaml

* Update docker-compose.yml

* Update environment.sh

* Update openim.yaml

* Update mongo-init.sh

---------

Signed-off-by: skiffer-git <44203734@qq.com>
Co-authored-by: Xinwei Xiong <3293172751@qq.com>
 2024-01-04 12:50:29 +00:00
OpenIM Robot a3acba5eea Merge pull request #1683 from openimsdk/cubxxw-patch-2 
Update docker-start-all.sh
 2024-01-04 18:25:20 +08:00
Xinwei Xiong baf0d1888c Update docker-start-all.sh 2024-01-04 18:24:54 +08:00
Xinwei Xiong 5b99eb21e7 Merge pull request #1680 from openimsdk/cubxxw-patch-1 
Update docker-start-all.sh fix MSG_TRANSFER_PROM_PORT
 2024-01-04 17:43:26 +08:00
OpenIM Bot 58ab340d1e Update env-template.yaml 2024-01-04 17:42:57 +08:00
Xinwei Xiong d8eec588de Merge branch 'release-v3.5' into cubxxw-patch-1 2024-01-04 17:40:40 +08:00