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

Mix 1498 1629 #40

Merged
merged 77 commits into from
Dec 4, 2023
Merged

Mix 1498 1629 #40

merged 77 commits into from
Dec 4, 2023

Conversation

ThomasAFink
Copy link
Member

Description

1498 erst nach 5min aufrufen

Reference

Issues #1498

ThomasAFink and others added 30 commits November 20, 2023 14:03
@ThomasAFink
Add recall time migration01~
ba004a1
@ThomasAFink
Solution using updateTimestamp
ce33184
@ThomasAFink
Format minutes
5c4a7ec
@ThomasAFink
It actually works lol
7efcbbb
@manjencic
Merge pull request #13 from it-at-m/feature-1629-create-default-calld…
fdfcb6a 
…isplay

Feature 1629 create default calldisplay
@manjencic
Merge pull request #14 from it-at-m/feature-1629-create-default-calld…
dd3ce39 
…isplay

feat(ZMS-1629): fix css
@manjencic
Merge pull request #15 from it-at-m/feat-1626-dont-send-notifications…
80c7945 
…-always

Feat 1626 dont send notifications always
@ThomasAFink
It works using previous status
e99c762
@ThomasAFink
some cleanup
af98db9
@ThomasAFink
more cleanup
38e8a10
@ThomasAFink
more cleanup
67b1c77
@ThomasAFink
more cleanup
bd2cb50
@ThomasAFink
more cleanup
0b33bb6
@ThomasAFink
more cleanup
3c57c8b
@ThomasAFink
What are these changes?
9c74565
@ThomasAFink
Merge branch 'feature-1498_wiederaufruf_erst_nach_5_minuten' into mix…
f2cb812 
…-1498-1629
@ThomasAFink
Fix permissions
2890290
@ThomasAFink
Fix permissions
eff8aac
@ThomasAFink
Fix permissions
e48766f
@ThomasAFink
Fix migrations
ebd66b3
@manjencic
Merge pull request #18 from it-at-m/feature-zms-1488-show-finished-ap…
8fe6915 
…pointments

feat(ZMS-1488): show finished appointments
@ThomasAFink
Make first process not callable when conditions are met
f914a1d
@ThomasAFink
Clean up time functions to fix unit tests
b51c88d
@ThomasAFink
Test permissions
db1560e
@ThomasAFink
Fix file permissions
daa4930
@ThomasAFink
Fix file permissions
5260f32
@ThomasAFink
Fix file permissions
30ac68d
@ThomasAFink
Fix file permissions
4dff7ec
@ThomasAFink
Fix file permissions
c2329cc
@ThomasAFink
Fix file permissions
1e825cf
ThomasAFink and others added 19 commits November 29, 2023 09:32
@ThomasAFink
Merge pull request #27 from it-at-m/dev
8f619b9 
mix-1498-1629 into Dev
@ThomasAFink
Merge pull request #28 from it-at-m/mix-1498-1629
18ad198 
Mix 1498 1629 into dev
@ThomasAFink
fix spelling
4cd9ade
@ThomasAFink
Fix wartestatistik
495b43b
@ThomasAFink
Fix Dienstleistungsstatistik
e3df73b
@ThomasAFink
Merge pull request #29 from it-at-m/bug-1702-1645_wartestatistik-tage…
0ddcc2f 
…sdurchschnitt-wird-nicht-angezeigt_und_rechtschreibfehler

Bug 1702 1645 wartestatistik tagesdurchschnitt wird nicht angezeigt und rechtschreibfehler
@manjencic
feat(ZMS-1633): create two call displays
f8c2fcb
@manjencic
feat(ZMS-1633): merge into dev
0859a99
@manjencic
feat(ZMS-1633): fix collection chunk
660a3bf
@manjencic
Merge pull request #32 from it-at-m/feature-1633-two-displays
62b2405 
Feature 1633 two displays
@manjencic
feat(ZMS-1633): fix templates
c260b00
@manjencic
Merge pull request #33 from it-at-m/feature-1633-two-displays
32c19cb 
feat(ZMS-1633): fix templates
@ThomasAFink
Fix Spontankunden
5256c36
@ThomasAFink
Merge pull request #34 from it-at-m/bug-1702-1645_wartestatistik-tage…
1a79cb8 
…sdurchschnitt-wird-nicht-angezeigt_und_rechtschreibfehler

Fix Spontankunden
@ThomasAFink
Update WorkstationProcessNext.php
affa54f
@ThomasAFink
Merge pull request #35 from it-at-m/feature-1498-wiederaufruf-erst-na…
bb71716 
…ch-5-minuten-patch

Update WorkstationProcessNext.php
@ThomasAFink
Merge pull request #39 from it-at-m/feature-1498-wiederaufruf-erst-na…
b4319a7 
…ch-5-minuten-patch

Feature 1498 wiederaufruf erst nach 5 minuten patch
@manjencic
feat(ZMS-1223): dont check seat number
f44afbf
@ThomasAFink
merge test into mix-1498-1629
f51a57b
@ThomasAFink ThomasAFink removed the request for review from tobias74 December 4, 2023 15:37
@ThomasAFink ThomasAFink merged commit 9c54bd2 into test Dec 4, 2023
5 checks passed
@ThomasAFink ThomasAFink deleted the mix-1498-1629 branch May 8, 2024 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@manjencic manjencic manjencic left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ThomasAFink @manjencic @tobias74