Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pull request #1

Merged
merged 166 commits into from Oct 13, 2019
Merged

pull request #1

merged 166 commits into from Oct 13, 2019

Conversation

JackJiang2011
Copy link
Member

pull request

crossoverJie and others added 30 commits December 29, 2018 12:07
@crossoverJie
📝 Writing docs.
ee46809
@liaozan
Create .gitignore
a7b8084
@crossoverJie
🎨 去掉重复代码
5f44679
@crossoverJie
🎨 去掉重复代码
0d0ee77
@crossoverJie
Merge pull request #6 from liaozan/patch-1
7fe83c1 
Create .gitignore
@crossoverJie
📝 Writing docs.
ea1e4f3
@crossoverJie
📝 Writing docs.
e4e2fda
@crossoverJie
Merge branch 'master' into cim
79a1a00
@crossoverJie
📝 Writing docs.
2ee0f7f
@crossoverJie
📝 Writing docs.
67245c2
@crossoverJie
Merge pull request #7 from crossoverJie/cim
6e6d113 
CIM
@crossoverJie
✨ Introducing new features.优化
06f7df5
@crossoverJie
📝 Writing docs.
4af60fb
@crossoverJie
♻️ Refactoring code.
6897c21
@crossoverJie
📝 Writing docs.
6030775
@crossoverJie
📝 Writing docs.
b973c91
@crossoverJie
📝 Writing docs.
6f7aefb
@crossoverJie
📝 Writing docs.
062ab4f
@crossoverJie
📝 Writing docs.
b6608ad
@crossoverJie
Update issue templates
3f88820
@crossoverJie
Update bug_report.md
49134e0
@crossoverJie
Update bug_report.md
ad52349
@crossoverJie
🐛 Fixing a bug.登录状态判断
4406f72
@crossoverJie
🐛 Fixing a bug.登录状态判断
94585ea
@crossoverJie
🐛 Fixing a bug.登录状态判断
7622438
更新 README，增加本地客户端启动
65d47ef
@crossoverJie
🐛 Fixing a bug.修复一个redis连接的bug
f5f18c2
@crossoverJie
🎨 Improving structure / format of the code.
29a9995
@crossoverJie
✨ Introducing new features.异步写入聊天记录
f4dc588
@crossoverJie
✨ Introducing new features.异步写入聊天记录
49a8eef
crossoverJie and others added 29 commits August 30, 2019 17:10
@crossoverJie
⬇️ Downgrading dependencies.
b29a7ca
@crossoverJie
cim 1.0.5 (#51)
0f21d92 
cim 1.0.5
@crossoverJie
📝 Writing docs.
19540d8
@crossoverJie
✅ Adding tests.
bf6ea63
@crossoverJie
✅ Adding tests.
a6cb5f7
@crossoverJie
✨ Introducing new features.ring buffer delay task data struct
ef84de8
@crossoverJie
💡 Documenting source code.
ed5cc77
@crossoverJie
✨ Introducing new features.cim support delay msg
95a2d7f
@crossoverJie
📝 Writing docs.
25db1cf
@crossoverJie
📝 Writing docs.
01532b4
@crossoverJie
Merge pull request #57 from crossoverJie/cim-1.0.6
131f16d 
cim 1.0.6
@crossoverJie
📝 Writing docs.
f8275fe
@crossoverJie
✅ Adding tests.
6aa7684
@crossoverJie
✅ Adding tests.
1fb1324
@crossoverJie
💡 Documenting source code.
bfcf2a2
@crossoverJie
🐛 fix add repeat delay job exception
c3c036d
@crossoverJie
📝 Writing docs.
a93b14e
@crossoverJie
📝 Writing docs.
08dd86e
@crossoverJie
✅ Adding tests.
fe54a7e
@crossoverJie
✅ Adding tests.
f105b12
@crossoverJie
Merge branch 'master' into cim-1.0.6
726c239 
# Conflicts:
#	cim-common/src/main/java/com/crossoverjie/cim/common/data/construct/RingBufferWheel.java
#	cim-common/src/test/java/com/crossoverjie/cim/common/data/construct/RingBufferWheelTest.java
@crossoverJie
✨ 1. thread safe ---> addTask
0331dc3 
           2. to optimize the api
@crossoverJie
✅ Adding tests.
574ffe5
@crossoverJie
💡 Documenting source code.
5230a96
@crossoverJie
⚡ optimize RingBufferWheel api
f166bb0
@crossoverJie
Merge pull request #58 from crossoverJie/cim-1.0.7
c8d5251 
cim 1.0.7
@crossoverJie
✅ Adding tests.
9b50527
@crossoverJie
✅ Adding tests.
c46f3e3
@crossoverJie
✅ Adding tests.
f5a853f
@JackJiang2011 JackJiang2011 merged commit f83e939 into 52im:master Oct 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
7 participants
@JackJiang2011 @crossoverJie @liaozan @gitviscode @GinRyan @zaiyunduan123 @HNHYWL