open-im-server

aaron/open-im-server

Fork 0

Commit Graph

Select branches

Hide Pull Requests

cubxxw-patch-1

dependabot/docker/golang-1.22

dependabot/go_modules/gomod-deps-0d35c03994

dependabot/go_modules/google.golang.org/protobuf-1.33.0

dependabot/go_modules/tools/url2im/google.golang.org/protobuf-1.33.0

main

optimization/localcache

release-v3.0

release-v3.1

release-v3.2

release-v3.3

release-v3.4

release-v3.5

release-v3.6

sweep/add-unit-test-group-delete-member-hash_1

sweep/add-unit-test-remove-repeated-elements

sweep/assets

sweep/feat/optimize-openim-chat-merge-conflict_0

sweep/feat/optimize-openim-chat-merge-conflict_0_74074

sweep/fix-gha-failure

sweep/sweep_gha_fix_the_github_actions_run_fai

sweep/user-update-reset-time

test-develop

test-errcode

test-v2.3.0release

test-v3dev1

test/release-v3.3

v1.0.0

v1.0.1

v1.0.3

v1.0.4

v1.0.5

v1.0.6

v1.0.7

v1.3.0-alpha.4

v2.0.0

v2.0.1

v2.0.10

v2.0.2

v2.0.3

v2.0.5

v2.0.6

v2.0.7

v2.0.8

v2.0.9

v2.04

v2.1.0

v2.2.0

v2.3.0-rc0

v2.3.0-rc1

v2.3.0-rc2

v2.3.2

v2.3.3

v3.0.0

v3.0.0-alpha.0

v3.0.0-alpha.1

v3.0.0-rc.2

v3.0.1-beta.1

v3.0.1-beta.2

v3.0.1-beta.3

v3.0.1-beta.4

v3.0.1-beta.5

v3.0.1-beta.6

v3.1.0

v3.1.1-alpha.1

v3.1.1-alpha.2

v3.1.1-alpha.3

v3.1.1-beta.1

v3.1.1-beta.2

v3.1.1-beta.3

v3.1.1-beta.4

v3.1.2-beta.0

v3.1.2-beta.1

v3.1.2-beta.2

v3.1.2-beta.3

v3.2.0

v3.2.0-alpha.0

v3.2.0-rc.0

v3.2.1

v3.2.1-beta.4

v3.2.1-beta.5

v3.2.2

v3.2.2-alpha.0

v3.2.2-beta.0

v3.2.2-beta.1

v3.2.2-beta.2

v3.2.2-beta.3

v3.2.2-beta.4

v3.3.0

v3.3.0-alpha.1

v3.3.0-alpha.2

v3.3.0-alpha.3

v3.3.0-beta.0

v3.3.0-beta.1

v3.3.0-beta.2

v3.3.0-beta.3

v3.3.0-beta.4

v3.3.0-rc.0

v3.3.0-rc.1

v3.3.1

v3.3.1-beta.0

v3.3.2

v3.3.3-bate.4

v3.3.3-beta.0

v3.3.3-beta.1

v3.3.3-beta.2

v3.3.3-rc.0

v3.3.3-rc.1

v3.3.3-rc.2

v3.3.3-rc.3

v3.3.3-rc.4

v3.3.3-rc.5

v3.4.0

v3.4.0-rc.0

v3.4.0-rc.1

v3.4.2

v3.5.0

v3.5.0-beta.1

v3.5.0-rc.0

v3.5.0-rc.1

v3.5.0-rc.2

v3.5.0-rc.3

v3.5.0-rc.4

v3.5.0-rc.5

v3.5.0-rc.6

v3.5.0-rc.7

v3.5.0-rc.8

v3.5.1

v3.5.1-alpha.1

v3.5.1-alpha.2

v3.5.1-bate.1

v3.5.1-rc.0

v3.5.1-rc.1

v3.6.0

v3.6.1-beta.0

fc5ab3572e fix word wangchuxiao 2022-06-10 10:16:18 +08:00
891738747a fix word wangchuxiao 2022-06-09 19:36:51 +08:00
1c52e731e1 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup wangchuxiao 2022-06-09 19:35:09 +08:00
ee615fbadf fix word wangchuxiao 2022-06-09 19:34:52 +08:00
2ede9ef8ed add batch push Gordon 2022-06-09 18:24:32 +08:00
dbcfcafdfc fix word wangchuxiao 2022-06-09 18:16:23 +08:00
7d63c82ddd Merge remote-tracking branch 'origin/superGroup' into superGroup Gordon 2022-06-09 18:08:52 +08:00
1d4dc81e55 add batch push Gordon 2022-06-09 18:08:42 +08:00
ceca0f095b demo wangchuxiao 2022-06-09 17:24:30 +08:00
793996e047 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup wangchuxiao 2022-06-09 17:19:56 +08:00
ab76d46007 demo wangchuxiao 2022-06-09 17:19:39 +08:00
ed1e22bac5 Merge remote-tracking branch 'origin/superGroup' into superGroup skiffer-git 2022-06-09 17:04:52 +08:00
e57ce28d2b batch push skiffer-git 2022-06-09 17:04:16 +08:00
2b596e226a Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun wangchuxiao 2022-06-09 15:44:31 +08:00
c46f574aa8 fix bug wangchuxiao 2022-06-09 15:40:53 +08:00
9b4890a99f fix bug wangchuxiao 2022-06-09 15:33:37 +08:00
3f129513bb fix bug wangchuxiao 2022-06-09 15:33:28 +08:00
698490b936 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup wangchuxiao 2022-06-09 15:25:27 +08:00
c8bf95578c fix bug wangchuxiao 2022-06-09 15:25:02 +08:00
064132833c Merge remote-tracking branch 'origin/superGroup' into superGroup skiffer-git 2022-06-09 15:21:05 +08:00
60f8f93a02 batch push skiffer-git 2022-06-09 15:20:40 +08:00
7b08d98647 fix bug wangchuxiao 2022-06-09 14:58:43 +08:00
11e619d1b3 log skiffer-git 2022-06-09 14:26:18 +08:00
4f184a6723 batch push skiffer-git 2022-06-09 14:24:24 +08:00
5fd91e808a batch push skiffer-git 2022-06-09 14:07:09 +08:00
0dfa224aeb config for msg read receipt skiffer-git 2022-06-09 14:00:18 +08:00
32565dd188 config for msg read receipt skiffer-git 2022-06-09 13:57:10 +08:00
96f09c45f5 batch push skiffer-git 2022-06-09 13:12:46 +08:00
d2474c8a72 Merge remote-tracking branch 'origin/superGroup' into superGroup skiffer-git 2022-06-09 12:49:54 +08:00
9eb0dd5e70 batch push skiffer-git 2022-06-09 12:49:16 +08:00
bbdcb34ab6 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup wangchuxiao 2022-06-09 12:39:42 +08:00
6525d63459 fix bug wangchuxiao 2022-06-09 12:39:28 +08:00
0babf89aa5 Merge remote-tracking branch 'origin/superGroup' into superGroup skiffer-git 2022-06-08 20:26:41 +08:00
317e6f81bb batch push skiffer-git 2022-06-08 20:26:08 +08:00
ae684d6d39 fix bug wangchuxiao 2022-06-08 19:39:36 +08:00
d9710ac244 fix bug wangchuxiao 2022-06-08 19:27:04 +08:00
dff7a28094 fix bug wangchuxiao 2022-06-08 19:14:25 +08:00
da18950b3d fix bug wangchuxiao 2022-06-08 19:06:22 +08:00
6055ce9b6b fix bug wangchuxiao 2022-06-08 18:44:21 +08:00
bd14739a9e fix bug wangchuxiao 2022-06-08 18:40:07 +08:00
843cbe4f80 organization wangchuxiao 2022-06-08 18:24:20 +08:00
f650e73d5c fix bug wangchuxiao 2022-06-08 17:36:24 +08:00
d1293dd047 log Gordon 2022-06-08 17:34:39 +08:00
715e8a5000 Merge remote-tracking branch 'origin/tuoyun' into tuoyun Gordon 2022-06-08 17:24:31 +08:00
a7a69008d8 log Gordon 2022-06-08 17:24:22 +08:00
553b56d094 Merge remote-tracking branch 'origin/tuoyun' into tuoyun skiffer-git 2022-06-08 17:21:11 +08:00
fec57c4ed7 log skiffer-git 2022-06-08 17:20:39 +08:00
b46f106a91 log Gordon 2022-06-08 17:19:37 +08:00
0214419446 log Gordon 2022-06-08 17:17:55 +08:00
d587d14f86 log Gordon 2022-06-08 17:11:17 +08:00
a115151616 fix bug wangchuxiao 2022-06-08 17:08:47 +08:00
26771ee7d0 organization wangchuxiao 2022-06-08 17:07:16 +08:00
731263638b log Gordon 2022-06-08 16:53:58 +08:00
a4f69351ce fix bug wangchuxiao 2022-06-08 16:46:21 +08:00
fa5f234a38 fix bug wangchuxiao 2022-06-08 15:40:33 +08:00
5d2c981368 fix bug wangchuxiao 2022-06-08 15:27:50 +08:00
4a55842724 fix bug wangchuxiao 2022-06-08 15:26:31 +08:00
e9655ed05e fix bug wangchuxiao 2022-06-08 15:15:56 +08:00
ed7d2bbdd7 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup wangchuxiao 2022-06-08 15:07:19 +08:00
276328e0fd fix bug wangchuxiao 2022-06-08 15:05:57 +08:00
1bcd091330 Merge remote-tracking branch 'origin/superGroup' into superGroup Gordon 2022-06-08 11:43:11 +08:00
536d7e2957 ws pb Gordon 2022-06-08 10:32:21 +08:00
55e774344a ws pb Gordon 2022-06-08 10:32:21 +08:00
7d0c8b0c5f super group add notification Gordon 2022-06-07 19:02:19 +08:00
88c4cff50c Merge remote-tracking branch 'origin/superGroup' into superGroup Gordon 2022-06-07 18:45:09 +08:00
cfe01bb820 super group push Gordon 2022-06-07 18:45:00 +08:00
4f1bd4e509 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup wangchuxiao 2022-06-07 18:40:41 +08:00
88544a89b7 Merge remote-tracking branch 'origin/superGroup' into superGroup Gordon 2022-06-07 18:39:52 +08:00
a87e41eecd super group push Gordon 2022-06-07 18:39:43 +08:00
e52639d1d4 fix bug wangchuxiao 2022-06-07 18:36:06 +08:00
0463f5e83d fix bug skiffer-git 2022-06-07 18:25:08 +08:00
eb90314b38 Merge remote-tracking branch 'origin/superGroup' into superGroup skiffer-git 2022-06-07 18:10:02 +08:00
6ce1d60ebb log skiffer-git 2022-06-07 18:09:11 +08:00
5fa62c9fbd Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup wangchuxiao 2022-06-07 17:46:53 +08:00
ef93a1f42e add conversation sync Gordon 2022-06-07 17:45:07 +08:00
5f42748e1b Merge branch 'tuoyun' into superGroup wangchuxiao 2022-06-07 17:42:24 +08:00
269df23851 set group memberInfo wangchuxiao 2022-06-07 17:06:47 +08:00
c40dc64bd0 set group memberInfo wangchuxiao 2022-06-07 16:59:05 +08:00
2b150e3c1c KickUserOffline skiffer-git 2022-06-07 16:38:42 +08:00
f7c17ac7e7 Merge remote-tracking branch 'origin/superGroup' into superGroup skiffer-git 2022-06-07 16:29:31 +08:00
3f2638efaf KickUserOffline skiffer-git 2022-06-07 16:28:51 +08:00
f106664952 kick Gordon 2022-06-07 16:27:11 +08:00
afe8dcc1ff Merge remote-tracking branch 'origin/superGroup' into superGroup skiffer-git 2022-06-07 16:19:15 +08:00
8f1e439381 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun wangchuxiao 2022-06-07 16:18:32 +08:00
4418d031e1 log skiffer-git 2022-06-07 16:18:23 +08:00
f3fc452904 group set memberInfo wangchuxiao 2022-06-07 16:18:18 +08:00
89f40fe3de kick Gordon 2022-06-07 16:17:08 +08:00
f8962beca6 kick Gordon 2022-06-07 16:05:59 +08:00
dae1569f0e debug userid == "" skiffer-git 2022-06-07 14:02:11 +08:00
dd76c268c5 debug userid == "" skiffer-git 2022-06-07 13:50:35 +08:00
52c52f23d3 Merge remote-tracking branch 'origin/tuoyun' into tuoyun skiffer-git 2022-06-07 13:47:11 +08:00
3adcb9f164 debug userid == "" skiffer-git 2022-06-07 13:44:52 +08:00
0f1a061afe Merge remote-tracking branch 'origin/tuoyun' into tuoyun Gordon 2022-06-07 12:28:48 +08:00
95705cc95a log Gordon 2022-06-07 12:28:36 +08:00
07b652c1d4 singal offline push wangchuxiao 2022-06-07 12:08:53 +08:00
eac137a9a9 ForceLogout skiffer-git 2022-06-07 11:50:37 +08:00
6ec65965a4 log Gordon 2022-06-07 11:50:05 +08:00
290ae774e0 ForceLogout skiffer-git 2022-06-07 11:42:15 +08:00
31e12f682d Merge remote-tracking branch 'origin/tuoyun' into tuoyun Gordon 2022-06-07 11:24:37 +08:00
ae52f85502 log Gordon 2022-06-07 11:24:27 +08:00