aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | | | Use a static discord shield on the readme.Gravatar scragly2019-12-26-1/+1
| | | | |
* | | | | Merge pull request #319 from python-discord/code-jam-6-updateGravatar Jeremiah Boby2019-12-23-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Add Code Jam 6 banner to the homepage
| * | | | | Add Code Jam 6 banner to the homepageGravatar Jeremiah Boby2019-12-23-4/+4
|/ / / / /
* | | / / Pad the discriminator with zeroes in profile.Gravatar Leon Sandøy2019-12-17-1/+1
| |_|/ / |/| | | | | | | | | | | | | | | previously, lemon#0001 would display as just lemon#1. This commit fixes this. All credit goes to @gdude2002
* | | | Merge pull request #300 from python-discord/#222-offensive-msg-autodeletionGravatar Mark2019-12-14-1/+330
|\ \ \ \ | |_|/ / |/| | | Create offensive message model for python-discord/bot#617
| * | | Rename route /bot/offensive-message to /bot/offensive-messagesGravatar Akarys422019-12-14-4/+4
| | | |
| * | | Use direct database test intead of relying on GETGravatar Akarys422019-11-16-3/+3
| | | |
| * | | Write list test for the offensive message modelGravatar Akarys422019-11-16-0/+39
| | | |
| * | | Merge branch 'master' into #222-offensive-msg-autodeletionGravatar Akarys422019-11-16-34/+1053
| |\ \ \
| * | | | Make use of subtestsGravatar Akarys422019-11-12-20/+20
| | | | | | | | | | | | | | | | | | | | Co-authored-by: Sebastiaan Zeeff <[email protected]>
| * | | | Change setUpTestData to use aware datetimeGravatar Akarys422019-11-11-2/+2
| | | | | | | | | | | | | | | | | | | | This remove a warning during test run
| * | | | Add deletion testsGravatar Akarys422019-11-11-0/+24
| | | | |
| * | | | Add tests to make sure the view return 405 for PATCH and PUT requestsGravatar Akarys422019-11-11-0/+22
| | | | |
| * | | | Make sure the API return the appropriate response.Gravatar Akarys422019-11-10-0/+9
| | | | |
| * | | | Merge master migration filesGravatar Akarys422019-11-07-2/+2
| | | | |
| * | | | Merge branch 'master' into #222-offensive-msg-autodeletionGravatar Akarys422019-11-07-81/+1141
| |\ \ \ \
| * | | | | Block PATCH and PUT methodsGravatar Akarys422019-11-07-3/+2
| | | | | |
| * | | | | Fix copy pasting mistakeGravatar Akarys422019-11-07-1/+1
| | | | | |
| * | | | | Squash down migration filesGravatar Akarys422019-11-07-36/+3
| | | | | |
| * | | | | Write tests for the offensive message model.Gravatar Akarys422019-10-26-3/+70
| | | | | |
| * | | | | Delete unnecessary search filterGravatar Akarys422019-10-26-4/+0
| | | | | |
| * | | | | Change docs to use datetime.datetime instead of datetime.dateGravatar Akarys422019-10-26-2/+2
| | | | | |
| * | | | | Add the offensive message model to the admin panelGravatar Akarys422019-10-26-0/+6
| | | | | |
| * | | | | Fix type error in the future date validatorGravatar Akarys422019-10-25-1/+1
| | | | | |
| * | | | | Add migartion file for OffensiveMssage.delete_dateGravatar Akarys422019-10-25-0/+19
| | | | | |
| * | | | | Add merge migration fileGravatar Akarys422019-10-25-0/+14
| | | | | |
| * | | | | Merge branch 'master' into #222-offensive-msg-autodeletionGravatar Akarys422019-10-25-5/+34
| |\ \ \ \ \
| * | | | | | Change OffensiveMessage.delete_date from datetime.date to datetime.datetimeGravatar Akarys422019-10-25-5/+5
| | | | | | |
| * | | | | | Write tests for the future date validatorGravatar Akarys422019-10-25-0/+12
| | | | | | |
| * | | | | | Create an OffensiveMessage modelGravatar Akarys422019-10-24-1/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This model will be used to store message that triggered a filter and that will be deleted one week after it was sent.
* | | | | | | Add 1em bottom margin to wiki markdown codeblocks.Gravatar scragly2019-12-09-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any text following the end of a codeblock in the wiki would very closely hug the codeblock, impacting readability and giving poor structure to page content. This adds in an appropriate margin to the bottom of codeblocks to give a fair buffer that matches typical paragraph spacing.
* | | | | | | Merge pull request #313 from python-discord/fix-discord-tosGravatar Sebastiaan Zeeff2019-11-20-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Correct the Discord TOS link in rules API endpoint.
| * | | | | | Correct the discord tos link in rules endpoint.Gravatar scragly2019-11-20-1/+1
|/ / / / / /
| | | | * | Merge branch 'bot#549-show-attachments-staff' of ↵Gravatar Akarys422019-11-20-117/+2197
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | https://github.com/python-discord/site into bot#549-show-attachments-staff
| | | | | * | Update migration historyGravatar Matteo Bertucci2019-11-15-1/+1
| | | | | | |
| | | | | * | Merge branch 'master' into bot#549-show-attachments-staffGravatar Matteo Bertucci2019-11-15-38/+2122
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
* | | | | | | Add pipenv run start command (#308)Gravatar scragly2019-11-12-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add pipenv run start command
| * | | | | | | Add the `--debug` flag to the start commandGravatar Matteo Bertucci2019-11-12-1/+1
| | | | | | | |
| * | | | | | | Add pipenv run start commandGravatar Akarys422019-11-11-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #292 from python-discord/allauth-user-settingsGravatar scragly2019-11-11-34/+1052
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Allauth improvements & GH
| * | | | | | Merge branch 'master' into allauth-user-settingsGravatar scragly2019-11-11-49/+1123
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #278 from python-discord/active-infractions-validationGravatar Sebastiaan Zeeff2019-11-03-4/+1069
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Validation for active infractions
| * | | | | | | Resolve migration merge conflictsGravatar Sebastiaan Zeeff2019-11-03-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since other pull requests were merged that also included migrations for the API app, this PR needed to be updated to avoid conflicts in the migration history. In addition, the test files contained names of specific migration files that needed to be updated to the correct names after the merge resolution.
| * | | | | | | Merge branch 'master' into active-infractions-validationGravatar Sebastiaan Zeeff2019-11-03-82/+106
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make test less fragile and improve test nameGravatar Sebastiaan Zeeff2019-10-19-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `test_returns_400_for_active_infractions_of_type_that_cannot_be_ active` test relied on the order in which the validation was done since it contained incompatible combinations of arguments. The test has been changed to make sure the data is valid except for the thing we actually want to test. I have also tried to improve the name of the test that tests the `test_unique_constraint_accepts_active_infraction_after_inactive_ infraction` test. It now includes the logic of what it does, but not the entire name of the test it's testing.
| * | | | | | | Fix indentation and missing word in docstringGravatar Sebastiaan Zeeff2019-10-19-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last two lines in the docstring of `InfractionFactory` in the `test_active_infraction_migration.py` file were overindented by one space. I've removed the space. The docstring of the `test_loader_build_graph_gets_called_once` method in the `MigrationsTestCaseNoSideEffectsTests` calss of the `test_base.py` file was missing two words. Corrected.
| * | | | | | | Apply feedback for pull request #278Gravatar Sebastiaan Zeeff2019-10-19-273/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/python-discord/site/pull/278 This commit applies the feedback given to PR #278. I have made a number of significant changes: - I have added tests for the `MigrationsTestCase` class, including a test to see if the test case travels to the specified points in the migration history. - The dictionary of infracted users in the active migration tests now uses informative strings as keys. This makes it easier to relate a specific test to the data it's testing. - I have simplified the migration query logic by replacing unneeded Q objects by simpler keyword arguments to `filter` method calls. - I have removed the custom validation logic for allowing only one active infraction of a given type per user and replaced it by a `UniqueTogetherValidator` with a custom validation error message. - `test_unique_constraint_accepts_active_infraction_after_inactive_ infraction` relied on an Error results instead of a Fail result to indicate an issue with the database constraint. Since a fail should lead to a Fail status, I've replaced it by a try-except block that signals a test failure if an `IntegrityError` was caught by it.
| * | | | | | | Solve migration conflict by renaming migrationsGravatar Sebastiaan Zeeff2019-10-18-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The migration files were generated and named before the migrations added by other pull requests. This caused the migration path to diverge. Since the migrations did not touch the same models, the solution was to rename the migration files to place them at the end of the migration history.
| * | | | | | | Merge branch 'master' into active-infractions-validationGravatar Sebastiaan Zeeff2019-10-18-124/+1389
| |\ \ \ \ \ \ \
| * | | | | | | | Prevent double active infractions with constraintGravatar Sebastiaan Zeeff2019-10-08-2/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/python-discord/site/issues/273 This commits adds a UniqueConstraint for active infractions on a combination of the `user` and `type` field. This means that a user can only have one active infraction of a given type in the database at any time. I've also added tests to make sure that this behaves as expected.