Commit Graph

3526 Commits

Author SHA1 Message Date
Luca Haid
48260bf530 improved zabbix import script using children processes 2025-04-14 15:26:41 +02:00
Luca Haid
959b0cd2b5 improved zabbix import script using children processes 2025-04-14 15:18:27 +02:00
Frank Schubert
a00f702dfc Merge branch 'fronkdev' into 'master'
AHA download now uses correct Rimo API key

See merge request fronk/thetool!1219
2025-04-14 13:09:50 +00:00
Frank Schubert
a5560e749d AHA download now uses correct Rimo API key 2025-04-14 15:08:12 +02:00
Luca Haid
84dcbf7dc0 Merge branch 'Device/remove-graph-button' into 'master'
removed graph button in devices

See merge request fronk/thetool!1218
2025-04-14 13:04:00 +00:00
Luca Haid
5469adabe5 removed graph button in devices 2025-04-14 15:03:25 +02:00
Luca Haid
61dd7185cb Merge branch 'Device/edit-zabbix-sync' into 'master'
changed how zabbix syncs

See merge request fronk/thetool!1217
2025-04-14 11:54:18 +00:00
Luca Haid
a55ee900d8 changed how zabbix syncs 2025-04-14 13:54:09 +02:00
Luca Haid
03aa1a3983 Merge branch 'Device/edit-zabbix-sync' into 'master'
changed how zabbix syncs

See merge request fronk/thetool!1216
2025-04-14 11:52:26 +00:00
Luca Haid
7c30a356dc changed how zabbix syncs 2025-04-14 13:52:17 +02:00
Luca Haid
1dd0c1de3b Merge branch 'Pipework/add-email' into 'master'
added pipework history job

See merge request fronk/thetool!1215
2025-04-14 11:17:36 +00:00
Luca Haid
e6852108f1 added pipework history job 2025-04-14 13:17:13 +02:00
Luca Haid
c170ffb97a Merge branch 'Pipework/add-email' into 'master'
added pipework history job

See merge request fronk/thetool!1214
2025-04-14 11:14:41 +00:00
Luca Haid
db32db20a7 added pipework history job 2025-04-14 13:13:52 +02:00
Luca Haid
e921ed3b7a Merge branch 'Pipework/add-email' into 'master'
added pipework history job

See merge request fronk/thetool!1213
2025-04-14 11:13:23 +00:00
Luca Haid
1563c8922e added pipework history job 2025-04-14 13:12:45 +02:00
Luca Haid
3034cf62e6 Merge branch 'Pipework/add-email' into 'master'
added pipework history job

See merge request fronk/thetool!1212
2025-04-14 09:12:55 +00:00
Luca Haid
3b4200de52 added pipework history job 2025-04-14 11:12:44 +02:00
Luca Haid
3d4ab6ea27 Merge branch 'Preorder/change-type-filter' into 'master'
added pipework history job

See merge request fronk/thetool!1211
2025-04-14 08:59:01 +00:00
Luca Haid
61e3fa067a added pipework history job 2025-04-14 10:58:52 +02:00
Luca Haid
2ae0878709 Merge branch 'Preorder/change-type-filter' into 'master'
added pipework history job

See merge request fronk/thetool!1210
2025-04-14 08:57:54 +00:00
Luca Haid
3ca786d9da added pipework history job 2025-04-14 10:57:44 +02:00
Luca Haid
d08c1d4bab Merge branch 'Preorder/change-type-filter' into 'master'
added pipework history job

See merge request fronk/thetool!1209
2025-04-14 08:57:24 +00:00
Luca Haid
dfce36dd6e added pipework history job 2025-04-14 10:57:14 +02:00
Luca Haid
d9d8be496e Merge branch 'Preorder/change-type-filter' into 'master'
added pipework history job

See merge request fronk/thetool!1208
2025-04-14 08:39:11 +00:00
Luca Haid
d2ae0ac86e added pipework history job 2025-04-14 10:38:52 +02:00
Frank Schubert
90a830e3d3 Merge branch 'fronkdev' into 'master'
Preorder Billing +  RML BMD Export

See merge request fronk/thetool!1207
2025-04-11 13:57:03 +00:00
Frank Schubert
255876e371 Preorderbilling + bmd expot 2025-04-11 15:56:30 +02:00
Frank Schubert
4c312c99c5 Preorder RML BMD Export 2025-04-11 15:20:59 +02:00
Daniel Spitzer
8b2184bd69 Merge branch 'spidev' into 'master'
Kalender Bugfix

See merge request fronk/thetool!1206
2025-04-11 10:12:21 +00:00
Daniel Spitzer
1a12e29e8d Kalender Bugfix
* Sommerzeitberechnungen resize/drop war nicht richtig
2025-04-11 12:09:28 +02:00
Luca Haid
0612f68c86 Merge branch 'Preorder/change-type-filter' into 'master'
added bestandsübernahme

See merge request fronk/thetool!1205
2025-04-11 09:31:17 +00:00
Luca Haid
aba79d18fa added bestandsübernahme 2025-04-11 11:31:06 +02:00
Luca Haid
c8ec60bd81 Merge branch 'Preorderlogistics/fix-letter' into 'master'
fixed letter

See merge request fronk/thetool!1204
2025-04-11 09:27:40 +00:00
Luca Haid
cea9a7d665 fixed letter 2025-04-11 11:27:20 +02:00
Frank Schubert
1160393fca Merge branch 'fronkdev' into 'master'
Fixed Cable Router selection in Cpeprovisioning

See merge request fronk/thetool!1203
2025-04-10 13:05:31 +00:00
Frank Schubert
91c4bac3ba Fixed Cable Router selection in Cpeprovisioning 2025-04-10 15:04:20 +02:00
Frank Schubert
c710d04b13 Merge branch 'fronkdev' into 'master'
Fixed not being able to unset Baufreigabe in Pipe- and Linework

See merge request fronk/thetool!1202
2025-04-10 11:36:56 +00:00
Frank Schubert
0dfc66e119 Fixed not being able to unset Baufreigabe in Pipe- and Linework 2025-04-10 13:36:17 +02:00
Frank Schubert
507f1a4c00 Merge branch 'master' into fronkdev 2025-04-10 13:27:50 +02:00
Frank Schubert
653b28aa5c PreorderBilling BMD Expot 2025-04-10 13:26:56 +02:00
Luca Haid
eb2898d958 Merge branch 'mark/changes' into 'master'
changes for mark

See merge request fronk/thetool!1201
2025-04-10 11:16:39 +00:00
Luca Haid
1395084672 changes for mark 2025-04-10 13:16:26 +02:00
Luca Haid
6a66ea35cf Merge branch 'mark/changes' into 'master'
changes for mark

See merge request fronk/thetool!1200
2025-04-10 11:13:53 +00:00
Luca Haid
a7cce1b6a6 changes for mark 2025-04-10 13:13:44 +02:00
Luca Haid
707098320f Merge branch 'mark/changes' into 'master'
changes for mark

See merge request fronk/thetool!1199
2025-04-10 11:12:31 +00:00
Luca Haid
df8f8fc71a changes for mark 2025-04-10 13:12:20 +02:00
Luca Haid
ffa3029248 Merge branch 'mark/changes' into 'master'
added email notification

See merge request fronk/thetool!1198
2025-04-10 10:45:37 +00:00
Luca Haid
4d8806c64a changes for mark 2025-04-10 12:45:12 +02:00
Luca Haid
e4d53078ad Merge branch 'WarehouseOrderRequest/add-email-notification' into 'master'
added email notification

See merge request fronk/thetool!1197
2025-04-10 08:41:27 +00:00