fkndean
|
ffe9978284
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-12-03 13:36:51 -05:00 |
|
Kwoth
|
775ddaadea
|
More updates to stream notifications
|
2016-12-03 18:59:38 +01:00 |
|
fkndean
|
657ee9668e
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-12-03 08:57:00 -05:00 |
|
Kwoth
|
d76b683052
|
Guildconfigs now only query what it needs. Possibly broke a lot of stuff
|
2016-12-03 14:14:37 +01:00 |
|
Kwoth
|
c273241773
|
woopsie 2
|
2016-12-03 04:10:22 +01:00 |
|
Kwoth
|
7468324f55
|
woopsie
|
2016-12-03 03:58:47 +01:00 |
|
Kwoth
|
fe2b73d5cb
|
Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev
|
2016-12-03 03:37:02 +01:00 |
|
Kwoth
|
f2f7cb6418
|
Stream notification fixes, no more spam?
|
2016-12-03 03:36:02 +01:00 |
|
fkndean
|
2c7820e9c3
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-12-02 20:03:41 -05:00 |
|
Master Kwoth
|
eb299bf703
|
Merge pull request #841 from samdivaio/dev
Guides update
|
2016-12-02 18:10:40 +01:00 |
|
samvaio
|
4e136762c8
|
Update Frequently Asked Questions.md
|
2016-12-02 19:28:24 +05:30 |
|
samvaio
|
8862042df5
|
Update Frequently Asked Questions.md
|
2016-12-02 17:35:31 +05:30 |
|
samvaio
|
3aeba77885
|
Update Contribution Guide.md
|
2016-12-02 17:07:39 +05:30 |
|
samvaio
|
c60cbc8266
|
Update Upgrading Guide.md
|
2016-12-02 17:03:04 +05:30 |
|
samvaio
|
f76ad802a3
|
Update JSON Explanations.md
|
2016-12-02 16:43:17 +05:30 |
|
Master Kwoth
|
701bff23d1
|
Merge pull request #840 from samdivaio/dev
JSON guide updated
|
2016-12-02 11:42:21 +01:00 |
|
samvaio
|
d6876818fe
|
Update JSON Explanations.md
|
2016-12-02 07:54:19 +05:30 |
|
samvaio
|
b5153ab4d8
|
Update JSON Explanations.md
|
2016-12-02 07:52:32 +05:30 |
|
samvaio
|
00b4d17e22
|
Merge pull request #20 from Kwoth/dev
Update
|
2016-12-02 07:10:15 +05:30 |
|
samvaio
|
589238ed46
|
Update JSON Explanations.md
|
2016-12-02 06:54:28 +05:30 |
|
samvaio
|
731dac6b0c
|
Update JSON Explanations.md
|
2016-12-02 06:24:23 +05:30 |
|
Master Kwoth
|
becf870987
|
Merge pull request #839 from samdivaio/dev
avatar position changed
|
2016-12-02 01:52:28 +01:00 |
|
samvaio
|
be7b1e5c47
|
Update OSX Guide.md
|
2016-12-02 05:45:58 +05:30 |
|
Kwoth
|
2c2485c8bd
|
fixed ~safebooru image link
|
2016-12-01 23:19:19 +01:00 |
|
Kwoth
|
5583780fcb
|
Added actual responses to .lcr all, not count
|
2016-12-01 19:59:17 +01:00 |
|
fkndean
|
7dab400809
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-12-01 09:05:53 -05:00 |
|
samvaio
|
8e2d15e83f
|
Merge pull request #19 from Kwoth/dev
removed atf completely, closes #832
|
2016-12-01 17:44:22 +05:30 |
|
samvaio
|
1fe6b2a411
|
Update Administration.cs
|
2016-12-01 17:39:08 +05:30 |
|
samvaio
|
c5915a45d6
|
Update Administration.cs
|
2016-12-01 17:24:08 +05:30 |
|
samvaio
|
7dcf4f5a60
|
Update Administration.cs
|
2016-12-01 17:21:57 +05:30 |
|
samvaio
|
bd70dc21fd
|
Update Administration.cs
|
2016-12-01 17:20:27 +05:30 |
|
samvaio
|
2f1dedb33a
|
Update Administration.cs
|
2016-12-01 17:14:05 +05:30 |
|
samvaio
|
fbb50d4df2
|
Update Administration.cs
|
2016-12-01 17:08:25 +05:30 |
|
Kwoth
|
d4985f26dd
|
removed atf completely, closes #832
|
2016-12-01 12:33:52 +01:00 |
|
samvaio
|
c019ce3130
|
Update Administration.cs
|
2016-12-01 17:01:21 +05:30 |
|
samvaio
|
35f4725d0f
|
Update Administration.cs
|
2016-12-01 16:58:06 +05:30 |
|
samvaio
|
41a8936b72
|
Update Administration.cs
|
2016-12-01 16:51:09 +05:30 |
|
samvaio
|
c0eaf39607
|
Update Administration.cs
|
2016-12-01 16:49:58 +05:30 |
|
samvaio
|
7315f5dc79
|
Update InfoCommands.cs
|
2016-12-01 16:22:13 +05:30 |
|
samvaio
|
2c8f85106f
|
Update InfoCommands.cs
|
2016-12-01 16:01:14 +05:30 |
|
samvaio
|
b731b5a86e
|
Merge pull request #18 from Kwoth/dev
Up
|
2016-12-01 15:58:09 +05:30 |
|
samvaio
|
45ef5e9362
|
reverted
|
2016-12-01 15:56:53 +05:30 |
|
samvaio
|
cb815c2141
|
Delete Commands List.md
|
2016-12-01 15:22:59 +05:30 |
|
fkndean
|
ea379dcb9d
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-11-30 18:49:38 -05:00 |
|
Kwoth
|
140ec95e04
|
And proper return value
|
2016-12-01 00:45:39 +01:00 |
|
Kwoth
|
737fb09124
|
Fixed .greetdmmessage
|
2016-12-01 00:44:36 +01:00 |
|
fkndean
|
9f02a482ff
|
Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# src/NadekoBot/Modules/Utility/Utility.cs
# src/NadekoBot/Services/Impl/StatsService.cs
|
2016-11-30 18:41:27 -05:00 |
|
Kwoth
|
38c2dd3667
|
Cleverbot fixed
|
2016-11-30 20:34:31 +01:00 |
|
Kwoth
|
425efb2cb7
|
Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev
|
2016-11-30 20:15:32 +01:00 |
|
Kwoth
|
477a34a6ee
|
.stats much prettier, .SendErrorAsync added for normalized error messages
|
2016-11-30 20:15:22 +01:00 |
|