Sync with master #802
Merged
Sync with master #802
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
* Bug fix. Removed unnecessary text next to the title in webpage (#785) * Fix/sorted section list 467 (#790) * 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. * Fixed number check. (#791) Reusing the the check that is used when creating a member on https://utn.se/accounts/register/ * Fix footer translation (#794) * 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 (#784) * 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 (#793) * Forced date to be handeld with swedish format * Fix build issue --------- Co-authored-by: Robin Dymér <[email protected]> --------- Co-authored-by: GansaK <[email protected]> Co-authored-by: Hampus Toft <[email protected]> Co-authored-by: Ludvig Aldén <[email protected]>
* Serve utn.se/admin at admin.utn.se (#798) --------- Co-authored-by: [ludvigalden](https://github.com/ludvigalden) and [hato1883](https://github.com/hato1883)
Co-authored-by: Ludvig Aldén <[email protected]>
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.
The two previous syncs of the master branch with the development branch have been done using squashs. This should synchronise the commit history, and make things easier if rebase is used in the future.