NTI-work inclusion #724
Merged
NTI-work inclusion #724
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was
linked to
issues
Feb 15, 2023
dakaza98
requested changes
Feb 16, 2023
|
What will happen to existing footers on the website when the migration is done? I assume that for one of the languages they will be completely empty? Which language will the current footer be transferred to? I'm thinking it a manual migration will be needed or if website owners need to be informed about this change so that they can fix both versions. Although come to think of it, not all website owners might be using the footer or even have access to them |
Co-authored-by: Daniel Fehrm <daniel@fehrm.se>
|
Going to add migration to make sure the footers are not empty + fix translation |
Lofkvist
previously approved these changes
Feb 19, 2023
…fix of serverbreaking issue in branding/models.py
|
migration to copy data from the existing footer column is now in place |
dakaza98
approved these changes
Mar 6, 2023
Marmingen
added a commit
that referenced
this pull request
Mar 22, 2023
* urlize links in role descriptions and avoid long links to break the page (#638) * Bump phonenumbers from 8.12.23 to 8.12.47 (#647) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.23 to 8.12.47. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](daviddrysdale/python-phonenumbers@v8.12.23...v8.12.47) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * More event bugfixes (#640) * Fixes - Make it clearer when users haven't recieved a ticket for an event - Order participants by email. - Make sure instances are saved when 'ready_to_pay' is pressed. * Lint fixes * More lint fixes Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump psycopg2 from 2.8.6 to 2.9.3 (#610) Bumps [psycopg2](https://github.com/psycopg/psycopg2) from 2.8.6 to 2.9.3. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) --- updated-dependencies: - dependency-name: psycopg2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump wagtailmedia from 0.7.0 to 0.9.0 (#639) Bumps [wagtailmedia](https://github.com/torchbox/wagtailmedia) from 0.7.0 to 0.9.0. - [Release notes](https://github.com/torchbox/wagtailmedia/releases) - [Changelog](https://github.com/torchbox/wagtailmedia/blob/main/CHANGELOG.md) - [Commits](torchbox/wagtailmedia@v0.7.0...v0.9.0) --- updated-dependencies: - dependency-name: wagtailmedia dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * change list display for applications and positions (#573) * change list display for applications * fixed position list display Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump requests from 2.25.1 to 2.27.1 (#652) Bumps [requests](https://github.com/psf/requests) from 2.25.1 to 2.27.1. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.25.1...v2.27.1) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rules from 3.0 to 3.3 (#651) Bumps [rules](https://github.com/dfunckt/django-rules) from 3.0 to 3.3. - [Release notes](https://github.com/dfunckt/django-rules/releases) - [Changelog](https://github.com/dfunckt/django-rules/blob/master/CHANGELOG.md) - [Commits](dfunckt/django-rules@v3.0.0...v3.3.0) --- updated-dependencies: - dependency-name: rules dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump djangorestframework from 3.12.4 to 3.13.1 (#653) Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.12.4 to 3.13.1. - [Release notes](https://github.com/encode/django-rest-framework/releases) - [Commits](encode/django-rest-framework@3.12.4...3.13.1) --- updated-dependencies: - dependency-name: djangorestframework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump django-libsass from 0.8 to 0.9 (#654) Bumps [django-libsass](https://github.com/torchbox/django-libsass) from 0.8 to 0.9. - [Release notes](https://github.com/torchbox/django-libsass/releases) - [Changelog](https://github.com/torchbox/django-libsass/blob/main/CHANGELOG.txt) - [Commits](torchbox/django-libsass@v0.8...v0.9) --- updated-dependencies: - dependency-name: django-libsass dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump phonenumbers from 8.12.47 to 8.12.48 (#656) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.47 to 8.12.48. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](daviddrysdale/python-phonenumbers@v8.12.47...v8.12.48) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sentry-sdk from 1.1.0 to 1.5.11 (#655) Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.1.0 to 1.5.11. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](getsentry/sentry-python@1.1.0...1.5.11) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Feat/gdpr button (#687) * #649 Added html for gdpr button * #649 Added field for gdpr button * Added text and link for GDPR field * Added translation for GDPR * Flake8 now works * mellanslag Co-authored-by: Einar Johansson <ejrobb09@gmail.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Update CHANGELOG.md * Changelog updated * Update README.md * Update README.md * Update README.md * remove login notice (#714) * update wagtail to 2.13.5 (#717) * Update django to 3.2.17 (#716) * Update requirements.txt * change django to 3.2.17 --------- Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump phonenumbers from 8.12.48 to 8.13.6 (#718) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.48 to 8.13.6. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](daviddrysdale/python-phonenumbers@v8.12.48...v8.13.6) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Update README.md * Use python decouple for environment variables (#715) * use python decouple for env variables * remove old staging settings * Make melos env variables not required in tests * Flake8 * Flake8 - Flake8 --------- Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump psycopg2 from 2.9.3 to 2.9.5 (#725) Bumps [psycopg2](https://github.com/psycopg/psycopg2) from 2.9.3 to 2.9.5. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) --- updated-dependencies: - dependency-name: psycopg2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix/security (#722) * Merge dev -> fix (#708) * Update CHANGELOG.md * Changelog updated * Update README.md * Update README.md * Update README.md * Update instagram_feed_chooser_block.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update instagram_tags.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update views.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update wagtail_hooks.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update data_migrations.py stream_data is deprecated since wagtail 2.12, replaced with raw_data (OBS, better solution is to increment the base StreamField as a list, but this needs more consideration) Make sure to update wagtail to > 2.12 in this patch * Updated deprecated force_text --------- Co-authored-by: Robin Dymér <robin.dymer@hotmail.com> * Update gitignore with official github gitignore (#731) * Translation of the gdpr-button (#696) * #649 Added html for gdpr button * #649 Added field for gdpr button * Added text and link for GDPR field * Added translation for GDPR * Flake8 now works * mellanslag * failed * Fixed faultytranslation * Flake8 * Update django.po --------- Co-authored-by: Einar Johansson <ejrobb09@gmail.com> Co-authored-by: plastpase123 <linus.hellstrm@hotmail.com> Co-authored-by: Marmingen <melker.marminge@telia.com> * Update README.md * Bump wagtail from 2.13 to 2.16.2 (#646) Bumps [wagtail](https://github.com/wagtail/wagtail) from 2.13 to 2.16.2. - [Release notes](https://github.com/wagtail/wagtail/releases) - [Changelog](https://github.com/wagtail/wagtail/blob/main/CHANGELOG.txt) - [Commits](wagtail/wagtail@v2.13...v2.16.2) --- updated-dependencies: - dependency-name: wagtail dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump sentry-sdk from 1.5.11 to 1.15.0 (#710) Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.5.11 to 1.15.0. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](getsentry/sentry-python@1.5.11...1.15.0) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Ignore .mo files from git (#735) * delete and ignore .mo * update readme with create translations * added translations to docker installation --------- Co-authored-by: Marmingen <melker.marminge@telia.com> * Bump requests from 2.27.1 to 2.28.2 (#733) Bumps [requests](https://github.com/psf/requests) from 2.27.1 to 2.28.2. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.27.1...v2.28.2) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Fix/unassign unpaid tickets (#738) * Fixed bug * Bring branch up to date (#737) * Minor changes and GDPR-button feature (#689) * urlize links in role descriptions and avoid long links to break the page (#638) * Bump phonenumbers from 8.12.23 to 8.12.47 (#647) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.23 to 8.12.47. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](daviddrysdale/python-phonenumbers@v8.12.23...v8.12.47) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * More event bugfixes (#640) * Fixes - Make it clearer when users haven't recieved a ticket for an event - Order participants by email. - Make sure instances are saved when 'ready_to_pay' is pressed. * Lint fixes * More lint fixes Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump psycopg2 from 2.8.6 to 2.9.3 (#610) Bumps [psycopg2](https://github.com/psycopg/psycopg2) from 2.8.6 to 2.9.3. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) --- updated-dependencies: - dependency-name: psycopg2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump wagtailmedia from 0.7.0 to 0.9.0 (#639) Bumps [wagtailmedia](https://github.com/torchbox/wagtailmedia) from 0.7.0 to 0.9.0. - [Release notes](https://github.com/torchbox/wagtailmedia/releases) - [Changelog](https://github.com/torchbox/wagtailmedia/blob/main/CHANGELOG.md) - [Commits](torchbox/wagtailmedia@v0.7.0...v0.9.0) --- updated-dependencies: - dependency-name: wagtailmedia dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * change list display for applications and positions (#573) * change list display for applications * fixed position list display Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump requests from 2.25.1 to 2.27.1 (#652) Bumps [requests](https://github.com/psf/requests) from 2.25.1 to 2.27.1. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.25.1...v2.27.1) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rules from 3.0 to 3.3 (#651) Bumps [rules](https://github.com/dfunckt/django-rules) from 3.0 to 3.3. - [Release notes](https://github.com/dfunckt/django-rules/releases) - [Changelog](https://github.com/dfunckt/django-rules/blob/master/CHANGELOG.md) - [Commits](dfunckt/django-rules@v3.0.0...v3.3.0) --- updated-dependencies: - dependency-name: rules dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump djangorestframework from 3.12.4 to 3.13.1 (#653) Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.12.4 to 3.13.1. - [Release notes](https://github.com/encode/django-rest-framework/releases) - [Commits](encode/django-rest-framework@3.12.4...3.13.1) --- updated-dependencies: - dependency-name: djangorestframework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump django-libsass from 0.8 to 0.9 (#654) Bumps [django-libsass](https://github.com/torchbox/django-libsass) from 0.8 to 0.9. - [Release notes](https://github.com/torchbox/django-libsass/releases) - [Changelog](https://github.com/torchbox/django-libsass/blob/main/CHANGELOG.txt) - [Commits](torchbox/django-libsass@v0.8...v0.9) --- updated-dependencies: - dependency-name: django-libsass dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Bump phonenumbers from 8.12.47 to 8.12.48 (#656) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.47 to 8.12.48. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](daviddrysdale/python-phonenumbers@v8.12.47...v8.12.48) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sentry-sdk from 1.1.0 to 1.5.11 (#655) Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.1.0 to 1.5.11. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](getsentry/sentry-python@1.1.0...1.5.11) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> * Feat/gdpr button (#687) * #649 Added html for gdpr button * #649 Added field for gdpr button * Added text and link for GDPR field * Added translation for GDPR * Flake8 now works * mellanslag Co-authored-by: Einar Johansson <ejrobb09@gmail.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Update CHANGELOG.md * Changelog updated * Update README.md Co-authored-by: Daniel Fehrm <daniel@fehrm.se> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Linus Shoravi <42211142+lshoravi@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> Co-authored-by: Plastpase123 <62748997+Plastpase123@users.noreply.github.com> Co-authored-by: Einar Johansson <ejrobb09@gmail.com> * update wagtail to 2.13.5 (#717) * Update django to 3.2.17 (#716) * Update requirements.txt * change django to 3.2.17 --------- Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump phonenumbers from 8.12.48 to 8.13.6 (#718) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.48 to 8.13.6. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](daviddrysdale/python-phonenumbers@v8.12.48...v8.13.6) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Update README.md * Use python decouple for environment variables (#715) * use python decouple for env variables * remove old staging settings * Make melos env variables not required in tests * Flake8 * Flake8 - Flake8 --------- Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump psycopg2 from 2.9.3 to 2.9.5 (#725) Bumps [psycopg2](https://github.com/psycopg/psycopg2) from 2.9.3 to 2.9.5. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) --- updated-dependencies: - dependency-name: psycopg2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix/security (#722) * Merge dev -> fix (#708) * Update CHANGELOG.md * Changelog updated * Update README.md * Update README.md * Update README.md * Update instagram_feed_chooser_block.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update instagram_tags.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update views.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update wagtail_hooks.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update data_migrations.py stream_data is deprecated since wagtail 2.12, replaced with raw_data (OBS, better solution is to increment the base StreamField as a list, but this needs more consideration) Make sure to update wagtail to > 2.12 in this patch * Updated deprecated force_text --------- Co-authored-by: Robin Dymér <robin.dymer@hotmail.com> * Update gitignore with official github gitignore (#731) * Translation of the gdpr-button (#696) * #649 Added html for gdpr button * #649 Added field for gdpr button * Added text and link for GDPR field * Added translation for GDPR * Flake8 now works * mellanslag * failed * Fixed faultytranslation * Flake8 * Update django.po --------- Co-authored-by: Einar Johansson <ejrobb09@gmail.com> Co-authored-by: plastpase123 <linus.hellstrm@hotmail.com> Co-authored-by: Marmingen <melker.marminge@telia.com> * Update README.md * Bump wagtail from 2.13 to 2.16.2 (#646) Bumps [wagtail](https://github.com/wagtail/wagtail) from 2.13 to 2.16.2. - [Release notes](https://github.com/wagtail/wagtail/releases) - [Changelog](https://github.com/wagtail/wagtail/blob/main/CHANGELOG.txt) - [Commits](wagtail/wagtail@v2.13...v2.16.2) --- updated-dependencies: - dependency-name: wagtail dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump sentry-sdk from 1.5.11 to 1.15.0 (#710) Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.5.11 to 1.15.0. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](getsentry/sentry-python@1.5.11...1.15.0) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Ignore .mo files from git (#735) * delete and ignore .mo * update readme with create translations * added translations to docker installation --------- Co-authored-by: Marmingen <melker.marminge@telia.com> * Bump requests from 2.27.1 to 2.28.2 (#733) Bumps [requests](https://github.com/psf/requests) from 2.27.1 to 2.28.2. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.27.1...v2.28.2) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Daniel Fehrm <daniel@fehrm.se> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Linus Shoravi <42211142+lshoravi@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> Co-authored-by: Plastpase123 <62748997+Plastpase123@users.noreply.github.com> Co-authored-by: Einar Johansson <ejrobb09@gmail.com> Co-authored-by: Robin Dymér <robin.dymer@hotmail.com> Co-authored-by: plastpase123 <linus.hellstrm@hotmail.com> Co-authored-by: Marmingen <melker.marminge@telia.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Robin Dymér <robin.dymer@hotmail.com> Co-authored-by: Daniel Fehrm <daniel@fehrm.se> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Linus Shoravi <42211142+lshoravi@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> Co-authored-by: Plastpase123 <62748997+Plastpase123@users.noreply.github.com> Co-authored-by: Einar Johansson <ejrobb09@gmail.com> Co-authored-by: plastpase123 <linus.hellstrm@hotmail.com> Co-authored-by: Marmingen <melker.marminge@telia.com> * reset checks * Wagtail deprecation fix (#741) * Update base.py * Update dev.py * NTI-work inclusion (#724) * NTI-work + Fehrm additions + flake8 enf * Make manage.py executable * Update src/involvement/locale/sv/LC_MESSAGES/django.po Co-authored-by: Daniel Fehrm <daniel@fehrm.se> * fix translations * empty migration * bring up to date * fix migration conflic in involvment + add copy of footer info + quickfix of serverbreaking issue in branding/models.py * access to manage.py --------- Co-authored-by: Daniel Fehrm <daniel@fehrm.se> Co-authored-by: Marmingen <melker.marminge@telia.com> * Fix for logo issue (#739) "." where used where "-" should have been used in the changed files. Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Daniel Fehrm <daniel@fehrm.se> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Linus Shoravi <42211142+lshoravi@users.noreply.github.com> Co-authored-by: Johan Andersson Östling <johandost@protonmail.com> Co-authored-by: Plastpase123 <62748997+Plastpase123@users.noreply.github.com> Co-authored-by: Einar Johansson <ejrobb09@gmail.com> Co-authored-by: Robin Dymér <robin.dymer@hotmail.com> Co-authored-by: plastpase123 <linus.hellstrm@hotmail.com> Co-authored-by: Marmingen <melker.marminge@telia.com> Co-authored-by: Noahw12 <90899979+Noahw12@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the Change
Makes sure the work done by the NTI students gets merged