Commits · 75f21405af68117de9fa7a9d2211708bf7636915 · MyCard / Mirai

You need to sign in or sign up before continuing.

27 Jan, 2020 19 commits
- Merge remote-tracking branch 'origin/master' · 75f21405
  jiahua.liu authored Jan 27, 2020
  
  75f21405
- push notify · 85d1b613
  jiahua.liu authored Jan 27, 2020
  
  85d1b613
- Merge remote-tracking branch 'origin/master' · fd60fad9
  Him188 authored Jan 27, 2020
  
  fd60fad9
- Jce · 4c9af1ab
  Him188 authored Jan 27, 2020
  
  4c9af1ab
- Push Notify Update · bfd185fc
  jiahua.liu authored Jan 27, 2020
  
  bfd185fc
- PushNotify · 81b34796
  jiahua.liu authored Jan 27, 2020
  
  81b34796
- Merge remote-tracking branch 'origin/master' · 63ab80a5
  jiahua.liu authored Jan 27, 2020
  
  63ab80a5
- C2C Message update · 33171b52
  Him188 authored Jan 27, 2020
  
  33171b52
- Merge branch 'master' of https://github.com/mamoe/mirai · 9487fb7a
  jiahua.liu authored Jan 27, 2020
```
 Conflicts:
	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PushNotify.kt
```
  9487fb7a
- C2C Message update · 92c17de1
  Him188 authored Jan 27, 2020
  
  92c17de1
- PushNotify · 016cc16b
  jiahua.liu authored Jan 27, 2020
  
  016cc16b
- Merge branch 'master' of https://github.com/mamoe/mirai · e5261cd7
  jiahua.liu authored Jan 27, 2020
  
  e5261cd7
- PushNotify · 154c91e7
  jiahua.liu authored Jan 27, 2020
  
  154c91e7
- Add asJceInput · baee2d63
  Him188 authored Jan 27, 2020
  
  baee2d63
- Merge remote-tracking branch 'origin/master' · c12e3ae1
  jiahua.liu authored Jan 27, 2020
  
  c12e3ae1
- PushNotify · dccd4dae
  jiahua.liu authored Jan 27, 2020
  
  dccd4dae
- Update README.md · b0630818
  Him188 authored Jan 27, 2020
  
  b0630818
- Merge remote-tracking branch 'origin/master' · 43a9ef42
  jiahua.liu authored Jan 27, 2020
  
  43a9ef42
- Android SMS login - Incomplete · d8cd6625
  jiahua.liu authored Jan 27, 2020
  
  d8cd6625
26 Jan, 2020 10 commits
- Merge remote-tracking branch 'origin/master' · 8c81ae26
  Him188 authored Jan 26, 2020
  
  8c81ae26
- Cleanup · bc19e9eb
  Him188 authored Jan 26, 2020
  
  bc19e9eb
- Android login Captcha complete · 767b945a
  jiahua.liu authored Jan 26, 2020
  
  767b945a
- Merge remote-tracking branch 'origin/master' · 2d4e5ae9
  jiahua.liu authored Jan 26, 2020
```
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
```
  2d4e5ae9
- Android login Captcha complete · 0d6582fb
  jiahua.liu authored Jan 26, 2020
  
  0d6582fb
- Enhance Captcha flow · 3e024dd4
  Him188 authored Jan 26, 2020
  
  3e024dd4
- Android login Captcha complete · 77e25ec8
  jiahua.liu authored Jan 26, 2020
  
  77e25ec8
- Merge remote-tracking branch 'origin/master' · 302208f7
  jiahua.liu authored Jan 26, 2020
```
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
```
  302208f7
- And Captcha · 33f9b223
  jiahua.liu authored Jan 26, 2020
  
  33f9b223
- Update README.md · c1faf794
  Him188 authored Jan 26, 2020
  
  c1faf794
25 Jan, 2020 11 commits
- Use random key · 1998d8fd
  Him188 authored Jan 25, 2020
  
  1998d8fd
- Fix member permission · f2878e14
  Him188 authored Jan 25, 2020
  
  f2878e14
- Merge remote-tracking branch 'origin/master' · d1c56633
  jiahua.liu authored Jan 25, 2020
  
  d1c56633
- And Captcha · c9d40341
  jiahua.liu authored Jan 25, 2020
  
  c9d40341
- Console Update · eabffb46
  jiahua.liu authored Jan 25, 2020
  
  eabffb46
- Fix link · d845413b
  Him188 authored Jan 25, 2020
  
  d845413b
- Image download support · eb48af2c
  Him188 authored Jan 25, 2020
  
  eb48af2c
- Android GroupMessage support · 6c2b4357
  Him188 authored Jan 25, 2020
  
  6c2b4357
- Merge remote-tracking branch 'origin/master' · c42169a2
  Him188 authored Jan 25, 2020
  
  c42169a2
- Proto classes · a5ddba6e
  Him188 authored Jan 25, 2020
  
  a5ddba6e
- Console Update · d8feefcc
  jiahua.liu authored Jan 25, 2020
  
  d8feefcc