Skip to content

Commit

Permalink
Mostly Small Updates + Security Bumps | Moore v.3.1.1 (#721)
Browse files Browse the repository at this point in the history
* 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

---------

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>
  • Loading branch information
10 people committed Feb 22, 2023
1 parent d1d3371 commit f103d0a
Show file tree
Hide file tree
Showing 34 changed files with 285 additions and 223 deletions.
18 changes: 0 additions & 18 deletions .env-normal-template

This file was deleted.

File renamed without changes.
154 changes: 144 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,172 @@ __pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
src/media/
db.sqlite3-journal

# Compressor
CACHE/
# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# virtualenv
# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm project settings
# Compressor
CACHE/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
.idea/
.DS_Store

# ENV
.env
.env-normal

# VSCode
.vscode

# Docker data
postgres-data/

src/media/
*.log

72 changes: 39 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,53 +8,59 @@ applications. Built using [Wagtail](https://wagtail.io/) and the [Django](https:
Moore intends to replace obfuscated custom applications. This is why this
project keeps a high regard to programming practice and documentation.

Any questions about the project can be send to the [UTN system
Any questions about the project can be sent to the [UTN system
administrator](mailto:admin@utn.se).

Before contributing please read through our [contribution
guidelines](CONTRIBUTING.md).

## Getting Started - Virtual Environment
## Getting Started

To set up a local version of moore, use **either** Docker or a virtual environment (**recommended**).

### Using Virtual Environment

To get started with Project Moore, follow these instructions to set up a
**development** environment:

1. Install Python 3, at least version 3.6 or up.
2. [Install postgresql](INSTALLING_POSTGRES.md)
2. Install the following python packages:
- python3-venv
- python3-dev
- build-essentials
- libpq-dev
3. Clone the repository.
3. Copy the file `.env-normal-template` and name the copy `.env-normal`
3. Fill in the necessary variables in `.env`. `MELOS_URL` and `MELOS_ADMIN` are required. You might have to fill in some database credidentils. Check `src/moore/settings/dev.py` for which default values are used if you don't specify and credidentials.
4. Run `source ./source_me.sh` to create a virtual environment.
4. Run `pip install --upgrade pip` to make sure that pip is running the latest version
5. Run `pip install -r dev-requirements.txt`
6. Use `cd src` to enter the website directory.
7. Run `./manage.py migrate` to initialize the database.
8. Run `./manage.py createsuperuser` to create an admin user.
3. Install the following python packages:
- python3-venv
- python3-dev
- build-essential
- libpq-dev
4. Clone the repository.
5. Copy the file `.env-template` and name the copy `.env`
6. Fill in the necessary variables in `.env`. `MELOS_URL` and `MELOS_ADMIN` are required. You might have to fill in some database credidentils. Check `src/moore/settings/base.py` for which default values are used if you don't specify and credidentials.
7. Run `source ./source_me.sh` to create a virtual environment.
8. Run `pip install --upgrade pip` to make sure that pip is running the latest version
9. Run `pip install -r dev-requirements.txt`
10. Use `cd src` to enter the website directory.
11. Run `./manage.py migrate` to initialize the database.
12. Run `./manage.py compilemessages` to create all the translations.
13. Run `./manage.py createsuperuser` to create an admin user. (if the ssn is not passed, the most likely fault lies with the db-credentials)

During development, you can run a test web server using `./manage.py runserver`.

**IMPORTANT!** When running any command in moore, you must be in the virtual environment (a.k.a. `source source_me.sh`)

## Getting Started - Docker
### Using Docker

If you can use Docker, there is an alternative way to get your development
If you cannot use a virtual environment, there is an alternative way to get your development
environment all set up:

1. Install [docker engine](https://docs.docker.com/engine/install/)
1. Install [docker compose](https://docs.docker.com/compose/install/).
(On Ubuntu you can install `docker-compose` with `sudo apt install docker-compose`)
(On Ubuntu you can install `docker-compose` with `sudo apt install docker-compose`)
1. Clone the repository.
2. Copy `.env-docker-template` to `.env` and fill in the environments.
3. Run `docker-compose up` create and start the docker instance
4. Run `docker exec -it moore python src/manage.py migrate` to initialize the
database
5. Run `docker exec -it moore python src/manage.py createsuperuser` to create an admin
user.
1. Copy `.env-docker-template` to `.env` and fill in the environments.
1. Run `docker-compose up` create and start the docker instance
1. Run `docker exec -it moore python src/manage.py migrate` to initialize the
database
1. Run `docker exec -it moore python src/manage.py compilemessages` to create all the translations
1. Run `docker exec -it moore python src/manage.py createsuperuser` to create an admin
user.

The Moore application is now available on `http://localhost:8000` and can be started using `docker-compose up -d` (the `-d` flag starts the instance in the background) and stopped `docker-compose stop`.

Expand All @@ -76,32 +82,32 @@ These tests are run automatically using Github Actions.
If, however, you want to run these tests locally you can run the following
commands in the project root directory:

- `./src/manage.py test src` - to test with our Django test suites
- `flake8 src` - to run the flake8 style enforcer
- `./src/manage.py test src` - to test with our Django test suites
- `flake8 src` - to run the flake8 style enforcer

## Translating

Project Moore intends to be multilingual. The web application is available in
both Swedish and English. Whenever any translatable text is added or changed it
should be translated using translation files.

*Within Project Moore we use American English.*
_Within Project Moore we use American English._

To create translations for an app:

1. `cd src/<appname>`
1. `../manage.py makemessages -l sv`
2. This will create or update the files under `src/<appname>/locale/`.
3. Use poedit (or your favourite tool -- please do not use a plain text editor
since those cannot handle all the subtleties) to fix the translations.
4. `../manage.py compilemessages`
1. This will create or update the files under `src/<appname>/locale/`.
1. Use [poedit](https://poedit.net/) (or your favourite tool -- please do not use a plain text editor
since those cannot handle all the subtleties) to fix the translations.
1. `../manage.py compilemessages`

## Notes about the materialize framework

Project moore uses materialize as a css framework to get pre-built components.
The following components have been disabled in the `materialize.scss` file in the materialize app folder:

- `navbar`
- `navbar`

The reason for this is that they are not needed and are interfering with the code that we write. Keep this in mind
when updating or reinstalling materialize.
Expand Down
16 changes: 9 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

Django[argon2]==3.2.3
wagtail==2.13

Django[argon2]==3.2.17
wagtail==2.16.2

# External Libraries
requests==2.27.1
requests==2.28.2

# Templates
django-compressor==2.4.1
Expand All @@ -19,13 +18,13 @@ rules==3.3
django-simple-email-confirmation==0.70

# Logging
sentry-sdk==1.5.11
sentry-sdk==1.15.0

# Postgres
psycopg2==2.9.3
psycopg2==2.9.5

# Phonenumber validation
phonenumbers==8.12.48
phonenumbers==8.13.6

# Wagtail media module
wagtailmedia==0.9.0
Expand All @@ -36,3 +35,6 @@ djangorestframework==3.13.1
wagtail-django-recaptcha==1.0

django-jsonschema-form==1.0.3

# Improved environment variable handling
python-decouple==3.7
4 changes: 0 additions & 4 deletions source_me.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,3 @@ else
python3 -m venv venv
source venv/bin/activate
fi

if [ -f .env-normal ]; then
source .env-normal
fi
Binary file removed src/blocks/locale/sv/LC_MESSAGES/django.mo
Binary file not shown.
Binary file removed src/branding/locale/sv/LC_MESSAGES/django.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion src/branding/wagtail_hooks.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from wagtail.contrib.modeladmin.options import ModelAdmin, \
modeladmin_register, ThumbnailMixin, ModelAdminGroup
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from instagram.models import InstagramFeedAdmin
from branding.models import Logo

Expand Down
2 changes: 1 addition & 1 deletion src/events/views/admin_unassign_unpaid.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def admin_unassign_unpaid(request, pos_id=None):
if 'confirm' in request.POST:
for ticket in unpaid_tickets:
Participant.objects.filter(ticket=ticket).delete()
EventApplication.filter(
EventApplication.objects.filter(
event=event, event_applicant=ticket.owner).delete()
ticket.owner = None
ticket.save()
Expand Down
Binary file removed src/google/locale/sv/LC_MESSAGES/django.mo
Binary file not shown.
Binary file removed src/home/locale/sv/LC_MESSAGES/django.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion src/instagram/blocks/instagram_feed_chooser_block.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from wagtail.core import blocks
from instagram.models import InstagramFeed
from django import forms
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _


class InstagramFeedChooserBlock(blocks.ChooserBlock):
Expand Down
Binary file removed src/instagram/locale/sv/LC_MESSAGES/django.mo
Binary file not shown.
Loading

0 comments on commit f103d0a

Please sign in to comment.