Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | fixing merge requests and preventing a race condition | 2018-11-20 | -2/+49 | |
|\ | ||||
| * | * Update channel ID. | 2018-10-17 | -6/+12 | |
| | | | | | | | | | | * Add class docstring. * Make `disconnect` a helper static method. | |||
| * | Add cog to play spooky sounds | 2018-10-14 | -0/+39 | |
| | | | | | | | | | | | | * Add SpookySound cog * Add sound files * Add PyNaCl to Pipfile (required for Discord voice) | |||
* | | flake8 | 2018-11-20 | -10/+10 | |
| | | ||||
* | | Cleaning up bats a bit | 2018-11-20 | -10/+2 | |
| | | ||||
* | | Solved merge conflicts | 2018-11-20 | -0/+52 | |
|\ \ | ||||
| * | | Add whitespace. | 2018-10-26 | -1/+1 | |
| | | | ||||
| * | | Merge branch 'master' of github.com:discord-python/hacktoberbot | 2018-10-26 | -34/+205 | |
| |\ \ | ||||
| * | | | Various minor fixes. | 2018-10-26 | -2/+4 | |
| | | | | ||||
| * | | | Add more spookifications. | 2018-10-22 | -1/+1 | |
| | | | | ||||
| * | | | Fix formatting and add docstrings. | 2018-10-21 | -1/+2 | |
| | | | | ||||
| * | | | Fix issues related to spookyavatar cog. | 2018-10-21 | -7/+11 | |
| | | | | ||||
| * | | | Add cog for avatar inversion. | 2018-10-21 | -0/+45 | |
| | |/ | |/| | ||||
* | | | Merge branch 'master' of github.com:python-discord/seasonalbot | 2018-11-20 | -2/+430 | |
|\ \ \ | ||||
| * \ \ | Merge pull request #67 from python-discord/dfitzpatrick-vote-monster-refactor | 2018-11-20 | -2/+194 | |
| |\ \ \ | | | | | | | | | | | Dfitzpatrick vote monster refactor | |||
| | * | | | It should work now. | 2018-11-20 | -5/+5 | |
| | | | | | ||||
| | * | | | Minor changes | 2018-11-20 | -193/+1 | |
| | | | | | ||||
| | * | | | Merge branch 'vote-monster-refactor' of ↵ | 2018-11-20 | -2/+194 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/dfitzpatrick/hacktoberbot into dfitzpatrick-vote-monster-refactor | |||
| | | * | | | Resolved PR comments. | 2018-10-31 | -37/+51 | |
| | | | | | | ||||
| | | * | | | Fixed linting issue in hacktoberstats | 2018-10-31 | -2/+2 | |
| | | | | | | ||||
| | | * | | | Merge branch 'master' of https://github.com/discord-python/hacktoberbot into ↵ | 2018-10-31 | -34/+280 | |
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | vote-monster-refactor | |||
| | | * | | | Resolved feedback from PR. Resolved lint extra spacing. | 2018-10-31 | -14/+31 | |
| | | | | | | ||||
| | | * | | | Merge branch 'master' of https://github.com/discord-python/hacktoberbot into ↵ | 2018-10-12 | -29/+101 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | vote-monster-refactor | |||
| | | * | | | | Fixed linting: Multiple imports on single line. | 2018-10-12 | -1/+3 | |
| | | | | | | | ||||
| | | * | | | | Finished MonsterSurvey cog. Added docstrings to all commands, refactored a ↵ | 2018-10-12 | -20/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | tiny bit of code within the two commands that you wrote. | |||
| | | * | | | | Refactor monstersurvey. Added leaderboard and show. | 2018-10-12 | -87/+90 | |
| | | | | | | | ||||
| | | * | | | | Merge branch 'deploy' of https://github.com/dfitzpatrick/hacktoberbot into ↵ | 2018-10-11 | -28/+58 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31-vote-for-favorite-monster # Conflicts: # Pipfile | |||
| | | * | | | | Merge branch 'deploy' of https://github.com/dfitzpatrick/hacktoberbot into ↵ | 2018-10-11 | -5/+9 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31-vote-for-favorite-monster # Conflicts: # Pipfile | |||
| | | | * | | | | Corrected linting errors. | 2018-10-10 | -5/+9 | |
| | | | | | | | | ||||
| | | * | | | | | Initial commit. | 2018-10-11 | -0/+74 | |
| | | |/ / / / | ||||
| | * | | | | | Adding the files this PR was supposed to have | 2018-11-20 | -0/+192 | |
| | | | | | | | ||||
| | * | | | | | Reverting changes on the conflicting file. | 2018-11-20 | -2/+2 | |
| | | | | | | | ||||
| * | | | | | | Merge pull request #33 from mathsman5133/candy-collection | 2018-11-19 | -0/+236 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Candy collection | |||
| | * | | | | | clean json file | 2018-10-14 | -19/+2 | |
| | | | | | | | ||||
| | * | | | | | fixed docstring and position of constants | 2018-10-14 | -24/+43 | |
| | | | | | | | ||||
| | * | | | | | Add that line back lol | 2018-10-13 | -1/+1 | |
| | | | | | | | ||||
| | * | | | | | Remove new line at end of file | 2018-10-13 | -2/+1 | |
| | | | | | | | ||||
| | * | | | | | Add new line and remove save variable (not used) | 2018-10-13 | -1/+1 | |
| | | | | | | | ||||
| | * | | | | | Fixed merged conflicts | 2018-10-12 | -4/+0 | |
| | | | | | | | ||||
| | * | | | | | Merge branch 'candy-collection' of ↵ | 2018-10-12 | -2/+6 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mathsman5133/hacktoberbot-1 into candy-collection | |||
| | | * | | | | | fixed colour for spooky msg | 2018-10-11 | -3/+3 | |
| | | | | | | | | ||||
| | | * | | | | | Update candy_collection.json | 2018-10-10 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | add new line | |||
| | | * | | | | | Update candy_collection.py | 2018-10-10 | -4/+3 | |
| | | | | | | | | ||||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into candy-collection | 2018-10-12 | -2/+227 | |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | ||||
| | * | | | | | | Fixed docstrings, add blank lines for readibility, method of finding last 10 ↵ | 2018-10-12 | -27/+51 | |
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | messages | |||
| | * | | | | | candy-collection | 2018-10-09 | -0/+211 | |
| | | | | | | | ||||
| | * | | | | | Delete candy_collection.py | 2018-10-09 | -186/+0 | |
| | | | | | | | ||||
| | * | | | | | Delete candy_collection.json | 2018-10-09 | -25/+0 | |
| | | | | | | | ||||
| | * | | | | | Add files via upload | 2018-10-09 | -0/+211 | |
| | | | | | | | ||||
* | | | | | | | solving some flake8 issues | 2018-11-20 | -4/+5 | |
| | | | | | | |