aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* RefactorGravatar Shirayuki Nekomata2019-11-03-64/+32
* Merge pull request #638 from loksonarius/fix-reddit-cog-sleepGravatar Mark2019-11-02-2/+3
|\
| * Use timedelta to correctly calculate next midnightGravatar Dan Herrera2019-10-31-2/+3
|/
* Merge pull request #629 from python-discord/unittest-helpers-proper-child-mockGravatar Mark2019-10-31-179/+204
|\
| * Merge branch 'master' into unittest-helpers-proper-child-mockGravatar Mark2019-10-31-13/+17
| |\ | |/ |/|
* | Merge pull request #626 from python-discord/otn-a-fixGravatar Mark2019-10-30-10/+6
|\ \
| * \ Merge branch 'master' into otn-a-fixGravatar Mark2019-10-30-3/+11
| |\ \ | |/ / |/| |
* | | Use 'local' emojis for reddit webhook embedGravatar Sebastiaan Zeeff2019-10-29-3/+3
* | | Merge pull request #635 from python-discord/reddit-webhook-embed-enhancementsGravatar Kieran Siek2019-10-29-3/+11
|\ \ \
| * | | Enhance Reddit webhook embedsGravatar Sebastiaan Zeeff2019-10-29-3/+11
|/ / /
| * / Chain words before length checkGravatar kosayoda2019-10-28-10/+6
|/ /
| * Update docstring and remove redundant attributeGravatar Sebastiaan Zeeff2019-10-30-4/+9
| * Enhance custom mock helpersGravatar Sebastiaan Zeeff2019-10-30-161/+150
| * Change generation of child mocksGravatar Sebastiaan Zeeff2019-10-28-36/+67
|/
* Merge pull request #527 from kraktus/compact_freeGravatar Mark2019-10-25-14/+11
|\
| * Merge branch 'master' into compact_freeGravatar Mark2019-10-25-1642/+2983
| |\ | |/ |/|
* | Merge pull request #501 from mathsman5133/reddit-makeoverGravatar Sebastiaan Zeeff2019-10-25-148/+85
|\ \
| * \ Merge branch 'master' into reddit-makeoverGravatar Sebastiaan Zeeff2019-10-25-1447/+2668
| |\ \ | |/ / |/| |
* | | Merge pull request #466 from Akarys42/reminder-upGravatar Sebastiaan Zeeff2019-10-25-3/+10
|\ \ \
| * \ \ Merge branch 'master' into reminder-upGravatar Sebastiaan Zeeff2019-10-25-1394/+2592
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #543 from atmishra/moderator-channel-checkGravatar S. Co12019-10-25-7/+22
|\ \ \ \
| * \ \ \ Merge branch 'master' into moderator-channel-checkGravatar S. Co12019-10-25-17/+37
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #550 from python-discord/###-filtering-devtestGravatar S. Co12019-10-25-5/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into ###-filtering-devtestGravatar S. Co12019-10-25-15/+54
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #529 from python-discord/show-trigger-wordGravatar S. Co12019-10-25-11/+24
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into show-trigger-wordGravatar S. Co12019-10-25-1469/+2842
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Prepend emoji indicative of success of !eval (#552)Gravatar scragly2019-10-24-1/+12
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into eval-emojisGravatar scragly2019-10-24-1468/+2830
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Prepend emoji indicative of success of !evalGravatar kosayoda2019-10-24-1/+12
| | * | | | | | Fix incorrect type hint for return valueGravatar kosayoda2019-10-24-2/+2
| | * | | | | | Rename `triggered` to `match`Gravatar kosayoda2019-10-15-8/+6
| | * | | | | | Show matched word and location in watchlist embedGravatar kosayoda2019-10-13-5/+20
| |/ / / / / /
| | * | | | | Use standart filter conditions even if DEBUG_MODE is on.Gravatar Akarys422019-10-23-5/+1
| | | * | | | Merge branch 'master' into moderator-channel-checkGravatar Atul Mishra2019-10-22-8/+17
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #547 from python-discord/#540-dont-show-infraction-totalGravatar Daniel Brown2019-10-22-3/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Show total infraction count only in staff channelsGravatar Akarys422019-10-21-1/+3
| * | | | | | Create STAFF_CHANNELS constantGravatar Akarys422019-10-21-2/+15
|/ / / / / /
| | * | | | Add test cases for in_channel_checkGravatar Atul Mishra2019-10-22-0/+8
| | * | | | Merge branch 'master' into moderator-channel-checkGravatar Atul Mishra2019-10-22-1374/+2522
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #541 from ikuyarihS/masterGravatar S. Co12019-10-21-98/+54
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into masterGravatar S. Co12019-10-21-1276/+2468
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #517 from python-discord/unittest-migrationGravatar Leon Sandøy2019-10-20-1268/+2366
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into unittest-migrationGravatar Leon Sandøy2019-10-20-53/+163
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #528 from bendiller/antimalware-cogGravatar Chris G2019-10-19-0/+86
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into antimalware-cogGravatar Chris G2019-10-19-107/+428
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Pluralize "infractions" as necessary. (#545)Gravatar scragly2019-10-20-2/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not display an expiry for notes or warnings.Gravatar Johannes Christ2019-10-19-1/+7
| * | | | | | | | | Pluralize "infractions" as necessary.Gravatar Johannes Christ2019-10-19-1/+3
|/ / / / / / / / /
| * | | | | | | | Bugfix - ensure .py attachment is prioritized over other non-whitelistedGravatar bendiller2019-10-17-1/+0
| * | | | | | | | Address reviewer requestGravatar bendiller2019-10-17-3/+4