282 Commits

Author SHA1 Message Date
dustinpianalto
0c48f345b7
Delete modules.xml 2018-04-20 22:21:19 -08:00
dustinpianalto
9bde33b3c3
Delete misc.xml 2018-04-20 22:21:12 -08:00
dustinpianalto
3bff3e8276
Delete Geeksbot.iml 2018-04-20 22:21:04 -08:00
dustinpianalto
d27d85df19
Delete Dustin_Pianalto.xml 2018-04-20 22:20:54 -08:00
Dusty.P
2ba7f09065 Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development 2018-04-20 22:14:14 -08:00
Dusty.P
9f0997c492 Switching to asynpg 2018-04-20 22:10:10 -08:00
Dusty.P
f6864ddc0a Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development 2018-04-20 21:10:20 -08:00
Dusty.P
9b9a4e8227 Switching to asynpg 2018-04-20 21:10:05 -08:00
Dusty.P
c4fee255dc Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development 2018-04-20 21:08:50 -08:00
Dusty.P
a004c9c70c Deleted *.sh.swp 2018-04-20 21:08:30 -08:00
Dusty.P
f939df6bc0 Switching to asyncpg 2018-04-20 21:07:14 -08:00
Dusty.P
54eb8abfd6 Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development 2018-04-20 21:06:15 -08:00
Dusty.P
5495aa213e Switching to asyncpg 2018-04-20 21:06:01 -08:00
Dusty.P
dd5dab317d Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development 2018-04-20 21:04:57 -08:00
Dusty.P
fc4529bcba Ignore *.sh.swp 2018-04-20 21:04:10 -08:00
Dusty.P
9cc1004f38 Switching to asyncpg 2018-04-20 21:02:28 -08:00
Dusty.P
11ac36d5fd Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development 2018-04-20 20:58:45 -08:00
Dusty.P
13d4dc564c Switching to asyncpg 2018-04-20 20:58:24 -08:00
Dusty.P
4958e6ea02 Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development 2018-04-20 20:55:53 -08:00
Dusty.P
6244f8cb77 Switching to asyncpg 2018-04-20 20:55:28 -08:00
Dusty.P
34ed2717d4 Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development 2018-04-20 20:39:06 -08:00
Dusty.P
ab49f3a469 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	geeksbot.py
2018-04-20 20:38:46 -08:00
Dusty.P
da615a54ea Fixed db_con 2018-04-20 20:38:15 -08:00
Dusty.P
a38cdfb6e1 Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development 2018-04-20 20:37:17 -08:00
Dusty.P
9f552d76eb Fixed db_con 2018-04-20 20:36:07 -08:00
Dusty.P
9f849bdf29 Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development 2018-04-20 20:23:16 -08:00
Dusty.P
005f4ca25d Fixed Git Pull 2018-04-20 20:23:02 -08:00
Dusty.P
6d8f3531a7 Switching to fetchval 2018-04-20 20:11:55 -08:00
Dusty.P
9ef06824a7 Switching to fetchval 2018-04-20 19:49:01 -08:00
Dusty.P
0654bd51eb Merge remote-tracking branch 'origin/development' into development 2018-04-20 19:40:29 -08:00
Dusty.P
3a43e18c61 Switching to fetchval 2018-04-20 19:40:04 -08:00
Dusty.P
6d49bcea36 Switching to fetchval 2018-04-20 19:33:20 -08:00
Dusty.P
61f632a359 Added TODOs 2018-04-20 00:21:29 -08:00
Dustin Pianalto
8065d4d7d6 Merge remote-tracking branch 'origin/master' 2018-04-18 14:42:31 -08:00
Dustin Pianalto
7b94487ea0 Fixed layout on admin request list 2018-04-18 14:42:04 -08:00
Dustin Pianalto
6e5aaa0266 Fixed layout on admin request list 2018-04-18 14:36:09 -08:00
Dusty.P
76574f94a7 Began conversion to asyncpg for DB 2018-04-16 01:37:53 -08:00
Dusty.P
e5f8d513f1 Cleanup role command 2018-04-15 00:36:14 -08:00
Dusty.P
55b395b271 Cleanup role command 2018-04-15 00:21:13 -08:00
Dusty.P
927275d5b3 Move Google keys to bot_secrets.json 2018-04-15 00:08:56 -08:00
Dusty.P
5bc5eaefd1 Move Google keys to bot_secrets.json 2018-04-15 00:02:55 -08:00
Dusty.P
65b3bb39e3 Fix syntax errors 2018-04-14 23:49:13 -08:00
Dusty.P
2da878f3d6 Refactor to conform to PEP 8 styling 2018-04-14 23:42:40 -08:00
Dusty.P
55209e711e Fixed on_guild_join 2018-04-14 11:27:52 -08:00
Dusty.P
e53694155b Fixed syntax error 2018-04-14 11:05:54 -08:00
Dusty.P
083640a173 Fixed syntax error 2018-04-14 11:04:15 -08:00
Dusty.P
17efb1fcea Fixed syntax error 2018-04-14 11:02:20 -08:00
Dusty.P
72275a1baf Added git to auto load list 2018-04-14 11:01:27 -08:00
Dusty.P
7209e38cc8 Fixed syntax error 2018-04-14 11:00:47 -08:00
Dusty.P
33df91ab8f Updated all database queries to not use string formatting. 2018-04-14 10:57:23 -08:00