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

Chore: update main from develop #444

Merged
merged 6 commits into from
Nov 8, 2024
Merged

Chore: update main from develop #444

merged 6 commits into from
Nov 8, 2024

Conversation

JustSamuel
Copy link
Contributor

Description

This release will contain some minor bug fixes here and there as well as two larger changes:

  • Feature/nfc login #439 will allow users to login with their nfc card.
  • feat: nginx config for pos #440 changes how the sudosos stack is structured, moving everything to a single nginx container as entry point. This menas that the point of sale will now be served in a subpath. The main version will be served under /pos/ and the develop under /pos-develop/

Related issues/external references

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

Copy link

github-actions bot commented Nov 8, 2024

Triggered from #444 by @​JustSamuel.

Checking if we can fast forward main (799b1c8) to develop (d5fb1db).

Target branch (main):

commit 799b1c8d92c7dbaa69ec5935f0f1929a4c5c9ae6 (HEAD -> main, tag: v1.9.0, origin/main)
Author: Samuel <[email protected]>
Date:   Sat Nov 2 13:51:33 2024 +0100

    feat: post refactoring invoice ui (#335)

Pull request (develop):

commit d5fb1db38c1b34a3a1b0ab4400314b0656ce4754 (pull_request/develop)
Author: Samuel <[email protected]>
Date:   Fri Nov 8 19:41:41 2024 +0100

    fix(pos): allow for dynamic base paths (#440)

It is possible to fast forward main (799b1c8) to develop (d5fb1db). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

@JustSamuel JustSamuel requested a review from SuperVK November 8, 2024 19:11
Copy link
Member

@SuperVK SuperVK left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to make sure sudopos.gewis.nl does not break before the CBC has the change to fix the URL that sudosos is loaded from.

@JustSamuel
Copy link
Contributor Author

Yes, this will need a more careful deployment.

@JustSamuel JustSamuel merged commit fbc0ab9 into main Nov 8, 2024
12 checks passed
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.

4 participants