aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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.
* blank commit to trigger deploymentGravatar Derek2019-10-22-0/+0
|
* 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
| * Merge branch 'master' into faviconsGravatar ByteCommander2019-10-12-1/+1
| |\
| * | Forgot to update base.html template with favicon changesGravatar ByteCommander2019-10-12-11/+9
| | |
* | | Merge pull request #286 from python-discord/wiki-polishGravatar Johannes Christ2019-10-14-77/+60
|\ \ \ | | | | | | | | Wiki polish (RE: Allauth)
| * | | 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
|/ / /
* | | Wiki: Permissions hotfix (#285)Gravatar scragly2019-10-14-0/+24
|\ \ \ | | | | | | | | Wiki: Permissions hotfix
| * | | Remove accidental comment before docstringGravatar Gareth Coles2019-10-14-1/+1
| | | |
| * | | Wiki: Permissions hotfixGravatar Gareth Coles2019-10-14-0/+24
|/ / /
* | | Django Allauth (#201) (#274)Gravatar scragly2019-10-14-7/+1061
|\ \ \ | |_|/ |/| | Django Allauth (#201)
| * | Merge branch 'master' into #201-django-allauthGravatar Gareth Coles2019-10-14-34/+26
| |\ \ | |/ / |/| |
* | | Merge pull request #282 from python-discord/upgrade-postgresql-to-12Gravatar Sebastiaan Zeeff2019-10-12-1/+1
|\ \ \ | | | | | | | | Bump PostgreSQL in compose.
| * \ \ Merge branch 'master' into upgrade-postgresql-to-12Gravatar Sebastiaan Zeeff2019-10-12-46/+36
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #283 from python-discord/faviconsGravatar Sebastiaan Zeeff2019-10-12-7/+7
|\ \ \ \ | | |_|/ | |/| | Update favicons (rounded corners, other improvements)
| * | | Merge branch 'master' into faviconsGravatar Leon Sandøy2019-10-12-50/+203
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #280 from python-discord/fix-home-responsiveGravatar Leon Sandøy2019-10-12-26/+18
|\ \ \ \ | | | | | | | | | | Improve homepage flex responsiveness
| * \ \ \ Merge branch 'master' into fix-home-responsiveGravatar Leon Sandøy2019-10-11-25/+236
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Improve homepage flex responsivenessGravatar ByteCommander2019-10-09-26/+18
| | | | |
| | * | | Update favicons (rounded corners, other improvements)Gravatar ByteCommander2019-10-11-7/+7
| | | | |
| | | * | Bump PostgreSQL in compose.Gravatar Johannes Christ2019-10-11-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This might break local PostgreSQL containers with the following error: postgres_1 | 2019-10-11 20:01:48.772 UTC [1] FATAL: database files are incompatible with server postgres_1 | 2019-10-11 20:01:48.772 UTC [1] DETAIL: The data directory was initialized by PostgreSQL version 11, which is not compatible with this version 12.0. You will need to do one of the following: - Delete the old data volume and start from scratch (simple, recommended). As we don't have an explicit volume configured, only the one the PostgreSQL image uses, this is as simple as running `docker-compose stop` followed by `docker-compose rm`. Afterwards, you can restart it. - The dump & restore route. Do this if you don't want to delete your container data. To do this, first switch the PostgreSQL version in `docker-compose.yml` back to `11`, then run the following commands: docker-compose stop # Stop all containers docker-compose start postgres # Start the database docker-compose exec postgres pg_dumpall -U pysite > db.sql # Pull a SQL dump docker-compose stop # Stop the containers again docker-compose rm # Remove the containers Now, update the PostgreSQL version in `docker-compose.yml` to `12` again, and run the following commands: docker-compose up -d postgres # Start the database docker-compose exec -T postgres psql -U pysite < db.sql # Pull in the dump rm db.sql # Cleanup garbage, if you want If you're on Windows, then I can't help you. Sorry.
| | | | * 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 pull request #272 from python-discord/tizzysaurus_landing_page_textGravatar Leon Sandøy2019-10-11-13/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | Improve the landing page text
| * | | | Merge branch 'master' into tizzysaurus_landing_page_textGravatar Leon Sandøy2019-10-11-77/+291
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'tizzysaurus_landing_page_text' of ↵Gravatar Leon Sandøy2019-10-05-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | github.com:python-discord/site into tizzysaurus_landing_page_text
| | * \ \ \ Merge branch 'master' into tizzysaurus_landing_page_textGravatar Leon Sandøy2019-10-05-1/+1
| | |\ \ \ \
| * | | | | | 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-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
| |/ / / / |/| | | |