Code

Dev#98

Code

Closed

ThomasAFink wants to merge 98 commits intofeature-1683_zentrales_repo_unittests_pipeline_erstellenit-at-m/eappointment:feature-1683_zentrales_repo_unittests_pipeline_erstellenfrom devit-at-m/eappointment:devCopy head branch name to clipboard

+2,063-824

Commits

Commits on Nov 9, 2023

• Merge pull request #1 from it-at-m/bug-1603-fix-totals

  Show description for 6e7276c
  manjencic

  authored
  6e7276c

• Merge pull request #3 from it-at-m/bug-1643-average-processing-time-in-report

  Show description for 0849951
  manjencic

  authored
  0849951

Commits on Nov 20, 2023

• Merge pull request #6 from it-at-m/feat-1626-dont-send-notifications-always

  Show description for 9310933
  manjencic

  authored
  9310933

Commits on Nov 22, 2023

• Merge pull request #12 from it-at-m/feature-zms-1488-show-finished-appointments

  Show description for d801e66
  manjencic

  authored
  d801e66

Commits on Nov 24, 2023

• Merge pull request #16 from tobias74/zms-1628-make-email-optional

  Show description for 31e5736
  tobias74

  authored
  31e5736

Commits on Nov 27, 2023

• Merge pull request #22 from it-at-m/test

  Show description for b70d6ae
  manjencic

  authored
  b70d6ae

• merge into dev

  manjencic

  committed
  7391608

• merge 1629 into test

  manjencic

  committed
  7c9ff99

• Merge pull request #24 from it-at-m/ZMS-1693-roave-security-advisories

  Show description for 786ac18
  tobias74

  authored
  786ac18

• fix conflicts

  manjencic

  committed
  6f0e028

• resolve conflicts

  manjencic

  committed
  a1aa6ba

• resolve conflicts

  manjencic

  committed
  427f1cf

Commits on Nov 28, 2023

• Merge branch 'dev' of https://github.com/it-at-m/eappointment into dev

  manjencic

  committed
  e6951e9

• Merge pull request #25 from it-at-m/feature-1631

  Show description for 99bac35
  manjencic

  authored
  99bac35

Commits on Nov 29, 2023

• Merge dev into mix

  ThomasAFink

  committed
  20a87a5

• Merge pull request #27 from it-at-m/dev

  Show description for 8f619b9
  ThomasAFink

  authored
  8f619b9

• Merge pull request #28 from it-at-m/mix-1498-1629

  Show description for 18ad198
  ThomasAFink

  authored
  18ad198

• fix spelling

  ThomasAFink

  committed
  4cd9ade

Commits on Nov 30, 2023

• Fix wartestatistik

  ThomasAFink

  committed
  495b43b

• Fix Dienstleistungsstatistik

  ThomasAFink

  committed
  e3df73b

• Merge pull request #29 from it-at-m/bug-1702-1645_wartestatistik-tagesdurchschnitt-wird-nicht-angezeigt_und_rechtschreibfehler

  Show description for 0ddcc2f
  ThomasAFink

  authored
  0ddcc2f

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

  Show description for 55ef196
  manjencic

  authored
  55ef196

• feat(ZMS-1633): merge into dev

  manjencic

  committed
  0859a99

• Merge pull request #32 from it-at-m/feature-1633-two-displays

  Show description for 62b2405
  manjencic

  authored
  62b2405

• Merge pull request #33 from it-at-m/feature-1633-two-displays

  Show description for 32c19cb
  manjencic

  authored
  32c19cb

• Fix Spontankunden

  ThomasAFink

  committed
  5256c36

• Merge pull request #34 from it-at-m/bug-1702-1645_wartestatistik-tagesdurchschnitt-wird-nicht-angezeigt_und_rechtschreibfehler

  Show description for 1a79cb8
  ThomasAFink

  authored
  1a79cb8

• Update WorkstationProcessNext.php

  ThomasAFink

  authored
  affa54f

• Merge pull request #35 from it-at-m/feature-1498-wiederaufruf-erst-nach-5-minuten-patch

  Show description for bb71716
  ThomasAFink

  authored
  bb71716

Commits on Dec 4, 2023

• Merge pull request #39 from it-at-m/feature-1498-wiederaufruf-erst-nach-5-minuten-patch

  Show description for b4319a7
  ThomasAFink

  authored
  b4319a7

• feat(ZMS-1223): dont check seat number

  manjencic

  authored
  f44afbf

• merge test into mix-1498-1629

  ThomasAFink

  committed
  f51a57b

• Merge main into dev

  manjencic

  committed
  e8751b1

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

  Show description for 0410aa4
  manjencic

  authored
  0410aa4

• remove spaces

  ThomasAFink

  committed
  2383042

• Merge branch 'dev' into mix-1498-1629

  ThomasAFink

  authored
  d50c3aa

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

  Show description for 3cb62b0
  ThomasAFink

  authored
  3cb62b0

• Revert "Merge branch 'dev' into mix-1498-1629"

  Show description for 518ffe6
  ThomasAFink

  committed
  518ffe6

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

  Show description for 41e476c
  ThomasAFink

  authored
  41e476c

• feat(ZMS-1223): allow same seat numbers

  manjencic

  authored
  f99b786

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

  Show description for e97e0f7
  manjencic

  authored
  e97e0f7

• feat(ZMS-1223): fix cron

  manjencic

  authored
  45862cd

• feat(ZMS-1223): fix cron

  manjencic

  authored
  d95446f

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

  Show description for 02942fe
  manjencic

  authored
  02942fe

Commits on Dec 5, 2023

• generate js

  manjencic

  committed
  ac329b2

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

  Show description for c3e1e3c
  manjencic

  authored
  c3e1e3c

• fix(ZMS-1710): increase timeout

  manjencic

  committed
  37f5410

Commits on Dec 6, 2023

• Merge pull request #49 from it-at-m/bugfix-1710-increase-tabe-lock-timeout

  Show description for c738d4e
  manjencic

  authored
  c738d4e

• introduce blinking for new queue items this commit contains the js files only

  tobias74

  committed
  953b80e

• add bundled js files

  tobias74

  committed
  3e6f8e7

• Merge pull request #52 from it-at-m/zms-1632-blink-new-queue-items

  Show description for b37fcc1
  tobias74

  authored
  b37fcc1

• fix(ZMS-1743): fix processing time calculation

  manjencic

  committed
  dde0f51

Commits on Dec 7, 2023

• Merge pull request #54 from it-at-m/bugfix-1743-fix-processing-time

  Show description for 4900d94
  manjencic

  authored
  4900d94

Commits on Dec 11, 2023

• feat(ZMS-1711): use custom provider template

  manjencic

  committed
  0f98d18

• merge main

  manjencic

  committed
  1853c7d

• Merge pull request #61 from it-at-m/feature-1711-custom-mail-templates

  Show description for a0df6c6
  manjencic

  authored
  a0df6c6

Commits on Dec 12, 2023

• Revert "Feature 1711 custom mail templates"

  manjencic

  authored
  fa65df3

• Merge pull request #62 from it-at-m/revert-61-feature-1711-custom-mail-templates

  Show description for 202e421
  manjencic

  authored
  202e421

Commits on Dec 13, 2023

• Revert "Revert "Feature 1711 custom mail templates""

  manjencic

  authored
  e77a287

• Merge pull request #63 from it-at-m/revert-62-revert-61-feature-1711-custom-mail-templates

  Show description for 080407e
  manjencic

  authored
  080407e

• feat(ZMS-1711): fix custom template

  manjencic

  committed
  ad898cc

• feat(ZMS-1711): fix custom template

  manjencic

  committed
  b19f436

• Merge pull request #64 from it-at-m/feature-1711-custom-mail-templates

  Show description for b374dab
  manjencic

  authored
  b374dab

• feat(ZMS-1711): fix template

  manjencic

  committed
  b7324e3

• feat(ZMS-1711): remove custom template

  manjencic

  committed
  5415e6e

• Merge pull request #65 from it-at-m/feature-1711-custom-mail-templates

  Show description for 25755c3
  manjencic

  authored
  25755c3

• feat(ZMS-1711): custom scope template

  manjencic

  committed
  36de873

• Merge pull request #66 from it-at-m/feature-1711-custom-mail-templates

  Show description for 7ed31ea
  manjencic

  authored
  7ed31ea

• feat(ZMS-1711): fix loading template

  manjencic

  committed
  29d66c8

• Merge pull request #67 from it-at-m/feature-1711-custom-mail-templates

  Show description for cc82254
  manjencic

  authored
  cc82254

• feat(ZMS-1711): fix template

  manjencic

  committed
  1dc3a74

• Merge pull request #68 from it-at-m/feature-1711-custom-mail-templates

  Show description for 618cdbe
  manjencic

  authored
  618cdbe

• feat(ZMS-1711): fix template

  manjencic

  committed
  a926588

• Merge pull request #69 from it-at-m/feature-1711-custom-mail-templates

  Show description for 31e36a2
  manjencic

  authored
  31e36a2

• feat(ZMS-1711): fix template

  manjencic

  committed
  f26c7f7

• Merge pull request #70 from it-at-m/feature-1711-custom-mail-templates

  Show description for 5a5fdf4
  manjencic

  authored
  5a5fdf4

Commits on Dec 14, 2023

• feat(ZMS-1711): reorganize custom templates

  manjencic

  committed
  7ee1ca6

• Merge pull request #71 from it-at-m/feature-1711-custom-mail-templates

  Show description for 146904b
  manjencic

  authored
  146904b

Commits on Dec 15, 2023

• fix(ZMS-1710): fix deadlock

  manjencic

  committed
  9913b3c

Commits on Dec 18, 2023

• Merge pull request #72 from it-at-m/bugfix-1710-fix-dead-lock

  Show description for 593b906
  manjencic

  authored
  593b906

• Merge pull request #75 from it-at-m/feature-1223-allow-same-seat-numbers

  Show description for 5ed1222
  manjencic

  authored
  5ed1222

• feat(ZMS-1632): merge into main

  manjencic

  committed
  3f6e92c

• feat(ZMS-1632): merge into main

  manjencic

  committed
  7b5be5f

• feat(ZMS-1702-1645): merge into main

  manjencic

  committed
  3e69d31

• feat(ZMS-1498): merge into main

  manjencic

  committed
  0b2889c

• fix(ZMS-1743): fix processing time

  manjencic

  committed
  a901a91

• Merge pull request #80 from it-at-m/bugfix-1743

  Show description for 94bd420
  manjencic

  authored
  94bd420

• fix(ZMS-1498): fix missing usage

  manjencic

  committed
  1850b44

• Merge pull request #81 from it-at-m/bugfix-1498-fix-missing-class-usage

  Show description for d94cca7
  manjencic

  authored
  d94cca7

Commits on Dec 19, 2023

• feat(ZMS-1629): adjust calldisplay templates

  manjencic

  committed
  fd4d694

• feat(ZMS-1629): merge into dev

  manjencic

  committed
  198e6d8

Commits on Dec 20, 2023

• feat(ZMS-1629-1804): adjust call display

  manjencic

  committed
  0f0a469

• Merge pull request #83 from it-at-m/feature-1629-adjust-calldisplay

  Show description for cbdf2a3
  manjencic

  authored
  cbdf2a3

Commits on Dec 21, 2023

• feat(ZMS-1795): adjust button

  manjencic

  committed
  17b111b

• Merge pull request #84 from it-at-m/feature-1795-adjust-cancel-button

  Show description for cec255e
  manjencic

  authored
  cec255e

Commits on Jan 11, 2024

• adjust form to display minutes instead of slotcount

  tobias74

  committed
  f776c44

• add missing file for provider

  tobias74

  committed
  64ebcd1

• Merge pull request #97 from tobias74/ZMS-1794-show-minutes-instead-of-slots

  Show description for 7b6e84e
  tobias74

  authored
  7b6e84e