Commit Graph
4343 Commits
Author SHA1 Message Date
Luca Haid 4e18891afc Merge branch 'AssetManagement/add-new-features2' into 'master'
added new stuff for asset management

See merge request fronk/thetool!1500
2025-06-27 08:49:33 +00:00
Luca Haid fe73aa22ab added new stuff for asset management 2025-06-27 10:48:32 +02:00
Daniel Spitzer 62956e1539 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!1499
2025-06-27 07:22:42 +00:00
Daniel Spitzer 6ae084f291 Zeiterfassung
* Anpassungen Urlaubsanzeige bei Arbeitszeitänderungen
2025-06-27 09:22:06 +02:00
Luca Haid 44f6fe97f5 Merge branch 'AssetManagement/add-new-features' into 'master'
added new features for asset mgmt

See merge request fronk/thetool!1498
2025-06-26 13:24:12 +00:00
Luca Haid b0d7d4aeeb added new features for asset mgmt 2025-06-26 15:23:57 +02:00
Luca Haid 97f8a625e4 Merge branch 'PreorderIFrame/fix-numbers' into 'master'
temp fix for showcase

See merge request fronk/thetool!1497
2025-06-26 12:50:26 +00:00
Luca Haid 6bf27c7fe9 temp fix for showcase 2025-06-26 14:50:15 +02:00
Luca Haid 4b74bd2814 Merge branch 'PreorderIFrame/fix-numbers' into 'master'
added new asset management poc

See merge request fronk/thetool!1496
2025-06-26 11:46:59 +00:00
Luca Haid 700f4030ec added new asset management poc 2025-06-26 13:46:46 +02:00
Luca Haid 7f5a9695d9 Merge branch 'PreorderIFrame/fix-numbers' into 'master'
fixed numbers

See merge request fronk/thetool!1495
2025-06-26 11:12:55 +00:00
Luca Haid 32f3a2afe3 fixed numbers 2025-06-26 13:12:45 +02:00
Luca Haid f21994c4b3 Merge branch 'Cpeprovisioning/add-snopp-button' into 'master'
added new snopp button

See merge request fronk/thetool!1494
2025-06-26 08:45:28 +00:00
Luca Haid 7bfa01de3c added new snopp button 2025-06-26 10:41:28 +02:00
Daniel Spitzer 45929a587d Merge branch 'spidev' into 'master'
Linework Import Script

See merge request fronk/thetool!1493
2025-06-25 18:34:53 +00:00
Daniel Spitzer 7552fe0ab1 Linework Import Script 2025-06-25 20:34:28 +02:00
Daniel Spitzer 46bb19c2ed Merge branch 'spidev' into 'master'
Linework Import Script

See merge request fronk/thetool!1492
2025-06-25 18:14:59 +00:00
Daniel Spitzer a4993a6ffc Linework Import Script 2025-06-25 20:14:42 +02:00
Frank Schubert fd0d887268 Merge branch 'fronkdev' into 'master'
Added activation_billing (Nachverrechnen) in PreorderBilling

See merge request fronk/thetool!1491
2025-06-25 14:54:43 +00:00
Frank Schubert aa9ffb090e Added activation_billing (Nachverrechnen) in PreorderBilling 2025-06-25 16:53:47 +02:00
Luca Haid dc80552ec7 Merge branch 'Preorder/iframe-revision-2' into 'master'
updated new iframe

See merge request fronk/thetool!1490
2025-06-24 15:20:11 +00:00
Luca Haid 96aebaaeab updated new iframe 2025-06-24 17:20:01 +02:00
Luca Haid c00849f97a Merge branch 'Preorder/iframe-revision-2' into 'master'
updated new iframe

See merge request fronk/thetool!1489
2025-06-24 13:33:45 +00:00
Luca Haid af939d1a61 updated new iframe 2025-06-24 15:33:37 +02:00
Luca Haid cabfffcf31 Merge branch 'Preorder/iframe-revision-2' into 'master'
updated new iframe

See merge request fronk/thetool!1488
2025-06-24 13:21:26 +00:00
Luca Haid c502d3c205 updated new iframe 2025-06-24 15:21:13 +02:00
Frank Schubert d4b4f4efdd Merge branch 'fronkdev' into 'master'
fixed price to gross in send-preorder-custom-new-notification.php

See merge request fronk/thetool!1487
2025-06-24 12:05:41 +00:00
Frank Schubert 4689ed3dc0 fixed price to gross in send-preorder-custom-new-notification.php 2025-06-24 14:04:49 +02:00
Frank Schubert a2df0a4879 Merge branch 'fronkdev' into 'master'
Added autoupdate to vodia switcher

See merge request fronk/thetool!1486
2025-06-24 11:01:23 +00:00
Frank Schubert f117793eac Added autoupdate to vodia switcher 2025-06-24 13:00:38 +02:00
Frank Schubert 12644249f1 Merge branch 'fronkdev' into 'master'
minor layout changes for vodia switcher

See merge request fronk/thetool!1485
2025-06-24 10:57:13 +00:00
Frank Schubert a0f5bbb176 minor layout changes for vodia switcher 2025-06-24 12:56:43 +02:00
Frank Schubert 7a39e5fd25 Merge branch 'fronkdev' into 'master'
minor layout changes for vodia switcher

See merge request fronk/thetool!1484
2025-06-24 10:52:32 +00:00
Frank Schubert e5e20e5c89 minor layout changes for vodia switcher 2025-06-24 12:51:40 +02:00
Frank Schubert 3789ef48a5 Merge branch 'fronkdev' into 'master'
Fixed vodia switcher in chrome

See merge request fronk/thetool!1483
2025-06-24 10:34:06 +00:00
Frank Schubert 74d6917b08 Fixed vodia switcher in chrome 2025-06-24 12:33:07 +02:00
Frank Schubert f63e765288 Merge branch 'fronkdev' into 'master'
Fronkdev

See merge request fronk/thetool!1482
2025-06-24 09:42:03 +00:00
Frank Schubert c7d4db6ff2 Fixed vodia js URLs 2025-06-24 11:41:37 +02:00
Frank Schubert 7b093f90d1 Fixed vodia js URLs 2025-06-24 11:40:11 +02:00
Frank Schubert 42ae04fcb8 Merge branch 'fronkdev' into 'master'
Added Vodia Identity Switcher for Xinon Users

See merge request fronk/thetool!1481
2025-06-24 09:34:59 +00:00
Frank Schubert 02a423d300 Added Vodia Identity Switcher for Xinon Users 2025-06-24 11:32:53 +02:00
Luca Haid b740e7b752 Update 20250617100000_add_preorder_cors_columns.php 2025-06-24 07:54:24 +00:00
Luca Haid dbb8b3efdc Update 20250617100000_add_preorder_cors_columns.php 2025-06-24 07:53:56 +00:00
Luca Haid c606a90531 Merge branch 'Preorder/add-iframe' into 'master'
added new preorderiframe

See merge request fronk/thetool!1480
2025-06-24 07:52:48 +00:00
Luca Haid 47b84a00bc added new preorderiframe 2025-06-24 09:52:23 +02:00
Luca Haid b36be95f4d Merge branch 'Preorder/add-iframe' into 'master'
added new preorderiframe

See merge request fronk/thetool!1479
2025-06-24 07:46:33 +00:00
Luca Haid 2f1167d4d0 added new preorderiframe 2025-06-24 09:41:48 +02:00
Daniel Spitzer 7c12a8097e Merge branch 'spidev' into 'master'
Device OLT Anpassungen

See merge request fronk/thetool!1478
2025-06-24 05:49:59 +00:00
Daniel Spitzer c652ee7c74 Device OLT Anpassungen
- Service Ports können nun Live gesynct werden
2025-06-24 07:47:38 +02:00
Daniel Spitzer b8bc3b509d Merge branch 'spidev' into 'master'
Device OLT Anpassungen

See merge request fronk/thetool!1477
2025-06-23 20:25:42 +00:00