Commit Graph

4029 Commits

Author SHA1 Message Date
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
Luca Haid
6f09443207 added rml unscheduled check 2025-06-12 12:56:47 +02:00
Luca Haid
e3cbc4803e Merge branch 'ADBWohneinheit/add-unscheduled-rollout-check' into 'master'
added rml unscheduled check

See merge request fronk/thetool!1454
2025-06-12 10:55:55 +00:00
Luca Haid
a4838d204b added rml unscheduled check 2025-06-12 12:55:47 +02:00
Luca Haid
bb64550697 Merge branch 'ADBWohneinheit/add-unscheduled-rollout-check' into 'master'
added rml unscheduled check

See merge request fronk/thetool!1453
2025-06-12 10:54:45 +00:00
Luca Haid
319e4ae66d added rml unscheduled check 2025-06-12 12:54:36 +02:00
Luca Haid
018e189a2a Merge branch 'ADBWohneinheit/add-unscheduled-rollout-check' into 'master'
added rml unscheduled check

See merge request fronk/thetool!1452
2025-06-12 10:54:09 +00:00
Luca Haid
cd0629dfbc added rml unscheduled check 2025-06-12 12:54:01 +02:00
Luca Haid
436b723827 Merge branch 'ADBWohneinheit/add-unscheduled-rollout-check' into 'master'
added rml unscheduled check

See merge request fronk/thetool!1451
2025-06-12 10:32:10 +00:00
Luca Haid
f94c622839 added rml unscheduled check 2025-06-12 12:31:52 +02:00
Daniel Spitzer
80adb96253 Merge branch 'spidev' into 'master'
Kalender Anpassungen

See merge request fronk/thetool!1450
2025-06-12 09:13:10 +00:00
Daniel Spitzer
a9a4b87a01 Kalender Anpassungen
- Kalender Freigaben für Conny
2025-06-12 11:12:49 +02:00
Daniel Spitzer
d254ffe762 Merge branch 'spidev' into 'master'
Kalender Anpassungen

See merge request fronk/thetool!1449
2025-06-12 08:49:53 +00:00
Daniel Spitzer
6d02c332fd Kalender Anpassungen
- Kalender Freigaben für Conny
2025-06-12 10:49:11 +02:00
Luca Haid
625b0f74f9 Merge branch 'ADBWohneinheit/view-public-and-permissions' into 'master'
Adb wohneinheit/view public and permissions

See merge request fronk/thetool!1448
2025-06-12 08:07:23 +00:00
Luca Haid
0c3f1b2405 Adb wohneinheit/view public and permissions 2025-06-12 08:07:23 +00:00
Luca Haid
52eb234c9e Merge branch 'ADBWohneinheit/view-public-and-permissions' into 'master'
added new permissions and changed handling of ADBWohneinheitController.php/duplicate

See merge request fronk/thetool!1447
2025-06-12 08:01:14 +00:00
Luca Haid
528f3680d2 added new permissions and changed handling of ADBWohneinheitController.php/duplicate 2025-06-12 10:01:01 +02:00
Luca Haid
3050603474 Merge branch 'DashboardNew/fixed-calculation-new-tool-type' into 'master'
fixed calculation in adb dashboard

See merge request fronk/thetool!1446
2025-06-12 07:09:53 +00:00
Luca Haid
dd59b48b40 fixed calculation in adb dashboard 2025-06-12 09:09:41 +02:00