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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7c9ff99
merge 1629 into test
manjencic Nov 27, 2023
6f0e028
fix conflicts
manjencic Nov 27, 2023
a1aa6ba
resolve conflicts
manjencic Nov 27, 2023
55ef196
Merge pull request #30 from it-at-m/feature-1631
manjencic Nov 30, 2023
bb71716
Merge pull request #35 from it-at-m/feature-1498-wiederaufruf-erst-na…
ThomasAFink Nov 30, 2023
b4319a7
Merge pull request #39 from it-at-m/feature-1498-wiederaufruf-erst-na…
ThomasAFink Dec 4, 2023
f44afbf
feat(ZMS-1223): dont check seat number
manjencic Dec 4, 2023
f51a57b
merge test into mix-1498-1629
ThomasAFink Dec 4, 2023
e8751b1
Merge main into dev
manjencic Dec 4, 2023
0410aa4
Merge pull request #41 from it-at-m/feature-1223-dont-check-seat-number
manjencic Dec 4, 2023
2383042
remove spaces
ThomasAFink Dec 4, 2023
d50c3aa
Merge branch 'dev' into mix-1498-1629
ThomasAFink Dec 4, 2023
3cb62b0
Merge pull request #43 from it-at-m/mix-1498-1629
ThomasAFink Dec 4, 2023
518ffe6
Revert "Merge branch 'dev' into mix-1498-1629"
ThomasAFink Dec 4, 2023
41e476c
Merge pull request #44 from it-at-m/mix-1498-1629
ThomasAFink Dec 4, 2023
9c54bd2
Merge pull request #40 from it-at-m/mix-1498-1629
ThomasAFink Dec 4, 2023
e97e0f7
Merge pull request #45 from it-at-m/feature-1223-allow-same-seat-numbers
manjencic Dec 4, 2023
02942fe
Merge pull request #46 from it-at-m/feature-1223-allow-same-seat-numbers
manjencic Dec 4, 2023
ac329b2
generate js
manjencic Dec 5, 2023
c3e1e3c
Merge pull request #47 from it-at-m/feature-generate-js
manjencic Dec 5, 2023
ef1e3ba
feat(): generate js
manjencic Dec 5, 2023
4506d97
Merge pull request #48 from it-at-m/feature-generate-js2
manjencic Dec 5, 2023
8c3c146
Merge pull request #50 from it-at-m/bugfix-1710-increase-tabe-lock-ti…
manjencic Dec 6, 2023
c738d4e
Merge pull request #49 from it-at-m/bugfix-1710-increase-tabe-lock-ti…
manjencic Dec 6, 2023
dde0f51
fix(ZMS-1743): fix processing time calculation
manjencic Dec 6, 2023
329f870
Merge pull request #55 from it-at-m/feature-1223-allow-same-seat-numbers
manjencic Dec 6, 2023
1549573
Merge pull request #53 from it-at-m/zms-1632-blink-new-queue-items
tobias74 Dec 7, 2023
4822021
Merge branch 'test' into bugfix-1743-fix-processing-time
manjencic Dec 8, 2023
e2d63f5
Merge pull request #59 from it-at-m/bugfix-1743-fix-processing-time
manjencic Dec 8, 2023
0f98d18
feat(ZMS-1711): use custom provider template
manjencic Dec 11, 2023
ad898cc
feat(ZMS-1711): fix custom template
manjencic Dec 13, 2023
b19f436
feat(ZMS-1711): fix custom template
manjencic Dec 13, 2023
b7324e3
feat(ZMS-1711): fix template
manjencic Dec 13, 2023
5415e6e
feat(ZMS-1711): remove custom template
manjencic Dec 13, 2023
36de873
feat(ZMS-1711): custom scope template
manjencic Dec 13, 2023
29d66c8
feat(ZMS-1711): fix loading template
manjencic Dec 13, 2023
1dc3a74
feat(ZMS-1711): fix template
manjencic Dec 13, 2023
a926588
feat(ZMS-1711): fix template
manjencic Dec 13, 2023
f26c7f7
feat(ZMS-1711): fix template
manjencic Dec 13, 2023
7ee1ca6
feat(ZMS-1711): reorganize custom templates
manjencic Dec 14, 2023
d9fba05
fix(ZMS-1710): merge into test
manjencic Dec 18, 2023
a1d5af2
Merge pull request #74 from it-at-m/feature-1711-custom-mail-templates
manjencic Dec 18, 2023
9ceba70
feat(ZMS-1629): merge into test
manjencic Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions zmsadmin/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"psr/http-message": "^1.0",
"container-interop/container-interop": "^1.2",
"twig/intl-extra": "^3.4",
"twig/twig": "3.*"
"twig/twig": "3.*",
"symfony/polyfill-intl-icu": "^1.21"
},
"bin": [],
"autoload": {
Expand All @@ -54,4 +55,4 @@
"BO\\Zmsadmin\\Tests\\": "tests/Zmsadmin/"
}
}
}
}
Loading
Loading