Chore: update main with develop #328
Merged
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
…clarations, causing type-check issues (#321)
* feat(dashboard/admin/single-user-view): Added new user details form card * feat: I don't know what I added, but I need to work on other things * refactor(dashboard/admin-single-user-view): remove old user edit card and dependencies * bug-introduce(dashboard/admin-single-user-view): bug where v-if in inputspan breaks the page * fix(dashboard/admin-single-user-view): fixed a v-if breaking the entire page * feat(dashboard/admin-single-user-view): form now auto fills user info * feat(dashboard/admin-single-user-view): fixed up styling of single user view * refactor(dashboard/components): removed change info component * feat(dashboard/admin-single-user-view): redid a little styling of the User info card and the balance card * fix(dashboard/admin-single-user-view): type check errors * feat(dashboard/admin-single-user-view): added proper placeholders to forms * refactor(dashboard/user-edit-form): small code improvements * fix(dashboard/user-edit-form): nickname cannot be null error, even though it is allowed * fix(dashboard/admin-single-user-view): fixed some type-check issues
* refactor(dashboard/user-overview): refactored create user form * fix(dashboard/user-overview): re-added code that was thought to be unused * refactor(dashboard/user-create-form): some small code changes
|
Triggered from #328 by @JustSamuel. Checking if we can fast forward Target branch ( commit a751c459a566b562c26f52aec6201f320f4672ca (HEAD -> main, tag: v1.4.2, origin/main)
Author: Robin van Dijke <[email protected]>
Date: Thu Aug 29 15:14:30 2024 +0200
hotfix(quick-user-overview): Improvements to the quick overview card (#318)
* hotfix(quick-overview): fixed quick overview not showing gewisId
feat(user-landing-view/quick-overview): made quick overview show on mobile on user landing page
feat(dashboard/quick-overview): added underage message to quick overview component
* fix(components/user-info): under age message not conditionally renderingPull request ( commit 997579946f6999cdb97a78bdb9a6d48283db4975 (pull_request/develop)
Author: Robin van Dijke <[email protected]>
Date: Wed Sep 4 14:19:51 2024 +0200
refactor(dashboard/user-overview): refactored create user form (#324)
* refactor(dashboard/user-overview): refactored create user form
* fix(dashboard/user-overview): re-added code that was thought to be unused
* refactor(dashboard/user-create-form): some small code changesIt is possible to fast forward |
|
Triggered from #328 by @JustSamuel. Checking if we can fast forward Target branch ( commit a751c459a566b562c26f52aec6201f320f4672ca (HEAD -> main, tag: v1.4.2, origin/main)
Author: Robin van Dijke <[email protected]>
Date: Thu Aug 29 15:14:30 2024 +0200
hotfix(quick-user-overview): Improvements to the quick overview card (#318)
* hotfix(quick-overview): fixed quick overview not showing gewisId
feat(user-landing-view/quick-overview): made quick overview show on mobile on user landing page
feat(dashboard/quick-overview): added underage message to quick overview component
* fix(components/user-info): under age message not conditionally renderingPull request ( commit d416d03afb1b1d1e05196219d7d4e48acef7a687 (pull_request/develop)
Author: Samuel <[email protected]>
Date: Wed Sep 4 14:32:15 2024 +0200
fix: bump stripejs version (#327)It is possible to fast forward |
CodeNamedRobin
approved these changes
Sep 4, 2024
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.
No description provided.