Commit Graph

1113 Commits

Author SHA1 Message Date
Deathbybandaid
10a7785b90
Merge pull request #91 from SpiceBot/development
Development
2019-07-01 12:10:50 -04:00
Deathbybandaid
e13dc70757
Merge pull request #90 from deathbybandaid/development
Development
2019-07-01 12:10:27 -04:00
51c2c85999 tweak defs 2019-07-01 12:06:28 -04:00
03ae15cdcf test 2019-07-01 12:05:17 -04:00
1ead336e9b user command 2019-07-01 12:04:57 -04:00
49a60567af test 2019-07-01 12:02:35 -04:00
4a51c8e3f6 hmmmm
'
2019-07-01 11:10:37 -04:00
Deathbybandaid
57393a4209
Merge pull request #89 from SpiceBot/development
Development
2019-07-01 10:56:47 -04:00
Deathbybandaid
3233957794
Merge pull request #88 from deathbybandaid/development
Development
2019-07-01 10:56:19 -04:00
cc0ba58803 test 2019-07-01 10:51:40 -04:00
403887e2e9 tweak 2019-07-01 10:44:39 -04:00
f068c8d7cf test 2019-07-01 10:39:53 -04:00
5b7927cdf6 test 2019-07-01 10:39:02 -04:00
f93639e045 test 2019-07-01 10:37:21 -04:00
Deathbybandaid
c9f601608b
Merge pull request #87 from SpiceBot/development
Development
2019-07-01 10:32:56 -04:00
Deathbybandaid
4748a1e8d1
Merge pull request #86 from deathbybandaid/development
Development
2019-07-01 10:32:39 -04:00
71f395fd9d more user/channel tracking 2019-07-01 10:28:23 -04:00
0e69768a96 Merge branch 'development' of https://github.com/deathbybandaid/SpiceBot into development 2019-07-01 09:42:15 -04:00
31524fa4b1 update user tracking 2019-07-01 09:42:08 -04:00
af4c630b1c patch restart command 2019-06-30 19:06:50 -04:00
Deathbybandaid
2a2e4edc2f
Merge pull request #85 from SpiceBot/development
Development
2019-06-28 17:22:13 -04:00
Deathbybandaid
467e1befed
Merge pull request #84 from deathbybandaid/development
fix db access
2019-06-28 17:21:58 -04:00
Deathbybandaid
259d2f6e48
Merge pull request #83 from SpiceBot/development
Development
2019-06-28 17:15:41 -04:00
Deathbybandaid
2774851916
Merge pull request #82 from deathbybandaid/development
fixes
2019-06-28 17:15:25 -04:00
ac10cb6306 fix db access 2019-06-28 17:15:21 -04:00
e337df69be fixes 2019-06-28 17:10:58 -04:00
Deathbybandaid
4b15d6cb2a
Merge pull request #81 from SpiceBot/development
Development
2019-06-28 17:08:28 -04:00
Deathbybandaid
a3ea07a80b
Merge pull request #80 from deathbybandaid/development
trigger.sb["log_id"],
2019-06-28 17:07:58 -04:00
576049f05b trigger.sb["log_id"], 2019-06-28 17:03:34 -04:00
Deathbybandaid
4184d8d331
Merge pull request #79 from SpiceBot/development
Development
2019-06-28 17:01:08 -04:00
Deathbybandaid
c7c9ead4bd
Merge pull request #78 from deathbybandaid/development
Development
2019-06-28 17:00:51 -04:00
2cf402224f test 2019-06-28 16:51:29 -04:00
b5fa469598 test 2019-06-28 16:20:58 -04:00
14cf08c32f test 2019-06-28 16:19:49 -04:00
6cfec9d645 test 2019-06-28 16:17:43 -04:00
2614ee5b50 adjsut query prerun 2019-06-28 15:57:55 -04:00
f654d38671 args handle 2019-06-28 15:54:24 -04:00
13b8ca2345 realcomref 2019-06-28 15:51:14 -04:00
a39e257c39 better command disabling 2019-06-28 15:39:41 -04:00
cbe961048b messagelog errors 2019-06-28 15:22:29 -04:00
1ebf73f155 pass botcom 2019-06-28 14:59:58 -04:00
a375c6238d patches 2019-06-28 14:36:31 -04:00
0418e3e24c remove todo code 2019-06-28 14:33:46 -04:00
Deathbybandaid
4d40a112cb
Merge pull request #77 from SpiceBot/development
Development
2019-06-28 14:30:01 -04:00
Deathbybandaid
7d6b208e78
Merge pull request #76 from deathbybandaid/development
Development
2019-06-28 14:29:18 -04:00
4f5ba59cb6 good 2019-06-28 14:21:20 -04:00
cb0e66211b test 2019-06-28 14:17:55 -04:00
40bfccfef2 test 2019-06-28 13:57:17 -04:00
3a215b4975 fix nick_actual 2019-06-28 13:46:02 -04:00
ee313ea83a fix gitignore 2019-06-28 13:37:13 -04:00