aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge remote-tracking branch 'upstream/master' into candy-collectionGravatar mathsman51332018-10-12-28/+667
|\
| * The app was logging to the wrong directory. This is now fixed. Also silenced ↵Gravatar Leon Sandøy2018-10-12-2/+4
| | | | | | | | websockets logging
| * Merging in masterGravatar Leon Sandøy2018-10-12-5/+8
| |\
| | * improving the .help docstrings, and making the bot load cogs from the ↵Gravatar Leon Sandøy2018-10-11-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | correct path. (#43) * Improving some docstrings and making it look in ./bot/cogs for cogs. * Removing pointless stuff from a docstring
| * | Fixing halloweenify json pathGravatar Leon Sandøy2018-10-12-1/+4
| |/
| * Remove extra lines in build scriptGravatar Gareth Coles2018-10-11-3/+0
| |
| * Merge pull request #42 from discord-python/deployGravatar Leon Sandøy2018-10-11-4/+67
| |\ | | | | | | Automatic deployment with Docker
| | * Linting. Thanks fellas.Gravatar Gareth Coles2018-10-11-2/+0
| | |
| | * Merge remote-tracking branch 'origin/master' into deployGravatar Gareth Coles2018-10-11-40/+116
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | # Conflicts: # bot/__init__.py # bot/__main__.py # bot/cogs/hacktoberstats.py # bot/cogs/movie.py
| * | Merge pull request #40 from hundredrab/spooky-reactsGravatar Daniel Brown2018-10-11-0/+33
| |\ \ | | | | | | | | Fix #27: Add spooky reactions.
| | * | Add skull-and-crossbones to spookyreacts.Gravatar hundredrab2018-10-11-1/+2
| | | |
| | * | Fix #27: Add spooky reactions.Gravatar hundredrab2018-10-11-0/+32
| | | |
| * | | Merge pull request #41 from discord-python/fixupGravatar Leon Sandøy2018-10-11-46/+93
| |\ \ \ | | |/ / | |/| | Various critical fixes.
| | * | Made the movie formatter less naïve. It no longer crashes if TMDB's return ↵Gravatar Leon Sandøy2018-10-11-12/+39
| | | | | | | | | | | | | | | | data is incomplete.
| | * | Adding Pale Man, fixing all flake8 issues, converting halloweenify to use ↵Gravatar Leon Sandøy2018-10-11-34/+54
| |/ / | | | | | | | | | aiohttp, fixing broken logging, ignoring irrelevant loggers, and turning the script into a valid module script.
| | * Run bash script with bashGravatar Gareth Coles2018-10-11-1/+1
| | |
| | * Deployment is working nowGravatar Gareth Coles2018-10-11-7/+7
| | |
| | * Remove extra params to pepperGravatar Gareth Coles2018-10-10-4/+1
| | |
| | * Make pepper behave more suitably for deploymentGravatar Gareth Coles2018-10-10-1/+1
| | |
| | * Pepper: Fixed syntax againGravatar Gareth Coles2018-10-10-3/+3
| | |
| | * Pepper: See no evil..Gravatar Gareth Coles2018-10-10-3/+3
| | |
| | * Pepper params are key=valueGravatar Gareth Coles2018-10-10-1/+4
| | |
| | * Update vars in build.shGravatar Gareth Coles2018-10-10-2/+1
| | |
| | * Move pepper command to build.shGravatar Gareth Coles2018-10-10-1/+3
| | |
| | * Let's try that again wthout a broken configGravatar Gareth Coles2018-10-10-1/+1
| | |
| | * Attempt to fix PepperGravatar Gareth Coles2018-10-10-1/+1
| | |
| | * Apparently Pepper prompts for the password these daysGravatar Gareth Coles2018-10-10-1/+1
| | |
| | * Silence PepperGravatar Gareth Coles2018-10-10-1/+1
| | |
| | * Automatic deploymentGravatar Gareth Coles2018-10-10-1/+2
| | |
| | * Add compose fileGravatar Gareth Coles2018-10-10-0/+11
| | |
| | * Move some build steps to the script stageGravatar Gareth Coles2018-10-10-0/+2
| | |
| | * Corrected linting errors.Gravatar Daniel Brown2018-10-10-12/+16
| | |
| | * Travis only has dev builds of 3.7Gravatar Gareth Coles2018-10-10-1/+1
| | |
| | * Add travis CI YMLGravatar Gareth Coles2018-10-10-2/+18
| | |
| | * Move bot.py to __main__.py (Fixes #39)Gravatar Gareth Coles2018-10-10-0/+0
| | |
| | * Dockerfile and build scriptGravatar Gareth Coles2018-10-10-0/+34
| |/
| * Merge pull request #34 from markylon/masterGravatar Leon Sandøy2018-10-10-0/+126
| |\ | | | | | | Implement Halloweenify feature.
| | * Another cosmetic mistake.Gravatar Marko Kovačević2018-10-10-2/+2
| | |
| | * Missing newline.Gravatar Marko Kovačević2018-10-10-1/+1
| | |
| | * Ooops, reversed the emojis.Gravatar Marko Kovačević2018-10-10-1/+1
| | |
| | * Minor changes to the Embed.Gravatar Marko Kovačević2018-10-10-2/+2
| | |
| | * Change message to a more friendly one.Gravatar Marko Kovačević2018-10-10-2/+3
| | |
| | * Implement Halloweenify feature.Gravatar Marko Kovačević2018-10-09-0/+125
| | |
| * | Merge pull request #23 from rgables/masterGravatar Leon Sandøy2018-10-09-0/+99
| |\ \ | | | | | | | | Added cog for random scary movie
| | * | spellingGravatar Ryan Gables2018-10-09-2/+2
| | | |
| | * | Embeds movie data from TMDbGravatar Ryan Gables2018-10-09-27/+61
| | | |
| | * | made apikey env var + formatted omdb responseGravatar Ryan Gables2018-10-06-66/+65
| | | |
| | * | Roughed out omdb requestsGravatar Ryan Gables2018-10-06-0/+66
| | | |
| * | | Merge pull request #22 from ninexball/masterGravatar Leon Sandøy2018-10-09-3/+49
| |\ \ \ | | | | | | | | | | Logging Feature
| | * \ \ Merge branch 'master' into masterGravatar ninexball2018-10-08-0/+235
| | |\ \ \