aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge remote-tracking branch 'upstream/main' into feature/enhance-incidentsGravatar Shivansh-0072021-10-17-712/+1036
|\
| * Merge pull request #1871 from python-discord/modlog-ingore-channels-mods-can'...Gravatar ChrisJL2021-10-17-14/+24
| |\
| | * Remove unneeded config entriesGravatar Chris Lovering2021-10-17-4/+2
| | * Use modlog ignore function for voice events tooGravatar Chris Lovering2021-10-17-1/+2
| | * Refactor: Update modlog ignore function nameGravatar Chris Lovering2021-10-17-3/+3
| | * Ignore channels mod team can't view in modlogGravatar Chris Lovering2021-10-17-8/+19
| |/
| * Modlog: remove tzinfo from member_join (#1877)Gravatar Matteo Bertucci2021-10-17-1/+1
| * Migrate to Discord 2.0a0 Gravatar Matteo Bertucci2021-10-17-98/+288
| |\
| | * Merge remote-tracking branch 'origin/main' into discord-2.0Gravatar Matteo Bertucci2021-10-17-323/+420
| | |\ | | |/ | |/|
| * | Merge pull request #1875 from python-discord/ks123/bugfix/reapply-infractionGravatar ChrisJL2021-10-16-5/+9
| |\ \
| | * \ Merge branch 'main' into ks123/bugfix/reapply-infractionGravatar ChrisJL2021-10-16-333/+429
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1872 from python-discord/experiments/isortGravatar ChrisJL2021-10-16-333/+429
| |\ \ \
| | * | | Isort: set atomic to trueGravatar Matteo Bertucci2021-10-15-0/+1
| | * | | Merge remote-tracking branch 'origin/main' into experiments/isortGravatar Matteo Bertucci2021-10-15-235/+277
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Actions: do not check licenses of dev packagesGravatar Matteo Bertucci2021-10-15-2/+4
| | * | | ISort: give the codebase a sortGravatar Matteo Bertucci2021-10-14-59/+20
| | * | | Remove flake8-import-orderGravatar Matteo Bertucci2021-10-14-71/+60
| | * | | Precommit: add ISortGravatar Matteo Bertucci2021-10-14-0/+5
| | * | | Add ISort to this projectGravatar Matteo Bertucci2021-10-14-220/+353
| | | * | Do not try to calculate expiry if infraction is permanent on reapplyGravatar ks1292021-10-16-5/+9
| | |/ / | |/| |
| | | * Merge branch 'main' into discord-2.0Gravatar Matteo Bertucci2021-10-15-242/+282
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #1874 from python-discord/fix-bot-1869Gravatar Matteo Bertucci2021-10-15-1/+1
| |\ \ \
| | * | | Update `isinstance` checkGravatar TizzySaurus2021-10-14-1/+1
| |/ / /
| * | | Merge pull request #1831 from python-discord/custom-logger-classGravatar ChrisJL2021-10-14-224/+228
| |\ \ \
| | * | | Fix newlines after imports and address reviewGravatar Izan2021-10-14-6/+2
| | * | | Migrate to `bot.log.get_logger` functionGravatar Izan2021-10-14-206/+199
| | * | | Add `CustomLogger` to bot/log.pyGravatar Izan2021-10-14-18/+33
| |/ / /
| * | | Add a contribute tag which explains how to contribute to PyDis projectsGravatar Janine vN2021-10-14-0/+12
| * | | Send `!defcon threshold` message in `channel` as well as #defcon. (#1856)Gravatar TizzySaurus2021-10-14-7/+17
| * | | Merge pull request #1860 from python-discord/fix-infract-then-dmGravatar ChrisJL2021-10-14-2/+12
| |\ \ \
| | * \ \ Merge branch 'main' into fix-infract-then-dmGravatar ChrisJL2021-10-14-7/+8
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Send the user's mention in the `watch` command. (#1867)Gravatar Qwerty-1332021-10-14-4/+4
| * | | | Merge pull request #1861 from python-discord/solve-bot-1852Gravatar ChrisJL2021-10-14-3/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'main' into solve-bot-1852Gravatar ChrisJL2021-10-14-41/+39
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Distinguish between note/warning and expired infraction in error messageGravatar Izan2021-10-06-3/+4
| | | * | Merge branch 'main' into fix-infract-then-dmGravatar Hassan Abouelela2021-10-11-41/+39
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Only send DM before applying infraction for ban/kickGravatar TizzySaurus2021-10-11-2/+2
| | | * | Remove redundant `else` clausesGravatar Izan2021-10-10-8/+5
| | | * | Merge branch 'main' into fix-infract-then-dmGravatar TizzySaurus2021-10-06-3/+6
| | | |\ \ | | | |/ / | | |/| |
| | | * | Attempt infraction before DMingGravatar Izan2021-10-06-3/+11
| | | | * Voice gate: set tzinfo to None in author.joined_atGravatar Matteo Bertucci2021-10-15-1/+1
| | | | * Defcon: remove tzinfo from member.created_atGravatar Matteo Bertucci2021-10-15-1/+1
| | | | * Merge branch 'main' into discord-2.0Gravatar Matteo Bertucci2021-10-13-38/+32
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #1836 from python-discord/tags-revisionGravatar Matteo Bertucci2021-10-11-37/+23
| |\ \ \ \
| | * \ \ \ Merge branch 'main' into tags-revisionGravatar Matteo Bertucci2021-10-11-189/+430
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix typoGravatar TizzySaurus2021-10-08-1/+1
| | * | | | Bluenix Review #4Gravatar Izan2021-10-08-2/+2
| | * | | | Bluenix Review #3Gravatar Izan2021-09-26-2/+2
| | * | | | Bluenix Review #2Gravatar Izan2021-09-25-2/+2
| | * | | | Merge remote-tracking branch 'origin/tags-revision' into tags-revisionGravatar Izan2021-09-25-7/+0
| | |\ \ \ \