aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge pull request #306 from beardfist/some_branchGravatar Leon Sandøy2019-02-07-1/+2
|\ | | | | testing azure
| * Merge branch 'master' into some_branchGravatar Leon Sandøy2019-02-07-2/+3
| |\ | |/ |/|
* | Merge pull request #305 from python-discord/bot_repliesGravatar Leon Sandøy2019-02-07-3/+5
|\ \ | | | | | | added another bot reply - testing azure pipelines
| * | Tiny change to trigger buildGravatar Leon Sandøy2019-02-07-0/+1
| | |
| * | added another bot reply - testing azure pipelinesGravatar Leon Sandøy2019-02-07-3/+4
|/ /
| * triggering azureGravatar Leon Sandøy2019-02-07-0/+1
| |
| * testing azureGravatar Leon Sandøy2019-02-07-1/+2
|/
* Merge pull request #295 from python-discord/superstarifyimprovementsGravatar Thomas Petersson2019-02-07-0/+82
|\ | | | | Superstarify cleanup as per issue #288 , no changes to the command.
| * Merge branch 'master' into superstarifyimprovementsGravatar Thomas Petersson2019-02-05-3/+3
| |\ | |/ |/|
* | Merge pull request #302 from python-discord/stronger-token-removal-messageGravatar Joseph2019-02-04-3/+3
|\ \ | | | | | | Sending a stronger message to the user after removing token
| * | Removing the 'more than likely'Gravatar SebastiaanZ2019-02-04-1/+1
| | |
| * | Rewording token removal text to send a stronger message.Gravatar SebastiaanZ2019-02-04-3/+3
|/ /
| * Merge branch 'master' into superstarifyimprovementsGravatar Thomas Petersson2019-01-30-2/+10
| |\ | |/ |/|
* | Merge pull request #296 from ↵Gravatar Johannes Christ2019-01-30-2/+10
|\ \ | | | | | | | | | | | | python-discord/redirect-decorator-handling-deleted-msgs Suppressing NotFound exception when trying to delete messages
| * | Suppressing NotFound exception when trying to delete messagesGravatar SebastiaanZ2019-01-30-2/+10
|/ /
| * Fixed a few urls pointing to wikipedie file instead of image urlGravatar tagp2019-01-30-2/+2
| |
| * Removed bands from starify list, converted it to a list in ↵Gravatar tagp2019-01-30-0/+82
|/ | | | bot/resources/stars.json, all stars are stored in a name: url key-value pair. No changes to the starify command has been made. This commit simply adds the filtered json file
* Merge pull request #294 from python-discord/redirect-free-commandGravatar Chris Goes2019-01-29-29/+11
|\ | | | | Redirecting free command to bot-commands for regular users
| * Redirecting free command to bot-commands for regular users; correcting typo ↵Gravatar SebastiaanZ2019-01-29-29/+11
|/ | | | in decorator log message; adding STAFF_ROLES constant
* Merge pull request #291 from python-discord/hierarchy_fixGravatar Joseph2019-01-26-23/+28
|\ | | | | Fixes hierarchy check when target not a server member.
| * Fixes hierarchy check when target not a server member.Gravatar Scragly2019-01-26-23/+28
|/ | | | | | | - Defines the Union type of `discord.Member`, `discord.User` and the custom `proxy_user` function for cleaner converters. - Adds `isinstance` check for `target` to ensure it's a `discord.Member`. If it wasn't, it means the `Member` part of the Union converter failed so they're definitely not in the guild, so no need to check hierarchy; returns True when they're not a Member. - Removes now unnecessary `get_member`. - Adds missing punctuation and param docs to `respect_role_hierarchy` method docstring.
* Empty commit for redeployGravatar Scragly2019-01-22-0/+1
|
* Merge pull request #286 from python-discord/user-command-hidden-infractionsGravatar Johannes Christ2019-01-19-1/+4
|\ | | | | Hiding 'hidden infractions' from regular users user information embed
| * Hiding 'hidden infractions' from regular users user information embedGravatar SebastiaanZ2019-01-19-1/+4
|/
* Merge pull request #253 from FrenchMasterSword/masterGravatar scragly2019-01-20-10/+14
|\ | | | | Eval returns complete traceback. Also doesn't break on comments.
| * Merge branch 'master' into masterGravatar scragly2019-01-20-77/+284
| |\ | |/ |/|
* | Merge pull request #284 from python-discord/redirect-help-botcommandsGravatar scragly2019-01-19-3/+54
|\ \ | | | | | | Redirect output of help command to bot-commands for regular users
| * \ Merge branch 'master' into redirect-help-botcommandsGravatar Leon Sandøy2019-01-19-72/+228
| |\ \ | |/ / |/| |
* | | Merge pull request #276 from python-discord/helper-talent-poolGravatar scragly2019-01-19-44/+134
|\ \ \ | | | | | | | | A talent pool for potential helpers
| * \ \ Merge branch 'master' into helper-talent-poolGravatar Leon Sandøy2019-01-19-28/+37
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #271 from python-discord/update-contrib-docGravatar scragly2019-01-19-28/+37
|\ \ \ \ | | | | | | | | | | Update CONTRIBUTING.md
| * \ \ \ Merge branch 'master' into update-contrib-docGravatar Leon Sandøy2019-01-19-210/+394
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into update-contrib-docGravatar Chris Goes2019-01-16-31/+45
| |\ \ \ \
| * | | | | Add developer wiki linksGravatar sco12019-01-16-0/+5
| | | | | |
| * | | | | Merge branch 'master' into update-contrib-docGravatar Chris Goes2019-01-15-80/+398
| |\ \ \ \ \
| * | | | | | Fix number duplicationGravatar sco12019-01-14-2/+2
| | | | | | |
| * | | | | | Change enumeration incrementGravatar sco12019-01-14-8/+8
| | | | | | |
| * | | | | | Change MR to PR, reorder log levelsGravatar sco12019-01-13-4/+4
| | | | | | |
| * | | | | | Enumerate itemsGravatar sco12019-01-13-8/+8
| | | | | | | | | | | | | | | | | | | | | Markdown is made for humans to read and only coincidentally for computers to render. If it's supposed to be an unordered list, use - or *. If it's supposed to be ordered, enumerate it.
| * | | | | | Clarify trace logging level as PyDis-implementedGravatar sco12019-01-12-1/+1
| | | | | | |
| * | | | | | Update sentence flow for clarity Gravatar Leon Sandøy2019-01-12-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and to prevent dizziness Co-Authored-By: sco1 <[email protected]>
| * | | | | | Proofreading pass on Contributor docGravatar sco12019-01-11-12/+12
| | | | | | |
| * | | | | | Initial rework of Contributor guidelines (not yet proofread)Gravatar sco12019-01-10-29/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add guidance on commit scope & frequency Add guidance on commit messages Beat people over the head with flake8 & precommit hooks Add logging level definition Remove the random linebreaks Minor wordsmithing, formatting changes
| | | | * | | Merge branch 'master' into helper-talent-poolGravatar scragly2019-01-19-0/+57
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #265 from python-discord/moderation-hierarchy-checkGravatar Leon Sandøy2019-01-19-0/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add infraction hierarchy check
| * \ \ \ \ \ \ Merge branch 'master' into moderation-hierarchy-checkGravatar Sebastiaan Zeeff2019-01-18-2/+2
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into moderation-hierarchy-checkGravatar sco12019-01-16-239/+380
| |\ \ \ \ \ \ \
| * | | | | | | | Simplify role check logicGravatar sco12019-01-16-9/+8
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into moderation-hierarchy-checkGravatar Chris Goes2019-01-15-95/+482
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Change logging statement to use author instead of usernameGravatar sco12019-01-09-2/+2
| | | | | | | | |