sir-lancebot - A mirrored copy of the python-discord/sir-lancebot repository.

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