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 #364

Merged
merged 4 commits into from
Oct 12, 2024
Merged

Chore: update main from develop #364

merged 4 commits into from
Oct 12, 2024

Conversation

JustSamuel
Copy link
Contributor

Description

Small fixes and a new feature.

Types of changes

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

@JustSamuel JustSamuel changed the title Chore: update main with develop Chore: update main from develop Oct 12, 2024
Copy link

Triggered from #364 by @​JustSamuel.

Checking if we can fast forward main (ccb939f) to develop (37a93e2).

Target branch (main):

commit ccb939f6b5f0c8cfc759e53846a3c68fc7f4543a (HEAD -> main, tag: v1.7.0, origin/main)
Author: Victor Klomp <victor.klomp@gmail.com>
Date:   Mon Sep 16 13:18:39 2024 +0200

    feat(pos-display): Alcohol time warning (#347)
    
    * feat(pos): fetch alc. time
    
    * fix(pos-settings): Alcohol time with better timezone calculation
    
    * fix(pos-display): Add a warning for alcohol time when tab is selected
    
    * fix(pos-display): Remove seconds from alcohol warning

Pull request (develop):

commit 37a93e216671f9a2e7c1e0121c0aaa6d04469539 (pull_request/develop)
Author: Ruben Lagerwerf <98549214+RubenLWF@users.noreply.github.com>
Date:   Sat Oct 12 20:20:55 2024 +0200

    feat: Flag transaction link (#363)

It is possible to fast forward main (ccb939f) to develop (37a93e2). 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 merged commit 37a93e2 into main Oct 12, 2024
8 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