Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with development #801

Merged
merged 7 commits into from
Feb 1, 2024
Merged

Sync with development #801

merged 7 commits into from
Feb 1, 2024

Conversation

ludvigalden
Copy link
Contributor

GansaK and others added 7 commits October 4, 2023 22:28
* Sort section list by its abbreviation

* Changed RegistrationForm to CustomUserCreationForm
This is the same form that admin page uses when creating users.
RegistrationForm is not affected by change in forms.py in commit:
9be07d3
and thereby did not get a sorted section list from previous change.
I do not see the diffrence in accont creation between the two forms.

* Changed forms.py
Changed so that section sorting occurs on all ModelForm's.
This allows us to yet again use a custom ModelForm for admin page
and another for the registration page.
Reusing the the check that is used when creating a member on
https://utn.se/accounts/register/
* fixed the quickfix, added translation string to po

* Test changing req.

* Undo

* Test #2

---------

Co-authored-by: Robin Dymér <[email protected]>
* rename melos to unicore

* fix formatting

* Fix lint

* Fix migrations

* Fix build check bug

---------

Co-authored-by: Robin Dymér <[email protected]>
* Forced date to be handeld with swedish format

* Fix build issue

---------

Co-authored-by: Robin Dymér <[email protected]>
* A Proof of concept solution to server django admin page at admin.domain.com Can be used to show wagtail admin (probably). Uses 'django-host' to server subdomain

* Changed to wagtail admin page

* Fixed configs so default is used

* fix login paths for admin, redirect /admin to admin subdomain

* fix comments

* support reversing admin paths

* fix tests

---------

Co-authored-by: [ludvigalden](https://github.com/ludvigalden) and [hato1883](https://github.com/hato1883)
@ludvigalden ludvigalden merged commit 155cb69 into master Feb 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants