aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' into #201-django-allauthGravatar Gareth Coles2019-10-11-12/+225
|\
| * Merge pull request #281 from python-discord/simple-admin-log-entry-viewGravatar Mark2019-10-11-6/+74
| |\ | | | | | | Allow viewing log entries in the Django Admin.
| | * 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-1/+140
| | |\ | | |/ | |/|
| * | 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.
| * | | Merge pull request #279 from python-discord/faviconsGravatar Leon Sandøy2019-10-11-1/+51
| |\ \ \ | | | | | | | | | | Add favicons; workaround for gitattributes
| | * | | Add favicons; workaround for gitattributesGravatar ByteCommander2019-10-08-1/+51
| |/ / /
| | | * 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
| | |
* | | Re-lock Pipfile due to merge with masterGravatar Gareth Coles2019-10-06-18/+17
| | |
* | | Merge branch 'master' into #201-django-allauthGravatar Gareth Coles2019-10-06-2/+3
|\| | | | | | | | | | | | | | | | | # Conflicts: # Pipfile # Pipfile.lock
| * | disable usage of pyuwsgi on windows due to incompatibility, library is only ↵Gravatar Joseph Banks2019-10-06-65/+66
| | | | | | | | | | | | used in production anyway
* | | 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
| | |
* | | Message styling (default to light for now)Gravatar Gareth Coles2019-10-06-25/+19
| | |
* | | Move messages to the top rightGravatar Gareth Coles2019-10-06-18/+35
| | |
* | | Test allauth redirect URLsGravatar Gareth Coles2019-10-05-0/+14
| | |
* | | Set up needed Allauth URLs and add login/logout to navbarGravatar Gareth Coles2019-10-05-1/+45
| | |
* | | Add MessageRedirectView and show messages on the index pageGravatar Gareth Coles2019-10-05-0/+59
| | |
* | | Clean up and comment signal testsGravatar Gareth Coles2019-10-04-19/+31
| | |
* | | Add docstrings to tests, and test role mapping __str__()Gravatar Gareth Coles2019-10-04-4/+19
| | |
* | | Tests for signal handlersGravatar Gareth Coles2019-10-04-5/+291
| | |
* | | Merge branch 'master' into #201-django-allauthGravatar Gareth Coles2019-10-04-1/+1
|\| |
| * | Merge pull request #275 from python-discord/flake8-exclude-fixGravatar Sebastiaan Zeeff2019-10-04-1/+1
| |\ \ | | | | | | | | Fix migrations exclude in flake8
| | * | Fix migrations exclude in flake8Gravatar MarkKoz2019-10-03-1/+1
| |/ / | | | | | | | | | They were not being excluded when flake8 was invoked via pre-commit.
* | | Hook up Allauth and model signals to handle group assignmentsGravatar Gareth Coles2019-10-03-1/+165
| | |
* | | Remove app_label from role mapping modelGravatar Gareth Coles2019-10-03-3/+0
| | | | | | | | | | | | Turns out, setting this *does* move the model to a different category under the admin - but it also reparents it to the referenced app, so the migrations are created under that app instead. Nasty.
* | | Add model to map Discord roles to Django permissions groupsGravatar Gareth Coles2019-10-03-0/+61
| | |
* | | Disable Allauth email verificationGravatar Gareth Coles2019-10-03-0/+2
| | |
* | | Re-add erroneously removed static filesGravatar Gareth Coles2019-10-03-0/+1316
| | |
* | | Remove accidental static files commit; fix AllauthGravatar Gareth Coles2019-10-03-1317/+1
| | |