Commit Graph

4048 Commits

Author SHA1 Message Date
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
Daniel Spitzer
5ef2f39582 Device OLT Anpassungen
- Service Ports können nun Live gesynct werden
2025-06-23 22:25:22 +02:00
Daniel Spitzer
9dc8cb78e6 Merge branch 'spidev' into 'master'
Kalender Anpassungen

See merge request fronk/thetool!1476
2025-06-23 18:49:13 +00:00
Daniel Spitzer
bfbf9a1c12 Kalender Anpassungen
- Kalender Freigaben für Conny
2025-06-23 20:48:55 +02:00
Daniel Spitzer
08780d53c4 Merge branch 'spidev' into 'master'
Kalender Anpassungen

See merge request fronk/thetool!1475
2025-06-23 17:57:27 +00:00
Daniel Spitzer
2e732505ab Kalender Anpassungen
- Kalender Freigaben für Conny
2025-06-23 19:57:02 +02:00
Frank Schubert
c2562884cf Merge branch 'fronkdev' into 'master'
added 2 hour delay in  send-preorder-custom-new-notification.php

See merge request fronk/thetool!1474
2025-06-23 10:38:29 +00:00
Frank Schubert
2fbba259ed added 2 hour delay in send-preorder-custom-new-notification.php 2025-06-23 12:36:52 +02:00
Luca Haid
63e2ce3a24 Merge branch 'ConstructionConsent/add-new-field' into 'master'
added new file upload and bug fix

See merge request fronk/thetool!1473
2025-06-18 12:52:12 +00:00
Luca Haid
2357a43911 added new file upload and bug fix 2025-06-18 14:51:51 +02:00
Luca Haid
2167ed1310 Merge branch 'ConstructionConsent/improveee' into 'master'
added new file upload and bug fix

See merge request fronk/thetool!1472
2025-06-18 12:15:59 +00:00
Luca Haid
829e255ba3 added new file upload and bug fix 2025-06-18 14:15:48 +02:00
Luca Haid
1421adce36 Merge branch 'ConstructionConsent/improveee' into 'master'
added new file upload and bug fix

See merge request fronk/thetool!1471
2025-06-18 12:11:51 +00:00
Luca Haid
5c2ea69ce1 added new file upload and bug fix 2025-06-18 14:11:34 +02:00
Luca Haid
fbc506aeed Merge branch 'ConstructionConsent/improveee' into 'master'
added new file upload and bug fix

See merge request fronk/thetool!1470
2025-06-18 12:10:49 +00:00
Luca Haid
fedfaac61d added new file upload and bug fix 2025-06-18 14:09:59 +02:00
Luca Haid
a5de6daf27 Merge branch 'Preorder/change-custom-notification' into 'master'
only efh buildings based on building type

See merge request fronk/thetool!1469
2025-06-17 12:35:10 +00:00
Luca Haid
40c5cbfcb3 only efh buildings based on building type 2025-06-17 14:34:54 +02:00
Luca Haid
1b1201e615 Merge branch 'WarehouseOffer/improve2' into 'master'
updated warehouseoffer

See merge request fronk/thetool!1468
2025-06-16 07:50:52 +00:00
Luca Haid
4b46313ab8 updated warehouseoffer 2025-06-16 09:50:10 +02:00
Frank Schubert
203b9fa7a8 Merge branch 'fronkdev' into 'master'
Added confirmation before generating PreorderBilling Invoices

See merge request fronk/thetool!1467
2025-06-16 03:34:30 +00:00
Frank Schubert
f5f7ad276f Added confirmation before generating PreorderBilling Invoices 2025-06-16 05:31:10 +02:00
Frank Schubert
0d92d20d96 Merge branch 'fronkdev' into 'master'
Added explicit UTF-8 encoding to all HTML emails

See merge request fronk/thetool!1466
2025-06-13 04:45:49 +00:00
Frank Schubert
e12990086e Added explicit UTF-8 encoding to all HTML emails 2025-06-13 06:45:09 +02:00
Frank Schubert
2f53d7b71d Merge branch 'fronkdev' into 'master'
Added custom replacers to Preordercampaign Testmail

See merge request fronk/thetool!1465
2025-06-13 04:30:24 +00:00
Frank Schubert
0247aa677d Added custom replacers to Preordercampaign Testmail 2025-06-13 06:29:37 +02:00
Frank Schubert
a57c48e043 Merge branch 'fronkdev' into 'master'
Completed 300-custom-new-notification Mailtemplate handling for RML

See merge request fronk/thetool!1464
2025-06-13 03:43:15 +00:00
Frank Schubert
e47ecb49cd Renamed end-preorder-custom-new-notification.php 2025-06-13 05:41:33 +02:00
Frank Schubert
fdcac66a84 Completed 300-custom-new-order Mailtemplate handling for RML 2025-06-13 05:40:17 +02:00
Frank Schubert
780b7f1046 Merge branch 'fronkdev' into 'master'
Increased text column sizes in Mailtemplate

See merge request fronk/thetool!1463
2025-06-13 03:28:15 +00:00
Frank Schubert
05fe36679f Increased text column sizes in Mailtemplate 2025-06-13 05:27:41 +02:00
Frank Schubert
82283a3b03 Merge branch 'fronkdev' into 'master'
Fixed ADBHausnummer::count() with joins sql

See merge request fronk/thetool!1462
2025-06-13 03:20:40 +00:00
Frank Schubert
b041150661 Fixed ADBHausnummer::count() with joins sql 2025-06-13 05:19:56 +02:00
Frank Schubert
62ab9138d8 Merge branch 'fronkdev' into 'master'
Fixed ADBHausnummer::count() with joins sql

See merge request fronk/thetool!1461
2025-06-13 03:11:24 +00:00
Frank Schubert
b6546ee2b3 Fixed ADBHausnummer::count() with joins sql 2025-06-13 05:11:05 +02:00
Frank Schubert
1c7ce4707c Merge branch 'fronkdev' into 'master'
Fixed ADBHausnummer::count() with joins sql

See merge request fronk/thetool!1460
2025-06-13 03:05:49 +00:00
Frank Schubert
3da16ba17c Fixed ADBHausnummer::count() with joins sql 2025-06-13 05:04:38 +02:00
Luca Haid
e78ee830dd Merge branch 'AddressDB/add-select2-network-filter' into 'master'
fixed preorder issue

See merge request fronk/thetool!1459
2025-06-12 12:42:27 +00:00
Luca Haid
73fe342497 fixed preorder issue 2025-06-12 14:42:12 +02:00
Luca Haid
dc7aa61155 Merge branch 'Preorder/fix-json-issue-db' into 'master'
fixed preorder issue

See merge request fronk/thetool!1458
2025-06-12 11:25:38 +00:00
Luca Haid
6faafc86f9 fixed preorder issue 2025-06-12 13:25:19 +02:00
Frank Schubert
ec74c28866 Merge branch 'fronkdev' into 'master'
Enable image pasting in TinyMCE in Mailtemplte/Form

See merge request fronk/thetool!1457
2025-06-12 11:14:48 +00:00
Frank Schubert
58e304a1ad Enable image pasting in TinyMCE in Mailtemplte/Form 2025-06-12 13:14:12 +02:00
Luca Haid
02d3ceb2f0 Merge branch 'ADBWohneinheit/add-unscheduled-rollout-check' into 'master'
added rml unscheduled check

See merge request fronk/thetool!1456
2025-06-12 11:03:16 +00:00
Luca Haid
a3db12255b added rml unscheduled check 2025-06-12 13:03:05 +02:00
Luca Haid
a475a5bf89 Merge branch 'ADBWohneinheit/add-unscheduled-rollout-check' into 'master'
added rml unscheduled check

See merge request fronk/thetool!1455
2025-06-12 10:56:55 +00:00