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.

Sign up for GitHub

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

Jump to bottom

the current version of TEST should be deployed to DEMO, therefore this PR #90

Merged
merged 43 commits into from
Jan 8, 2024
Merged

the current version of TEST should be deployed to DEMO, therefore this PR #90

merged 43 commits into from
Jan 8, 2024

Commits on Nov 27, 2023

  1. merge 1629 into test

    @manjencic
    manjencic committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    7c9ff99 View commit details
    Browse the repository at this point in the history

  2. fix conflicts

    @manjencic
    manjencic committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    6f0e028 View commit details
    Browse the repository at this point in the history

  3. resolve conflicts

    @manjencic
    manjencic committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    a1aa6ba View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Merge pull request #30 from it-at-m/feature-1631 

    feat(ZMS-1631): add default tempaltes
    @manjencic
    manjencic authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    55ef196 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35 from it-at-m/feature-1498-wiederaufruf-erst-na… 

    …ch-5-minuten-patch

Update WorkstationProcessNext.php
    @ThomasAFink
    ThomasAFink authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    bb71716 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Merge pull request #39 from it-at-m/feature-1498-wiederaufruf-erst-na… 

    …ch-5-minuten-patch

Feature 1498 wiederaufruf erst nach 5 minuten patch
    @ThomasAFink
    ThomasAFink authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    b4319a7 View commit details
    Browse the repository at this point in the history

  2. feat(ZMS-1223): dont check seat number

    @manjencic
    manjencic authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    f44afbf View commit details
    Browse the repository at this point in the history

  3. merge test into mix-1498-1629

    @ThomasAFink
    ThomasAFink committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    f51a57b View commit details
    Browse the repository at this point in the history

  4. Merge main into dev

    @manjencic
    manjencic committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    e8751b1 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #41 from it-at-m/feature-1223-dont-check-seat-number 

    feat(ZMS-1223): dont check seat number
    @manjencic
    manjencic authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    0410aa4 View commit details
    Browse the repository at this point in the history

  6. remove spaces

    @ThomasAFink
    ThomasAFink committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    2383042 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' into mix-1498-1629

    @ThomasAFink
    ThomasAFink authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    d50c3aa View commit details
    Browse the repository at this point in the history

  8. Merge pull request #43 from it-at-m/mix-1498-1629 

    Mix 1498 1629
    @ThomasAFink
    ThomasAFink authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    3cb62b0 View commit details
    Browse the repository at this point in the history

  9. Revert "Merge branch 'dev' into mix-1498-1629" 

    This reverts commit d50c3aa, reversing
changes made to 2383042.
    @ThomasAFink
    ThomasAFink committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    518ffe6 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #44 from it-at-m/mix-1498-1629 

    Revert "Merge branch 'dev' into mix-1498-1629"
    @ThomasAFink
    ThomasAFink authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    41e476c View commit details
    Browse the repository at this point in the history

  11. Merge pull request #40 from it-at-m/mix-1498-1629 

    Mix 1498 1629
    @ThomasAFink
    ThomasAFink authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    9c54bd2 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #45 from it-at-m/feature-1223-allow-same-seat-numbers 

    feat(ZMS-1223): allow same seat numbers
    @manjencic
    manjencic authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    e97e0f7 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #46 from it-at-m/feature-1223-allow-same-seat-numbers 

    Feature 1223 allow same seat numbers
    @manjencic
    manjencic authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    02942fe View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. generate js

    @manjencic
    manjencic committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    ac329b2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #47 from it-at-m/feature-generate-js 

    generate js
    @manjencic
    manjencic authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    c3e1e3c View commit details
    Browse the repository at this point in the history

  3. feat(): generate js

    @manjencic
    manjencic committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    ef1e3ba View commit details
    Browse the repository at this point in the history

  4. Merge pull request #48 from it-at-m/feature-generate-js2 

    feat(): generate js
    @manjencic
    manjencic authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    4506d97 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Merge pull request #50 from it-at-m/bugfix-1710-increase-tabe-lock-ti… 

    …meout

fix(ZMS-1710): increase timeout
    @manjencic
    manjencic authored Dec 6, 2023
    Configuration menu
    Copy the full SHA
    8c3c146 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #49 from it-at-m/bugfix-1710-increase-tabe-lock-ti… 

    …meout

fix(ZMS-1710): increase timeout
    @manjencic
    manjencic authored Dec 6, 2023
    Configuration menu
    Copy the full SHA
    c738d4e View commit details
    Browse the repository at this point in the history

  3. fix(ZMS-1743): fix processing time calculation

    @manjencic
    manjencic committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    dde0f51 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #55 from it-at-m/feature-1223-allow-same-seat-numbers 

    Feature 1223 allow same seat numbers
    @manjencic
    manjencic authored Dec 6, 2023
    Configuration menu
    Copy the full SHA
    329f870 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Merge pull request #53 from it-at-m/zms-1632-blink-new-queue-items 

    Zms 1632 blink new queue items
    @tobias74
    tobias74 authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    1549573 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Merge branch 'test' into bugfix-1743-fix-processing-time

    @manjencic
    manjencic authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    4822021 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #59 from it-at-m/bugfix-1743-fix-processing-time 

    Bugfix 1743 fix processing time
    @manjencic
    manjencic authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    e2d63f5 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. feat(ZMS-1711): use custom provider template

    @manjencic
    manjencic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    0f98d18 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. feat(ZMS-1711): fix custom template

    @manjencic
    manjencic committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    ad898cc View commit details
    Browse the repository at this point in the history

  2. feat(ZMS-1711): fix custom template

    @manjencic
    manjencic committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    b19f436 View commit details
    Browse the repository at this point in the history

  3. feat(ZMS-1711): fix template

    @manjencic
    manjencic committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    b7324e3 View commit details
    Browse the repository at this point in the history

  4. feat(ZMS-1711): remove custom template

    @manjencic
    manjencic committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    5415e6e View commit details
    Browse the repository at this point in the history

  5. feat(ZMS-1711): custom scope template

    @manjencic
    manjencic committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    36de873 View commit details
    Browse the repository at this point in the history

  6. feat(ZMS-1711): fix loading template

    @manjencic
    manjencic committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    29d66c8 View commit details
    Browse the repository at this point in the history

  7. feat(ZMS-1711): fix template

    @manjencic
    manjencic committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    1dc3a74 View commit details
    Browse the repository at this point in the history

  8. feat(ZMS-1711): fix template

    @manjencic
    manjencic committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    a926588 View commit details
    Browse the repository at this point in the history

  9. feat(ZMS-1711): fix template

    @manjencic
    manjencic committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    f26c7f7 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. feat(ZMS-1711): reorganize custom templates

    @manjencic
    manjencic committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    7ee1ca6 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. fix(ZMS-1710): merge into test

    @manjencic
    manjencic committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    d9fba05 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #74 from it-at-m/feature-1711-custom-mail-templates 

    Feature 1711 custom mail templates
    @manjencic
    manjencic authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    a1d5af2 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. feat(ZMS-1629): merge into test

    @manjencic
    manjencic committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    9ceba70 View commit details
    Browse the repository at this point in the history