github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 02:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,659 Commits 68 Branches 330 Tags 107 MiB
722422d460
Commit Graph

1659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jiahua.liu
9487fb7ab8 Merge branch 'master' of https://github.com/mamoe/mirai 
 Conflicts:
	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PushNotify.kt
 2020-01-27 20:57:53 +08:00
Him188
92c17de1be C2C Message update 2020-01-27 19:05:18 +08:00
jiahua.liu
016cc16b55 PushNotify 2020-01-27 18:14:31 +08:00
jiahua.liu
e5261cd757 Merge branch 'master' of https://github.com/mamoe/mirai 2020-01-27 17:42:16 +08:00
jiahua.liu
154c91e73b PushNotify 2020-01-27 17:42:04 +08:00
Him188
baee2d6366 Add asJceInput 2020-01-27 17:40:50 +08:00
jiahua.liu
c12e3ae15a Merge remote-tracking branch 'origin/master' 2020-01-27 17:32:19 +08:00
jiahua.liu
dccd4daedf PushNotify 2020-01-27 17:32:07 +08:00
Him188
b063081881
Update README.md 2020-01-27 13:30:49 +08:00
jiahua.liu
43a9ef42a5 Merge remote-tracking branch 'origin/master' 2020-01-27 13:05:34 +08:00
jiahua.liu
d8cd6625e5 Android SMS login - Incomplete 2020-01-27 13:05:15 +08:00
Him188
8c81ae268f Merge remote-tracking branch 'origin/master' 2020-01-26 21:43:10 +08:00
Him188
bc19e9ebb1 Cleanup 2020-01-26 21:42:47 +08:00
jiahua.liu
767b945a10 Android login Captcha complete 2020-01-26 17:32:55 +08:00
jiahua.liu
2d4e5ae939 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
 2020-01-26 17:32:21 +08:00
jiahua.liu
0d6582fb00 Android login Captcha complete 2020-01-26 17:30:45 +08:00
Him188
3e024dd487 Enhance Captcha flow 2020-01-26 16:41:08 +08:00
jiahua.liu
77e25ec863 Android login Captcha complete 2020-01-26 15:39:37 +08:00
jiahua.liu
302208f741 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
 2020-01-26 15:29:08 +08:00
jiahua.liu
33f9b22380 And Captcha 2020-01-26 15:28:54 +08:00
Him188
c1faf79436
Update README.md 2020-01-26 03:55:03 +08:00
Him188
1998d8fdc1 Use random key 2020-01-25 21:54:19 +08:00
Him188
f2878e14ec Fix member permission 2020-01-25 21:41:40 +08:00
jiahua.liu
d1c56633b8 Merge remote-tracking branch 'origin/master' 2020-01-25 21:41:00 +08:00
jiahua.liu
c9d40341a1 And Captcha 2020-01-25 21:40:47 +08:00
jiahua.liu
eabffb46c4 Console Update 2020-01-25 21:40:34 +08:00
Him188
d845413bbf Fix link 2020-01-25 21:36:54 +08:00
Him188
eb48af2c39 Image download support 2020-01-25 21:36:09 +08:00
Him188
6c2b435779 Android GroupMessage support 2020-01-25 21:20:13 +08:00
Him188
c42169a238 Merge remote-tracking branch 'origin/master' 2020-01-25 19:44:24 +08:00
Him188
a5ddba6e15 Proto classes 2020-01-25 19:44:13 +08:00
jiahua.liu
d8feefcc57 Console Update 2020-01-25 17:27:34 +08:00
jiahua.liu
f4b3dbfa1e Console Update 2020-01-25 17:23:48 +08:00
jiahua.liu
a9f9618f3f Console ConfigSection.kt 2020-01-25 17:02:43 +08:00
jiahua.liu
dcb8b0ac3d Merge remote-tracking branch 'origin/master' 2020-01-25 14:59:04 +08:00
jiahua.liu
5ff9bfa272 Console Command.kt 2020-01-25 14:58:49 +08:00
Him188
b6ae6ebd78
Update README.md 2020-01-25 13:04:53 +08:00
Him188
3728b76d9f
Update README.md 2020-01-25 13:00:43 +08:00
Him188
0ca9cc8ad0
Update README.md 2020-01-25 12:57:44 +08:00
Him188
1a0f024081 LoginError parsing 2020-01-24 18:02:56 +08:00
Him188
a1000b141b QQA Debugging update 2020-01-24 17:58:11 +08:00
Him188
7810127f7f QQA Debugging update 2020-01-24 17:57:13 +08:00
Him188
b1451f664c QQA Debugging update 2020-01-24 17:45:32 +08:00
Him188
9ff1ff604c QQA Debugging update 2020-01-24 17:44:25 +08:00
jiahua.liu
ddab66f165 Captcha supporting 2020-01-24 17:42:40 +08:00
jiahua.liu
a44874a2f2 Captcha supporting 2020-01-24 17:27:45 +08:00
jiahua.liu
cf2605713b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt
 2020-01-24 15:59:55 +08:00
jiahua.liu
c71ba67a2c push to work 2020-01-24 15:59:25 +08:00
Him188
7be3254716 QQA Debugging update 2020-01-24 15:29:37 +08:00
Him188
ecc2f4674c Merge remote-tracking branch 'origin/master' 2020-01-24 15:27:45 +08:00