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