1762 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
Him188	1a206612e5	Merge pull request #34 from uebian/master ... 处理禁言	2020-02-03 21:19:34 -06:00
uebian	60d03a9869	处理禁言	2020-02-04 11:13:02 +08:00
Him188	bf2a308f9f	Fix build	2020-02-04 10:35:58 +08:00
Him188	8e4226149c	Add fast-fail	2020-02-04 10:35:53 +08:00
Him188	d48f5e4a58	Move Unmute out of the object Mute	2020-02-04 10:31:38 +08:00
Him188	73e4dd7914	Add bot ref	2020-02-04 10:30:32 +08:00
Him188	f793a67ab3	close streams after copying	2020-02-04 08:53:57 +08:00
Him188	4e57eea779	Use kotlin rather that JDK9	2020-02-04 08:49:32 +08:00
Him188	6a605156e5	Error catching	2020-02-04 08:40:57 +08:00
Him188	a85b763f4e	Fix group message	2020-02-04 08:34:39 +08:00
Him188	5739f694c9	Merge remote-tracking branch 'origin/master'	2020-02-04 08:28:00 +08:00
Him188	af08f52236	Fix toExternalImage	2020-02-04 08:27:45 +08:00
Him188	9f0169c622	Fix md5	2020-02-04 08:27:32 +08:00
Him188	ce2654ee60	Update README.md	2020-02-03 23:48:11 +08:00
jiahua.liu	3bf219d7d3	Merge remote-tracking branch 'origin/master'	2020-02-03 23:04:52 +08:00
jiahua.liu	7efe20ac8b	Troop management - Mute member	2020-02-03 23:04:40 +08:00
Him188	c89076b4b9	Merge remote-tracking branch 'origin/master'	2020-02-03 23:03:44 +08:00
Him188	9c15287305	Fix missing file	2020-02-03 23:03:30 +08:00
jiahua.liu	a776b25b27	Merge remote-tracking branch 'origin/master'	2020-02-03 22:00:27 +08:00
jiahua.liu	df24d101bc	Troop management - Mute member	2020-02-03 22:00:14 +08:00
Him188	b240370f20	Add common filepath	2020-02-03 21:42:14 +08:00
Him188	9c318601a7	Merge remote-tracking branch 'origin/master' ... # Conflicts: # mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt # mirai-core-qqandroid/src/jvmTest/kotlin/test/ProtoBufDataClassGenerator.kt	2020-02-03 21:40:00 +08:00
Him188	35dca403bf	Image upload	2020-02-03 21:38:37 +08:00
Him188	4d192d975c	Merge pull request #33 from uebian/patch-1 ... 设置标准输入流	2020-02-03 04:20:51 -06:00
uebian	397d376bff	设置标准输入流	2020-02-03 10:10:24 +00:00
jiahua.liu	3d8c60cbd4	Troop management	2020-02-03 17:11:36 +08:00
jiahua.liu	870234a007	Merge remote-tracking branch 'origin/master'	2020-02-03 17:00:17 +08:00
jiahua.liu	c69502a9ea	Proto Bufs	2020-02-03 17:00:01 +08:00
Him188	8e54e71661	Fix group message	2020-02-03 16:58:23 +08:00
Him188	dc940ee0cc	CustomFace support	2020-02-03 16:31:35 +08:00
Him188	c13109cf5b	Merge remote-tracking branch 'origin/master'	2020-02-03 15:57:34 +08:00