bot - A mirrored copy of the python-discord/bot repository.

	Commit message (Collapse)	Author	Age	Lines
...
\| \| \| \| \| \| \| * \| \| \|	Merge branch 'helper-talent-pool' of github.com:python-discord/bot into ↵	SebastiaanZ	2019-01-16	-1/+1
\| \| \| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	helper-talent-pool to update the branch to changes in master.
\| \| \| \| \| \| \| \| * \ \ \	Merge branch 'master' into helper-talent-pool	Chris Goes	2019-01-16	-1/+1
\| \| \| \| \| \| \| \| \|\ \ \ \ \| \| \| \| \|_\|_\|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \| \|	Changing incorrect type hinting for _parse_infraction_time and updating its ↵	SebastiaanZ	2019-01-16	-2/+6
\| \| \| \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docstring
\| \| \| \| \| \| \| * \| \| \|	Updating docstring for 'bigbrother nominate' command so it's equal to 'nominate'	SebastiaanZ	2019-01-14	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Separating the potential helper watch and bb watch by adding a separate ↵	SebastiaanZ	2019-01-14	-42/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nominate-command
\| \| \| \| \| \| \| \| \| * \|	Adding log.trace messages to decorator	SebastiaanZ	2019-01-18	-7/+16
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Adding redirection constants to contants.py and config-default.yml	SebastiaanZ	2019-01-18	-0/+10
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Redirecting output of help of regular users to bot-commands	SebastiaanZ	2019-01-18	-1/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Adding 'redirect_output' decorator to bot/decorators.py	SebastiaanZ	2019-01-18	-1/+30
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #283 from python-discord/rmq_fix	Joseph	2019-01-17	-16/+16
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert RMQ mod_log event name.
\| \| * \| \| \| \| \| \| \| \|	Revert RMQ mod_log event name.	Scragly	2019-01-17	-16/+16
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge pull request #282 from python-discord/rmq_log_move	Leon Sandøy	2019-01-17	-18/+18
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|	0% chance this will fuck anything up.
\| \| * \| \| \| \| \| \| \|	Move RMQ logs to devlog.	Scragly	2019-01-17	-18/+18
\| \|/ / / / / / / /
\| \| \| \| \| \| \| \| *	Move comment checking to after code extraction, use try:finally block for ↵	Scragly	2019-01-19	-13/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removing job entry.
\| \| \| \| \| \| \| \| *	The codeblock is already stripped later	scragly	2019-01-17	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: FrenchMasterSword <[email protected]>
\| \| \| \| \| \| \| \| *	Merge branch 'master' into master	scragly	2019-01-17	-314/+773
\| \| \| \| \| \| \| \| \|\ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #277 from python-discord/reorder-mod-actions	Chris Goes	2019-01-16	-208/+335
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|	Fix moderation order of actions, merge DM failure and general mod_log message.
\| \| * \| \| \| \| \| \|	Merge branch 'master' into reorder-mod-actions	Chris Goes	2019-01-16	-31/+45
\| \| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #275 from python-discord/rich-embed-filter-fix	S. Co1	2019-01-16	-21/+27
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|	Changing the rich embed filter to a watchlist that ignores twitter embeds
\| \| * \| \| \| \| \| \|	Merge branch 'master' into rich-embed-filter-fix	S. Co1	2019-01-16	-10/+18
\| \| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #278 from python-discord/add_user_log	Leon Sandøy	2019-01-16	-10/+18
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|	Add new userlog channel support.
\| \| * \| \| \| \| \| \|	Revert modlog channel for unbanned notification	S. Co1	2019-01-17	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: scragly <[email protected]>
\| \| * \| \| \| \| \| \|	Revert modlog channel for banned notification	S. Co1	2019-01-17	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: scragly <[email protected]>
\| \| * \| \| \| \| \| \|	Add new userlog channel support.	Scragly	2019-01-17	-10/+18
\| \|/ / / / / / /
\| \| * \| \| \| \| \|	Merge branch 'master' into rich-embed-filter-fix	Chris Goes	2019-01-15	-1/+1
\| \| \|\ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Changing the rich embed filter to a watchlist that ignores twitter embeds; ↵	SebastiaanZ	2019-01-13	-21/+27
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	adding time delta check to avoid the trigger-twice problem
\| \| \| * \| \| \|	Correct altered log_msg kwarg used.	Scragly	2019-01-16	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge branch 'master' of https://github.com/python-discord/bot into ↵	Scragly	2019-01-16	-296/+855
\| \| \| \|\ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reorder-mod-actions # Conflicts: # bot/cogs/modlog.py
\| * \| \| \| \| \|	Merge pull request #256 from python-discord/fix-bb-emoji	Sebastiaan Zeeff	2019-01-14	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	Fix bbmessage emoji pointing to incorrect ID
\| \| * \| \| \| \|	Merge branch 'master' into fix-bb-emoji	Johannes Christ	2019-01-14	-95/+482
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #215 from python-discord/user_command_improvements	Sebastiaan Zeeff	2019-01-13	-27/+102
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improving the `!user` command so users can use it in bot-commands if they target themselves.
\| \| * \| \| \| \| \|	Using the exception message as the description in BadArgument error embeds.	Leon Sandøy	2019-01-13	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	fixing a bad conflict resolution pt2	Leon Sandøy	2019-01-13	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	fixing a bad conflict resolution	Leon Sandøy	2019-01-13	-11/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master' into user_command_improvements	Leon Sandøy	2019-01-13	-333/+963
\| \| \|\ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #255 from fiskenslakt/master	S. Co1	2019-01-12	-0/+154
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	!free help channel command
\| \| * \ \ \ \ \ \	Merge branch 'master' into master	Leon Sandøy	2019-01-12	-52/+141
\| \| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #272 from python-discord/edit-log-timestamp	Jeremiah Boby	2019-01-12	-9/+36
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "last edited" delta to modlog for multi-edit messages
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into edit-log-timestamp	Jeremiah Boby	2019-01-12	-9/+60
\| \| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #273 from python-discord/help-catch-superclass	Leon Sandøy	2019-01-12	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changing the exception class caught so help doesn't break in the future
\| \| * \ \ \ \ \ \ \ \	Merge branch 'master' into help-catch-superclass	Jeremiah Boby	2019-01-12	-7/+58
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #266 from ↵	S. Co1	2019-01-12	-7/+58
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	python-discord/bigbrother-add-watch-message-to-header-embed Add watch reason to big brother header embed & fix small bug in watch command
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into bigbrother-add-watch-message-to-header-embed	Sebastiaan Zeeff	2019-01-12	-3/+36
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into bigbrother-add-watch-message-to-header-embed	Sebastiaan Zeeff	2019-01-11	-31/+9
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Only retrieve/cache watch reason when user becomes active; restore ↵	SebastiaanZ	2019-01-11	-9/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update_cache to synchronous as it was before
\| \| * \| \| \| \| \| \| \| \| \| \|	Removing default argument for the alias <prefix>watch to require a reason ↵	SebastiaanZ	2019-01-10	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	via the alias as well
\| \| * \| \| \| \| \| \| \| \| \| \|	Adding type annotations	SebastiaanZ	2019-01-10	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Adding watch reason to the big-brother header embeds	SebastiaanZ	2019-01-10	-9/+57
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \|	Changing check-specific exception to superclass exception so help doesn't ↵	SebastiaanZ	2019-01-12	-2/+2
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	break when new check exceptions are added
\| \| \| \| * \| \| \| \| \| \|	Condense logic	sco1	2019-01-12	-5/+2
\| \| \| \| \| \| \| \| \| \| \|