aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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 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 branch 'master' into bb-improvementsGravatar Sebastiaan Zeeff2019-02-18-7/+34
|\|
| * 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 branch 'master' into bb-improvementsGravatar Sebastiaan Zeeff2019-02-17-38/+252
|\|
| * 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
| | * 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
| | |\ \ | | |/ / | |/| |
| | * | Update _has_invites method docstring.Gravatar Scragly2019-02-08-2/+4
| | | |
| | * | Have invite filter send guild info with mod-alert.Gravatar Scragly2019-02-05-7/+43
| | | |
| | | * Re-made changes.Gravatar (PC) Refisio2019-02-09-7/+5
| | | |
| | | * Updated rules cog.Gravatar (PC) Refisio2019-02-09-2/+1
| | | |\
| | | | * Update rules.pyGravatar Vincent Gross2019-02-07-1/+2
| | | | |
| | | | * Swapped around import statements.Gravatar Vincent Gross2019-02-07-3/+2
| | | | | | | | | | | | | | | ***Again.***
| | | * | Updated Rules cog.Gravatar (PC) Refisio2019-02-09-6/+8
| | | | | | | | | | | | | | | | | | | | Also, accidentally changed the max-line-length in the linter to 100 so that I could properly lint my code without having Pycharm yell at me. Reverted that change, as the main repo still hasn't moved to that style yet.
| | | * | Updated Rules cog.Gravatar (PC) Refisio2019-02-09-12/+10
| | | |/
| | | * Updated Rules cog.Gravatar (PC) Refisio2019-02-07-94/+54
| | | | | | | | | | | | | | | | `rules` has been removed from `alias.py`, and the cog has been added to the list to be loaded. I remembered there being a Pathlib conglomeration that loaded each cog, but I might have been mistaken that from another project. Requested changes have been made.
| | | * Fixed issues pertaining to Import Order.Gravatar Vincent Gross2019-02-07-4/+3
| | | |
| | | * Code is properly linted.Gravatar (PC) Refisio2019-02-06-1/+1
| | | |
| | | * Forgot to remove this.Gravatar Vincent Gross2019-02-01-16/+0
| | | | | | | | | | | | | | | | Almost in hindsight, I almost forgot to remove this before creating the pull request. *Yoink.*
| | | * Fixed errors after lintingGravatar Vincent Gross2019-02-01-5/+5
| | | | | | | | | | | | Turns out I broke a few things after linting. Whoops. Fixed.