Commit Graph

4733 Commits

Author SHA1 Message Date
Kwoth
2bd4949439 .logevents fixed 2017-02-17 23:57:28 +01:00
Master Kwoth
8af17195fb Merge pull request #1061 from shikhir-arora/dev
Add search by keyword and portion of quote command
2017-02-17 23:18:27 +01:00
Shikhir Arora
5bfdeb07a3 Merge remote-tracking branch 'origin/dev' into dev 2017-02-17 17:14:30 -05:00
Shikhir Arora
8ab9b57c7d Merge remote-tracking branch 'Kwoth/dev' into dev 2017-02-17 17:14:22 -05:00
Shikhir Arora
a878aa8fa3 remove alias ... 2017-02-17 17:13:43 -05:00
Shikhir Arora
244e05bd89 Update CommandStrings.Designer.cs
remove alias ...
2017-02-17 17:13:06 -05:00
Master Kwoth
3133144ffb Merge pull request #1069 from ManuelFte/dev
README a little prettier
2017-02-17 22:32:23 +01:00
Manuel de la Fuente
cd2642b921 My bad? (the markdown preview didn't show any error though) 2017-02-17 15:04:03 -06:00
Manuel de la Fuente
9ca376c4fd Fixed a typo and put the bottom links in a table to look better 2017-02-17 14:58:40 -06:00
Master Kwoth
9c85d44fa2 Merge pull request #1068 from samdivaio/patch-1
Update README.md
2017-02-17 17:13:25 +01:00
samvaio
407df07b52 Update README.md 2017-02-17 21:38:34 +05:30
Kwoth
ffdfd0e84e word and invite filtering work on edited messages too, now 2017-02-17 15:20:28 +01:00
Kwoth
d5987f3331 ../... now support embeds too 2017-02-17 15:06:44 +01:00
Kwoth
eeb9ff9370 $$$ is smarter, $startevent flowerreaction X - x is number of flowers to award 2017-02-17 14:53:13 +01:00
Kwoth
9f69532d7b ~g fix 2017-02-17 14:43:32 +01:00
Kwoth
33bc565571 fixed rare randomcat bug 2017-02-17 14:26:32 +01:00
Kwoth
40989604e9 fixed current time on repeating songs 2017-02-17 13:57:01 +01:00
Kwoth
b588da43e5 !!ap bug fixed 2017-02-17 13:11:24 +01:00
Kwoth
cf686a20c3 owner channel bugs fixed, you can now see files sent to the bot 2017-02-17 12:05:05 +01:00
Kwoth
e65e47ba1f Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2017-02-17 11:38:25 +01:00
Kwoth
28563c1f0b fixed !!ms on local songs 2017-02-17 11:38:06 +01:00
Shikhir Arora
021298b5fe Merge remote-tracking branch 'Kwoth/dev' into dev 2017-02-16 18:04:28 -05:00
Master Kwoth
d104d86df5 updated front page, thanks to rjt 2017-02-16 23:55:36 +01:00
Shikhir Arora
3cfad1fdbb Merge remote-tracking branch 'Kwoth/dev' into dev 2017-02-16 15:50:13 -05:00
Kwoth
9f9548b33b stats should work properly now 2017-02-16 21:49:30 +01:00
Shikhir Arora
3e571fbf3a Merge remote-tracking branch 'Kwoth/dev' into dev 2017-02-16 15:16:34 -05:00
Kwoth
b9673d5918 no idea what i did, locale won't be pink anymore though, thx aurora 2017-02-16 20:32:42 +01:00
Kwoth
7ce0702c78 banning, kicking and softbanning no longer have the delay at all. 2017-02-16 19:48:51 +01:00
Kwoth
ad2dd3a565 reduced the delay on .ban, .softban, and .kick to 1 second, from 2 2017-02-16 19:44:39 +01:00
Kwoth
108a9fb156 Fixes to music. Thanks to samvaio 2017-02-16 18:13:24 +01:00
Shikhir Arora
99417b5779 Merge remote-tracking branch 'Kwoth/dev' into dev 2017-02-16 11:51:58 -05:00
Kwoth
8eb2b980d1 Fixed random disconnects and reconnects 2017-02-16 17:47:37 +01:00
Shikhir Arora
1b81f01b05 Merge remote-tracking branch 'Kwoth/dev' into dev 2017-02-16 10:59:35 -05:00
Kwoth
e648ff7d48 I didn't save /facepalm 2017-02-16 16:37:15 +01:00
Kwoth
d8a04ed78b a few speedtyping fixes, some music experimentation 2017-02-16 16:34:14 +01:00
Shikhir Arora
96499d0514 Merge remote-tracking branch 'Kwoth/dev' into dev 2017-02-16 08:00:12 -05:00
Kwoth
fa20d8cc95 fixed self_assign_success key, thanks chf 2017-02-16 10:57:15 +01:00
Shikhir Arora
d8481a009d Merge remote-tracking branch 'origin/dev' into dev 2017-02-15 19:57:22 -05:00
Shikhir Arora
7aa86b313b Merge remote-tracking branch 'Kwoth/dev' into dev 2017-02-15 19:56:58 -05:00
Kwoth
615502fc07 fixed 5 administration response strings 2017-02-15 15:08:00 +01:00
Shikhir Arora
77f0a3b4ee Update CommandStrings.resx 2017-02-15 07:16:23 -05:00
Shikhir Arora
26e769c6dd Merge remote-tracking branch 'Kwoth/dev' into dev
# Conflicts:
#	src/NadekoBot/Resources/CommandStrings.resx
2017-02-15 07:10:31 -05:00
Shikhir Arora
d704e77124 Update CommandStrings.resx 2017-02-15 07:04:26 -05:00
Shikhir Arora
2a3eaa316a Revert "revert"
This reverts commit 641f26242c.
2017-02-15 06:57:16 -05:00
Shikhir Arora
56a8914423 Revert "matches latest dev"
This reverts commit b5db72fa1a.
2017-02-15 06:57:10 -05:00
Shikhir Arora
73ec3e43a1 Revert "Update"
This reverts commit 0ae08ec556.
2017-02-15 06:57:06 -05:00
Shikhir Arora
317edc2d94 Revert "revert"
This reverts commit 641f26242c.
2017-02-15 06:56:53 -05:00
Shikhir Arora
641f26242c revert 2017-02-15 06:24:23 -05:00
Kwoth
a5f0cf8abf ~yoda usage fix 2017-02-15 12:24:12 +01:00
Shikhir Arora
0ae08ec556 Update 2017-02-15 06:20:19 -05:00