aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge pull request #649 from python-discord/update-pyfakefsGravatar Johannes Christ2022-01-30-6/+6
|\
| * Update pyfakefs to 4.5Gravatar Johannes Christ2022-01-30-6/+6
|/
* Merge pull request #647 from python-discord/voice-mute-in-metricity-endpointGravatar Leon Sandøy2022-01-27-18/+28
|\
| * Update metricity tests to test new voice_gate_blocked behaviourGravatar Chris Lovering2022-01-27-10/+22
| * Use voice_mute and voice_ban to determine voice_gateGravatar Chris Lovering2022-01-27-8/+6
|/
* Merge pull request #646 from python-discord/update-bot-contrib-guideGravatar ChrisJL2022-01-27-1/+6
|\
| * Add new incidents webhook to exmaple config.ymlGravatar Chris Lovering2022-01-27-0/+1
| * Fix pynews config in example fileGravatar Chris Lovering2022-01-27-1/+5
|/
* Merge pull request #608 from python-discord/voicemuteGravatar ChrisJL2022-01-27-2/+53
|\
| * Merge branch 'main' into voicemuteGravatar ChrisJL2022-01-27-1/+1
| |\ | |/ |/|
* | Merge pull request #645 from python-discord/fix-subarticles-buttonGravatar Johannes Christ2022-01-24-1/+1
|\ \
| * | Prevent page title from overlapping dropdown button.Gravatar kosayoda2022-01-23-1/+1
|/ /
| * Try to add merge migrationGravatar Karlis Suvi2022-01-25-0/+14
| * Merge branch 'main' into voicemuteGravatar ChrisJL2022-01-21-406/+1807
| |\ | |/ |/|
* | Merge pull request #640 from Krish-bhardwaj/mainGravatar Johannes Christ2022-01-16-3/+1
|\ \
| * \ Merge branch 'main' into mainGravatar wookie1842022-01-16-6/+31
| |\ \ | |/ / |/| |
* | | Merge pull request #642 from python-discord/jb3/django-discordGravatar ChrisJL2022-01-14-2/+15
|\ \ \
| * | | Renumber communities after DjangoGravatar Joe Banks2022-01-14-2/+2
| * | | Add Django Discord communityGravatar Joe Banks2022-01-14-0/+13
|/ / /
* | | Merge pull request #641 from python-discord/netcup-sponserGravatar Hassan Abouelela2022-01-10-4/+16
|\ \ \
| * | | Add netcup logo to sponsor block on homeapgeGravatar Chris Lovering2022-01-10-0/+3
| * | | Shift footer images slightly to be better in lineGravatar Chris Lovering2022-01-05-1/+2
| * | | Use an svg for django footer logoGravatar Chris Lovering2022-01-05-2/+2
| * | | Add netcup logo to page footerGravatar Chris Lovering2022-01-05-1/+9
|/ / /
| * / Resource Suggestion: #639 solvedGravatar Krish2022-01-07-3/+1
|/ /
* | Merge pull request #637 from python-discord/mbaruh-patch-1Gravatar ChrisJL2021-12-30-29/+29
|\ \
| * | Fix faulty regex filters in migration 59Gravatar Boris Muratov2021-12-31-29/+29
|/ /
* | Merge pull request #508 from RohanJnr/otn_softdelGravatar Johannes Christ2021-12-28-37/+149
|\ \
| * \ Merge branch 'main' into otn_softdelGravatar Xithrius2021-12-28-110/+126
| |\ \ | |/ / |/| |
* | | Merge pull request #636 from python-discord/revert-metricity-changeGravatar Joe Banks2021-12-20-25/+2
|\ \ \
| * | | Always include metricity message blocksGravatar Chris Lovering2021-12-16-25/+2
|/ / /
* | | Merge pull request #635 from python-discord/revert-metricity-changeGravatar Joe Banks2021-12-14-3/+5
|\ \ \
| * | | Query message count directly from messagesGravatar Chris Lovering2021-12-14-3/+5
|/ / /
* | | Merge pull request #634 from python-discord/bump-drfGravatar Hassan Abouelela2021-12-14-82/+119
|\ \ \
| * | | Bump drf up to 3.12.0Gravatar Chris Lovering2021-12-13-82/+119
|/ / /
| * | Merge migrations to avoid conflicts.Gravatar RohanJnr2021-12-13-0/+14
| * | Merge branch 'main' into otn_softdelGravatar Rohan Reddy Alleti2021-12-13-82/+365
| |\ \ | |/ / |/| |
* | | Merge pull request #633 from python-discord/dependabot/pip/django-3.1.14Gravatar ChrisJL2021-12-12-5/+5
|\ \ \
| * \ \ Merge branch 'main' into dependabot/pip/django-3.1.14Gravatar ChrisJL2021-12-12-5/+3
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #632 from python-discord/use-new-message-viewGravatar Johannes Christ2021-12-11-5/+3
|\ \ \ \
| * \ \ \ Merge branch 'main' into use-new-message-viewGravatar ChrisJL2021-12-11-17/+41
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Use new approx message count viewGravatar Chris Lovering2021-12-11-5/+3
| | * | | Bump django from 3.1.13 to 3.1.14Gravatar dependabot[bot]2021-12-11-5/+5
| |/ / / |/| | |
* | | | Merge pull request #630 from python-discord/dependabot/pip/django-3.1.13Gravatar Johannes Christ2021-12-11-17/+41
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'main' into dependabot/pip/django-3.1.13Gravatar ChrisJL2021-12-11-9/+4
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #631 from Akarys42/patch-1Gravatar Joe Banks2021-12-10-9/+4
|\ \ \ \
| * | | | Remove myself from the codeownersGravatar Matteo Bertucci2021-12-10-9/+4
|/ / / /
| * | | Update `django-filter` for new Django versionGravatar Johannes Christ2021-11-27-7/+7
| * | | Migrate to generic `JSONField`Gravatar Johannes Christ2021-11-27-5/+28
| * | | Bump django from 3.0.14 to 3.1.13Gravatar dependabot[bot]2021-11-26-6/+7
|/ / /