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

Dev #98

Closed
Closed

Dev #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
6e7276c
Merge pull request #1 from it-at-m/bug-1603-fix-totals
manjencic Nov 9, 2023
0849951
Merge pull request #3 from it-at-m/bug-1643-average-processing-time-i…
manjencic Nov 9, 2023
9310933
Merge pull request #6 from it-at-m/feat-1626-dont-send-notifications-…
manjencic Nov 20, 2023
d801e66
Merge pull request #12 from it-at-m/feature-zms-1488-show-finished-ap…
manjencic Nov 22, 2023
31e5736
Merge pull request #16 from tobias74/zms-1628-make-email-optional
tobias74 Nov 24, 2023
b70d6ae
Merge pull request #22 from it-at-m/test
manjencic Nov 27, 2023
7391608
merge into dev
manjencic Nov 27, 2023
7c9ff99
merge 1629 into test
manjencic Nov 27, 2023
786ac18
Merge pull request #24 from it-at-m/ZMS-1693-roave-security-advisories
tobias74 Nov 27, 2023
6f0e028
fix conflicts
manjencic Nov 27, 2023
a1aa6ba
resolve conflicts
manjencic Nov 27, 2023
427f1cf
resolve conflicts
manjencic Nov 27, 2023
e6951e9
Merge branch 'dev' of https://github.com/it-at-m/eappointment into dev
manjencic Nov 28, 2023
99bac35
Merge pull request #25 from it-at-m/feature-1631
manjencic Nov 28, 2023
20a87a5
Merge dev into mix
ThomasAFink Nov 29, 2023
8f619b9
Merge pull request #27 from it-at-m/dev
ThomasAFink Nov 29, 2023
18ad198
Merge pull request #28 from it-at-m/mix-1498-1629
ThomasAFink Nov 29, 2023
4cd9ade
fix spelling
ThomasAFink Nov 29, 2023
495b43b
Fix wartestatistik
ThomasAFink Nov 30, 2023
e3df73b
Fix Dienstleistungsstatistik
ThomasAFink Nov 30, 2023
0ddcc2f
Merge pull request #29 from it-at-m/bug-1702-1645_wartestatistik-tage…
ThomasAFink Nov 30, 2023
55ef196
Merge pull request #30 from it-at-m/feature-1631
manjencic Nov 30, 2023
0859a99
feat(ZMS-1633): merge into dev
manjencic Nov 30, 2023
62b2405
Merge pull request #32 from it-at-m/feature-1633-two-displays
manjencic Nov 30, 2023
32c19cb
Merge pull request #33 from it-at-m/feature-1633-two-displays
manjencic Nov 30, 2023
5256c36
Fix Spontankunden
ThomasAFink Nov 30, 2023
1a79cb8
Merge pull request #34 from it-at-m/bug-1702-1645_wartestatistik-tage…
ThomasAFink Nov 30, 2023
affa54f
Update WorkstationProcessNext.php
ThomasAFink 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
f99b786
feat(ZMS-1223): allow same seat numbers
manjencic Dec 4, 2023
e97e0f7
Merge pull request #45 from it-at-m/feature-1223-allow-same-seat-numbers
manjencic Dec 4, 2023
45862cd
feat(ZMS-1223): fix cron
manjencic Dec 4, 2023
d95446f
feat(ZMS-1223): fix cron
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
37f5410
fix(ZMS-1710): increase timeout
manjencic Dec 5, 2023
c738d4e
Merge pull request #49 from it-at-m/bugfix-1710-increase-tabe-lock-ti…
manjencic Dec 6, 2023
953b80e
introduce blinking for new queue items this commit contains the js fi…
tobias74 Dec 6, 2023
3e6f8e7
add bundled js files
tobias74 Dec 6, 2023
b37fcc1
Merge pull request #52 from it-at-m/zms-1632-blink-new-queue-items
tobias74 Dec 6, 2023
dde0f51
fix(ZMS-1743): fix processing time calculation
manjencic Dec 6, 2023
4900d94
Merge pull request #54 from it-at-m/bugfix-1743-fix-processing-time
manjencic Dec 7, 2023
0f98d18
feat(ZMS-1711): use custom provider template
manjencic Dec 11, 2023
1853c7d
merge main
manjencic Dec 11, 2023
a0df6c6
Merge pull request #61 from it-at-m/feature-1711-custom-mail-templates
manjencic Dec 11, 2023
fa65df3
Revert "Feature 1711 custom mail templates"
manjencic Dec 12, 2023
202e421
Merge pull request #62 from it-at-m/revert-61-feature-1711-custom-mai…
manjencic Dec 12, 2023
e77a287
Revert "Revert "Feature 1711 custom mail templates""
manjencic Dec 13, 2023
080407e
Merge pull request #63 from it-at-m/revert-62-revert-61-feature-1711-…
manjencic Dec 13, 2023
ad898cc
feat(ZMS-1711): fix custom template
manjencic Dec 13, 2023
b19f436
feat(ZMS-1711): fix custom template
manjencic Dec 13, 2023
b374dab
Merge pull request #64 from it-at-m/feature-1711-custom-mail-templates
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
25755c3
Merge pull request #65 from it-at-m/feature-1711-custom-mail-templates
manjencic Dec 13, 2023
36de873
feat(ZMS-1711): custom scope template
manjencic Dec 13, 2023
7ed31ea
Merge pull request #66 from it-at-m/feature-1711-custom-mail-templates
manjencic Dec 13, 2023
29d66c8
feat(ZMS-1711): fix loading template
manjencic Dec 13, 2023
cc82254
Merge pull request #67 from it-at-m/feature-1711-custom-mail-templates
manjencic Dec 13, 2023
1dc3a74
feat(ZMS-1711): fix template
manjencic Dec 13, 2023
618cdbe
Merge pull request #68 from it-at-m/feature-1711-custom-mail-templates
manjencic Dec 13, 2023
a926588
feat(ZMS-1711): fix template
manjencic Dec 13, 2023
31e36a2
Merge pull request #69 from it-at-m/feature-1711-custom-mail-templates
manjencic Dec 13, 2023
f26c7f7
feat(ZMS-1711): fix template
manjencic Dec 13, 2023
5a5fdf4
Merge pull request #70 from it-at-m/feature-1711-custom-mail-templates
manjencic Dec 13, 2023
7ee1ca6
feat(ZMS-1711): reorganize custom templates
manjencic Dec 14, 2023
146904b
Merge pull request #71 from it-at-m/feature-1711-custom-mail-templates
manjencic Dec 14, 2023
9913b3c
fix(ZMS-1710): fix deadlock
manjencic Dec 15, 2023
593b906
Merge pull request #72 from it-at-m/bugfix-1710-fix-dead-lock
manjencic Dec 18, 2023
5ed1222
Merge pull request #75 from it-at-m/feature-1223-allow-same-seat-numbers
manjencic Dec 18, 2023
3f6e92c
feat(ZMS-1632): merge into main
manjencic Dec 18, 2023
7b5be5f
feat(ZMS-1632): merge into main
manjencic Dec 18, 2023
3e69d31
feat(ZMS-1702-1645): merge into main
manjencic Dec 18, 2023
0b2889c
feat(ZMS-1498): merge into main
manjencic Dec 18, 2023
a901a91
fix(ZMS-1743): fix processing time
manjencic Dec 18, 2023
94bd420
Merge pull request #80 from it-at-m/bugfix-1743
manjencic Dec 18, 2023
1850b44
fix(ZMS-1498): fix missing usage
manjencic Dec 18, 2023
d94cca7
Merge pull request #81 from it-at-m/bugfix-1498-fix-missing-class-usage
manjencic Dec 18, 2023
fd4d694
feat(ZMS-1629): adjust calldisplay templates
manjencic Dec 19, 2023
198e6d8
feat(ZMS-1629): merge into dev
manjencic Dec 19, 2023
0f0a469
feat(ZMS-1629-1804): adjust call display
manjencic Dec 20, 2023
cbdf2a3
Merge pull request #83 from it-at-m/feature-1629-adjust-calldisplay
manjencic Dec 20, 2023
17b111b
feat(ZMS-1795): adjust button
manjencic Dec 21, 2023
cec255e
Merge pull request #84 from it-at-m/feature-1795-adjust-cancel-button
manjencic Dec 21, 2023
f776c44
adjust form to display minutes instead of slotcount
tobias74 Jan 11, 2024
64ebcd1
add missing file for provider
tobias74 Jan 11, 2024
7b6e84e
Merge pull request #97 from tobias74/ZMS-1794-show-minutes-instead-of…
tobias74 Jan 11, 2024
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
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