Commit Graph

1793 Commits

Author SHA1 Message Date
jiahua.liu
6f67edfdfa GetGroupOperationInfo 2020-02-05 21:31:22 +08:00
jiahua.liu
ff1c075f24 Group management Update 2020-02-05 00:45:29 +08:00
jiahua.liu
5f4ccf2fe9 Group management Update 2020-02-05 00:14:18 +08:00
jiahua.liu
ad71076620 Merge remote-tracking branch 'origin/master' 2020-02-04 23:54:36 +08:00
jiahua.liu
5c04ba445c Group management Update 2020-02-04 23:54:21 +08:00
Him188
76450c87f1
Merge pull request #37 from ryoii/master
http-api
2020-02-04 08:08:49 -06:00
ryoii
94c3e2f53d fix json parser polymorphic support 2020-02-04 22:06:39 +08:00
ryoii
2c9d38dffa Merge remote-tracking branch 'upsteam/master' 2020-02-04 21:08:26 +08:00
ryoii
377ce31fde fix Message Packet serialization 2020-02-04 21:06:40 +08:00
ryoii
9b4bacc243 remove AuthResDTO 2020-02-04 20:35:03 +08:00
ryoii
4ba2b34a81 fix StateCode serialization 2020-02-04 20:33:26 +08:00
ryoii
696889ba0c update json object 2020-02-04 20:13:18 +08:00
ryoii
04b71514e6 update MessageDTO 2020-02-04 20:06:15 +08:00
Him188
1ae688a03d Fix build 2020-02-04 19:01:00 +08:00
Him188
346f7e53fa Make MsgInfo.lFromUin and MsgInfo.uMsgTime nullable 2020-02-04 18:52:37 +08:00
Him188
8df1cfff55 Cleanup 2020-02-04 18:52:09 +08:00
Him188
f2f2de06a9 Fix at 2020-02-04 18:18:29 +08:00
ryoii
800b5cbacb handle no such element exception 2020-02-04 17:51:51 +08:00
ryoii
878d2ab850 fix serialize and rename 2020-02-04 17:51:51 +08:00
ryoii
4b9900e0bd base framework 2020-02-04 17:51:51 +08:00
jiahua.liu
30d41f6e9d Merge remote-tracking branch 'origin/master' 2020-02-04 17:23:26 +08:00
jiahua.liu
27ea93c8b0 Update Readme-CHN 2020-02-04 17:23:08 +08:00
Him188
32f0151817 Merge remote-tracking branch 'origin/master' 2020-02-04 17:12:49 +08:00
Him188
f244a12b8b Fix image 2020-02-04 17:11:57 +08:00
jiahua.liu
773fa9fa88 Update Readme-CHN 2020-02-04 16:25:26 +08:00
jiahua.liu
17d80b7287 Update Readme-CHN 2020-02-04 16:24:59 +08:00
jiahua.liu
768f21844f Update Readme-CHN 2020-02-04 16:24:30 +08:00
Him188
c83bf64a8a Merge remote-tracking branch 'origin/master' 2020-02-04 16:20:14 +08:00
jiahua.liu
88aba06dec Group Card 2020-02-04 16:16:06 +08:00
Him188
1922fdc5ba Merge remote-tracking branch 'origin/master' 2020-02-04 15:57:44 +08:00
jiahua.liu
35742632b3 Group Card 2020-02-04 15:56:43 +08:00
jiahua.liu
a76606ae0a to merge 2020-02-04 15:40:24 +08:00
jiahua.liu
5daf97015a Image Provider 2020-02-04 15:37:09 +08:00
jiahua.liu
44585d2df6 Merge remote-tracking branch 'origin/master' 2020-02-04 14:30:24 +08:00
jiahua.liu
39c32c7cb9 Bot Permission 2020-02-04 14:30:12 +08:00
Him188
2232d51a06 Fix build 2020-02-04 13:51:03 +08:00
Him188
a105a48350 Improve ContactList 2020-02-04 12:23:38 +08:00
Him188
bf64571717 Improve LockFreeLinkedList 2020-02-04 12:21:33 +08:00
Him188
42221c5d27 Remove isOnline 2020-02-04 12:09:00 +08:00
Him188
0c89e16c0a Remove debug print 2020-02-04 12:08:53 +08:00
Him188
59a70a59c8 Merge remote-tracking branch 'origin/master' 2020-02-04 12:04:50 +08:00
Him188
17455a3dce Add log 2020-02-04 12:04:34 +08:00
jiahua.liu
0bca1d193a Merge remote-tracking branch 'origin/master' 2020-02-04 12:04:08 +08:00
jiahua.liu
2805a14e25 to merge 2020-02-04 12:03:53 +08:00
Him188
d678d14a57 Merge remote-tracking branch 'origin/master' 2020-02-04 12:03:28 +08:00
Him188
e21ec9ed50 Add log 2020-02-04 12:03:16 +08:00
jiahua.liu
cdb0a89fa8 bot permissions 2020-02-04 11:53:14 +08:00
jiahua.liu
9b75902402 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
2020-02-04 11:33:25 +08:00
jiahua.liu
a68ad3adac Mute Permission 2020-02-04 11:32:13 +08:00
Him188
15d89f2bd1 Fix build 2020-02-04 11:23:12 +08:00