aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' into rules_commandGravatar Daniel Brown2019-02-24-51/+104
|\
| * Merge pull request #307 from python-discord/bb-improvementsGravatar Leon Sandøy2019-02-23-42/+96
| |\ | | | | | | Unwatch reason / Nomination improvements
| | * Merge branch 'master' into bb-improvementsGravatar Sebastiaan Zeeff2019-02-23-13/+10
| | |\ | | |/ | |/|
| * | Merge pull request #314 from python-discord/Hemlock-Another-Role-TweakGravatar Johannes Christ2019-02-23-13/+10
| |\ \ | | | | | | | | Hemlock another role tweak
| | * \ Merge branch 'master' into Hemlock-Another-Role-TweakGravatar Daniel Brown2019-02-22-0/+0
| | |\ \ | | |/ / | |/| |
| | * | Corrected additional roles constants in off_topic_names.py, reddit.py, and ↵Gravatar Daniel Brown2019-02-22-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | rules.py Signed-off-by: Daniel Brown <[email protected]>
| | * | Corrected another roles constant in reminders.pyGravatar Daniel Brown2019-02-22-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Brown <[email protected]>
| | | * Adding square brackets to user argument as wellGravatar SebastiaanZ2019-02-22-2/+2
| | | |
| | | * Adding square brackets to signal it's an argument, not a subcommandGravatar SebastiaanZ2019-02-22-3/+3
| | | |
| | | * Merge branch 'bb-improvements' of github.com:python-discord/bot into ↵Gravatar SebastiaanZ2019-02-22-1/+1
| | | |\ | | | | | | | | | | | | | | | bb-improvements
| | | | * Clarifying log.trace message to include contextGravatar Leon Sandøy2019-02-22-1/+1
| | | | | | | | | | | | | | | Co-Authored-By: SebastiaanZ <[email protected]>
| | | * | Resolving merge conflicts with Hemlock's STAFF_ROLES changesGravatar SebastiaanZ2019-02-22-58/+58
| | | |\ \ | | |_|/ / | |/| | / | | | |/
| | | * Merge branch 'master' into bb-improvementsGravatar Sebastiaan Zeeff2019-02-18-7/+34
| | | |\
| | | * \ Merge branch 'master' into bb-improvementsGravatar Sebastiaan Zeeff2019-02-17-38/+252
| | | |\ \
| | | * | | Changing negative bot response in nominate command to be more explicit about ↵Gravatar SebastiaanZ2019-02-09-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | current bb-status of nominated user
| | | * | | Adding current staff member check for nomination and updating prefix ↵Gravatar SebastiaanZ2019-02-08-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | according to issue
| | | * | | Adding watch time delta to big-brother header embedGravatar SebastiaanZ2019-02-08-0/+7
| | | | | |
| | | * | | Updating watched user embed title to include cache statusGravatar SebastiaanZ2019-02-08-1/+4
| | | | | |
| | | * | | Adding improvements to the watch prefix so reasons don't get overwrittenGravatar SebastiaanZ2019-02-08-5/+34
| | | | | |
| | | * | | Adding method to update watched cache so it's reusableGravatar SebastiaanZ2019-02-08-29/+26
| | | | | |
| | | * | | Adding mandatory unwatch reason for both bb and talent-poolGravatar SebastiaanZ2019-02-08-8/+16
| | | | | |
* | | | | | Merge branch 'master' into rules_commandGravatar Chris Goes2019-02-22-62/+178
|\| | | | |
| * | | | | Merge pull request #313 from python-discord/Hemlock.Users_and_Roles_adjustmentGravatar scragly2019-02-22-57/+60
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | Use of Constants and Adjusting !user permissions
| | * | | Linting corrections.Gravatar Daniel Brown2019-02-21-9/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Brown <[email protected]>
| | * | | Changed !user so that Helpers don't get redirected to the #bot_commands channel.Gravatar Daniel Brown2019-02-21-57/+56
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the STAFF_ROLES constant to constants.py Adjusted any cog use of MODERATION_ROLES or STAFF_ROLES that would have been redundant with the addition of the constants. Signed-off-by: Daniel Brown <[email protected]>
| * | | Merge pull request #312 from python-discord/fix-create-teamGravatar Joseph2019-02-17-7/+34
| |\ \ \ | | |_|/ | |/| | Jam creation command improvements
| | * | Address Johannes Christ's review commentsGravatar Joseph Banks2019-02-17-2/+2
| | | |
| | * | Add voice channel support to the team creation command and fix a bug which ↵Gravatar Joseph Banks2019-02-16-7/+34
| |/ / | | | | | | | | | meant some users did not have permissions added
| * | Merge pull request #311 from python-discord/add-team-creatorGravatar Joseph2019-02-16-5/+91
| |\ \ | | | | | | | | Add team creation command
| | * \ Merge branch 'add-team-creator' of github.com:python-discord/bot into ↵Gravatar Joseph Banks2019-02-16-1/+1
| | |\ \ | | | | | | | | | | | | | | | add-team-creator
| | | * | Update bot/cogs/jams.pyGravatar Leon Sandøy2019-02-16-1/+1
| | | | | | | | | | | | | | | Co-Authored-By: jos-b <[email protected]>
| | * | | Sort the loading of cogsGravatar Joseph Banks2019-02-16-6/+6
| | |/ /
| | * | Flake8Gravatar Joseph Banks2019-02-16-4/+5
| | | |
| | * | Change a particularly nasty lineGravatar Joseph Banks2019-02-16-1/+5
| | | |
| | * | Add a docstring to the createteam commandGravatar Joseph Banks2019-02-16-0/+6
| | | |
| | * | Enable loading of the jams cogGravatar Joseph Banks2019-02-16-0/+1
| | | |
| | * | Add team_leaders to roles configGravatar Joseph Banks2019-02-16-0/+2
| | | |
| | * | Add team creator command, createteamGravatar Joseph Banks2019-02-16-0/+72
| |/ /
| * | Merge pull request #301 from Refisio/rules_commandGravatar S. Co12019-02-15-24/+103
| |\ \ | | | | | | | | Added more functionality to rules command
* | | | Refactored code.Gravatar Vincent Gross2019-02-22-1/+1
| | | |
* | | | Removed `STAFF` constant in favor of `STAFF_ROLES` constant, added footer ↵Gravatar refisio2019-02-22-6/+6
| |/ / |/| | | | | | | | pointing to the Rules Site page to the paginated embed.
* | | Merge branch 'master' into rules_commandGravatar S. Co12019-02-15-20/+176
|\| |
| * | Merge pull request #309 from python-discord/exception-alias-for-tracebackGravatar Thomas Petersson2019-02-14-0/+8
| |\ \ | | | | | | | | Added alias for tags get traceback - !exception.
| | * \ Merge branch 'master' into exception-alias-for-tracebackGravatar Thomas Petersson2019-02-14-0/+3
| | |\ \ | | |/ / | |/| |
| * | | Whitelisting domains.Gravatar Leon Sandøy2019-02-14-0/+3
| | | | | | | | | | | | Adding gentoo, adafruit and kennethreitz.org to the whitelist.
| | * | Github editor snuck in a few blanklinesGravatar Thomas Petersson2019-02-13-2/+2
| | | |
| | * | Added alias for tags get traceback - !exception. Gravatar Thomas Petersson2019-02-13-0/+8
| |/ / | | | | | | I find myself writing !exception by mistake too often and just figured i'd see if others would want this alias in.
| * | Merge pull request #304 from python-discord/server-invite-detailsGravatar Sebastiaan Zeeff2019-02-09-9/+47
| |\ \ | | |/ | |/| Have invite filter send guild info with mod-alert.
| | * Merge branch 'master' into server-invite-detailsGravatar Sebastiaan Zeeff2019-02-09-8/+115
| | |\ | | |/ | |/|
| * | Merge pull request #285 from python-discord/newline-antispamGravatar scragly2019-02-08-5/+27
| |\ \ | | | | | | | | | | | | | | | | | | | | Redirect newline antispam log message, add consecutive newline check Co-authored-by: <[email protected]> Co-authored-by: Chris Goes <[email protected]>