aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site (follow)
Commit message (Collapse)AuthorAgeLines
* 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-121/+1342
|\
| * Add Code of Conduct to navbar submenuGravatar Sebastiaan Zeeff2019-10-17-0/+3
| | | | | | | | | | | | This commit adds a link to the Code of Conduct to the dropdown menu in the navbar. It does not include a direct link to the CoC policies, which are accessible via the Code of Conduct page.
| * Merge pull request #284 from python-discord/faviconsGravatar Johannes Christ2019-10-14-11/+9
| |\ | | | | | | Forgot to update base.html template with favicon changes
| | * Forgot to update base.html template with favicon changesGravatar ByteCommander2019-10-12-11/+9
| | |
| * | Wiki: Show breadcrumb without menus for users that can't edit, without the ↵Gravatar Gareth Coles2019-10-14-52/+58
| | | | | | | | | | | | root shown
| * | Wiki: Remove Django messages from Wiki templatesGravatar Gareth Coles2019-10-14-25/+0
| | | | | | | | | | | | We've already got this handled in the main base template for the site.
| * | Wiki: Hide breadcrumbs bar if the user can't editGravatar Gareth Coles2019-10-14-1/+3
| | |
| * | Remove accidental comment before docstringGravatar Gareth Coles2019-10-14-1/+1
| | |
| * | Wiki: Permissions hotfixGravatar Gareth Coles2019-10-14-0/+24
| | |
| * | Merge branch 'master' into #201-django-allauthGravatar Gareth Coles2019-10-14-33/+25
| |\|
| | * Merge branch 'master' into faviconsGravatar Leon Sandøy2019-10-12-50/+203
| | |\
| | | * Merge branch 'master' into fix-home-responsiveGravatar Leon Sandøy2019-10-11-24/+227
| | | |\
| | | * | Improve homepage flex responsivenessGravatar ByteCommander2019-10-09-26/+18
| | | | |
| | * | | Update favicons (rounded corners, other improvements)Gravatar ByteCommander2019-10-11-7/+7
| | | | |
| * | | | Allauth: Address reviews by @lemonsaurusGravatar Gareth Coles2019-10-14-39/+119
| | | | |
| * | | | Merge branch 'master' into #201-django-allauthGravatar Gareth Coles2019-10-11-13/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' into tizzysaurus_landing_page_textGravatar Leon Sandøy2019-10-11-11/+216
| | |\ \ \
| | * | | | Make the homepage paragraphier.Gravatar Leon Sandøy2019-10-05-6/+4
| | | | | |
| | * | | | Address code review from Scragly and Mark.Gravatar Leon Sandøy2019-10-05-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Makes various minor changes to commas and formulations.
| | * | | | Update the landing page text.Gravatar Leon Sandøy2019-10-01-7/+7
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | The new text was written by Tizzysaurus in his website cleanup project, and lifted from his google doc.
| * | | | Merge branch 'master' into #201-django-allauthGravatar Gareth Coles2019-10-11-11/+216
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Deny manual `LogEntry` creation.Gravatar Johannes Christ2019-10-11-0/+4
| | | | |
| | * | | Resolve migration merge conflicts.Gravatar Johannes Christ2019-10-11-1/+1
| | | | |
| | * | | Improve formatting for `has_delete_permission`, typespec.Gravatar Johannes Christ2019-10-11-1/+8
| | | | |
| | * | | Merge branch 'master' into simple-admin-log-entry-viewGravatar Johannes Christ2019-10-11-0/+131
| | |\ \ \
| | | * \ \ Merge pull request #269 from ↵Gravatar Johannes Christ2019-10-11-5/+100
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | python-discord/migrate-nominations-to-nominations-models Migrate nominations to the new Nomination model
| | | | * | Migrate nominations to new Nomination modelGravatar Sebastiaan Zeeff2019-09-30-5/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the migration to Django, we stored meta data on a nomination, such as the `reason` and `end_reason`, in the infraction table using "note" infractions, using a special prefix for the `reason`. We have since decided to move nominations out of the infraction context by creating a special `Nomination` model. However, given the complexity of the data migration, we did not yet migrate the old nomination data to this new model. This commit migrates that data by performing a data migration. The data migration works as follows: - Query all nomination data in chronological order; - Replay all nominations and add them to the `Nomination` model; - Delete the now obsolete `Infraction` entry. In addition, this commit also adds a useful string representation for `Nomination` objects.
| | | * | | Add favicons; workaround for gitattributesGravatar ByteCommander2019-10-08-0/+42
| | | | |/ | | | |/|
| | * | | Deny `LogEntry` deletion.Gravatar Johannes Christ2019-10-11-0/+5
| | | | |
| | * | | Allow filtering through metadata, and searching by message.Gravatar Johannes Christ2019-10-11-0/+2
| | | | |
| | * | | Remove old import.Gravatar Johannes Christ2019-10-11-2/+0
| | | | |
| | * | | Group fieldsets.Gravatar Johannes Christ2019-10-11-0/+5
| | | | |
| | * | | Use multi-column output from Django.Gravatar Johannes Christ2019-10-11-32/+1
| | | | |
| | * | | Pluralize properly.Gravatar Johannes Christ2019-10-11-0/+22
| | | | |
| | * | | Allow viewing log entries in the Django Admin.Gravatar Johannes Christ2019-10-11-11/+73
| | |/ /
| * | | Signals: Handle (and test) mapping updates/deletionsGravatar Gareth Coles2019-10-11-14/+125
| | | | | | | | | | | | | | | | This also enforces unique values for both attributes on the RoleMapping model. Supporting configurations where this isn't the case would introduce quite a lot of added complexity.
| * | | Signals: Fix test for `deletion=True` changeGravatar Gareth Coles2019-10-11-1/+1
| | | |
| * | | Signals: `add()` does require a list, a generator won't do.Gravatar Gareth Coles2019-10-11-2/+2
| | | |
| * | | Clean up signal tests as per @jchristgit's reviewGravatar Gareth Coles2019-10-11-9/+10
| | | |
| * | | Simplify signals.py as per @jchristgit's reviewGravatar Gareth Coles2019-10-11-10/+6
| | | |
| * | | Clarify _apply_groups kwarg (Thanks, @jchristgit)Gravatar Gareth Coles2019-10-11-1/+1
| | | | | | | | | | | | Co-Authored-By: Johannes Christ <[email protected]>
| * | | Register GH provider manually in testsGravatar Gareth Coles2019-10-06-0/+9
| | | |
| * | | Remove GH login implementation, out of scope of this PRGravatar Gareth Coles2019-10-06-2/+0
| | | |
| * | | Prevent saving emails, remove login pageGravatar Gareth Coles2019-10-06-86/+34
| | | |
| * | | Replace card on login page with notificationGravatar Gareth Coles2019-10-06-14/+6
| | | |
| * | | Login page and styling fixesGravatar Gareth Coles2019-10-06-23/+117
| | | |
| * | | Make the Bulma colours less saturatedGravatar Gareth Coles2019-10-06-4/+11
| | | |
| * | | Add missing CSS for notificationsGravatar Gareth Coles2019-10-06-0/+99
| | | |