Commit Graph
100 Commits
Author SHA1 Message Date
Frank Schubert ca21dd0d26 Including fa-sharp icons 2024-05-08 15:18:07 +02:00
Frank Schubert 54b27e0b7a Merge branch 'fronkdev' into 'master'
New Dobl-Zwaring Order Import

See merge request fronk/thetool!359
2024-05-08 13:06:49 +00:00
Frank Schubert 2228cf011f New Dobl-Zwaring Order Import 2024-05-08 15:05:44 +02:00
Frank Schubert 83b10ba922 WIP Contract 2024-05-07 - 2 2024-05-07 22:53:16 +02:00
Frank Schubert 1e57d983b7 Updated Fontawesome pro to 6.5.2 2024-05-07 19:03:23 +02:00
Frank Schubert 7b15b7a528 WIP Contract 2024-05-07 2024-05-07 18:57:20 +02:00
Frank Schubert 4b52599209 WIP Contract 2024-05-06 2024-05-07 16:31:01 +02:00
Frank Schubert 6002876343 WIP Ivt Import 2024-05-02 2024-05-06 13:24:25 +02:00
Frank Schubert 7809f6d19f Merge branch 'fronkdev' into 'master'
Fixed updateing freigabe in rimo import

See merge request fronk/thetool!348
2024-04-26 13:06:19 +00:00
Frank Schubert df108dca2d Fixed updateing freigabe in rimo import 2024-04-26 15:05:49 +02:00
Frank Schubert 7e6e59584a Merge branch 'fronkdev' into 'master'
Fixed showing adrcd-subcd in AdressDB/Form

See merge request fronk/thetool!347
2024-04-26 12:05:25 +00:00
Frank Schubert 6c1b63d77a Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-04-26 14:04:42 +02:00
Frank Schubert 05ae72ad72 Fixed showing adrcd-subcd in AdressDB/Form 2024-04-26 14:04:20 +02:00
Frank Schubert 7734e0d18a Merge branch 'fronkdev' into 'master'
Added preorder import Dobl-Zwaring

See merge request fronk/thetool!343
2024-04-24 15:46:39 +00:00
Frank Schubert ca95aad7cb Added preorder import Dobl-Zwaring 2024-04-24 17:46:05 +02:00
Frank Schubert 097e6a9b2c Merge branch 'fronkdev' into 'master'
Added import exceptions for Stainz Zentrum

See merge request fronk/thetool!342
2024-04-23 21:27:50 +00:00
Frank Schubert 77ee11929c Added import exceptions for Stainz Zentrum 2024-04-23 23:27:10 +02:00
Frank Schubert 4c3a832d32 Merge branch 'spidev' into 'master'
Faserplanung

See merge request fronk/thetool!341
2024-04-23 15:34:42 +00:00
Frank Schubert 06018dab80 Merge branch 'fronkdev' into 'master'
Preorder trigger: Fixed not replacing CIFTOKEN in cifurl

See merge request fronk/thetool!340
2024-04-23 13:12:49 +00:00
Frank Schubert 6289d21eb1 Preorder trigger: Fixed not replacing CIFTOKEN in cifurl 2024-04-23 15:11:51 +02:00
Frank Schubert 1b5d659071 Merge branch 'fronkdev' into 'master'
Fixed adding same homes every time import runs + Contractqueue

See merge request fronk/thetool!339
2024-04-22 11:27:32 +00:00
Frank Schubert 63d2e2508d Fixed adding same homes every time import runs 2024-04-22 13:26:32 +02:00
Frank Schubert e388c6e066 Contractqueue: commit to Contract finished 2024-04-18 22:58:37 +02:00
Frank Schubert 21166a2229 Merge branch 'fronkdev' into 'master'
Preorder network operators & Contract

See merge request fronk/thetool!338
2024-04-18 12:06:44 +00:00
Frank Schubert b9f270fb10 Merge branch 'master' into fronkdev 2024-04-18 14:05:22 +02:00
Frank Schubert bede016157 Contract WIP & Contractqueue WIP 2024-04-18 2024-04-18 14:01:02 +02:00
Frank Schubert 1819b8ee9c Added Preorder network Operators/ISPs & snopp api 2024-04-18 14:00:25 +02:00
Frank Schubert 1db1d583da Merge branch 'spidev' into 'master'
Faserplanung

See merge request fronk/thetool!334
2024-04-16 14:58:44 +00:00
Frank Schubert 2747942234 Merge branch 'spidev' into 'master'
Zeiterfassungs Billing Update/Devices Parents

See merge request fronk/thetool!332
2024-04-16 14:13:19 +00:00
Frank Schubert c3312181f1 Merge branch 'fronkdev' into 'master'
mfBaseController now throws exception when called method lacks visibility

See merge request fronk/thetool!331
2024-04-16 12:59:34 +00:00
Frank Schubert 6ce6e15b1a mfBaseController now throws exception when called method lacks visibility 2024-04-16 14:56:30 +02:00
Frank Schubert 1bee01a9ea Merge branch 'fronkdev' into 'master'
Fixed sorting in PreorderstatusModel

See merge request fronk/thetool!320
2024-04-10 14:21:01 +00:00
Frank Schubert 358773672c Fixed sorting in PreorderstatusModel 2024-04-10 16:20:39 +02:00
Frank Schubert e68331c982 Merge branch 'fronkdev' into 'master'
Fixed sorting in PreorderstatusModel

See merge request fronk/thetool!319
2024-04-10 14:19:59 +00:00
Frank Schubert 333bc231dd Fixed sorting in PreorderstatusModel 2024-04-10 16:19:15 +02:00
Frank Schubert 9d5be184a2 Merge branch 'fronkdev' into 'master'
Added preorder import Stiftingtal

See merge request fronk/thetool!312
2024-04-08 14:53:34 +00:00
Frank Schubert 6340d17db2 Added preorder import Stiftingtal 2024-04-08 16:52:23 +02:00
Frank Schubert 059b26ba33 WIP Contractqueue & snopp api 2024-04-05 12:21:54 +02:00
Frank Schubert b56b5e2da1 Merge branch 'spidev' into 'master'
Zeiterfassungs Update

See merge request fronk/thetool!311
2024-04-04 16:17:45 +00:00
Frank Schubert d8419dc4f6 Merge branch 'spidev' into 'master'
Zeiterfassungs Update

See merge request fronk/thetool!310
2024-04-04 16:07:06 +00:00
Frank Schubert ecdc1d673e Merge branch 'fronkdev' into 'master'
rimo import: Removed AddressHelper requirement, missing address parts

See merge request fronk/thetool!309
2024-04-03 16:18:10 +00:00
Frank Schubert e69b271295 rimo import: Removed AddressHelper requirement, missing address parts
option
2024-04-03 18:16:52 +02:00
Frank Schubert fc86be9352 Merge branch 'fronkdev' into 'master'
Changes output file names

See merge request fronk/thetool!308
2024-04-03 12:00:49 +00:00
Frank Schubert 3f1fdc2b27 Changes output file names 2024-04-03 13:59:59 +02:00
Frank Schubert 9994c7c7d2 Merge branch 'fronkdev' into 'master'
Fixed network permissions in Preordernotification

See merge request fronk/thetool!306
2024-04-02 13:00:32 +00:00
Frank Schubert 60d6407ee4 Fixed network permissions in Preordernotification 2024-04-02 14:58:06 +02:00
Frank Schubert 83b01ce931 Merge branch 'spidev' into 'master'
Zeiterfassungs Update

See merge request fronk/thetool!305
2024-03-28 15:42:22 +00:00
Frank Schubert 411f71cb4a Update 20240317171644_timerecording_add_fields_car.php 2024-03-28 15:22:18 +00:00
Frank Schubert 95cc161fdb Merge branch 'spidev' into 'master'
Zeiterfassungs Update

See merge request fronk/thetool!303
2024-03-28 15:20:54 +00:00
Frank Schubert 21d3f4614d Merge branch 'fronkdev' into 'master'
Changed Workorder Team Filter to select in Preorder/Index

See merge request fronk/thetool!304
2024-03-28 15:20:23 +00:00
Frank Schubert d64e60282d Changed Workorder Team Filter to select in Preorder/Index 2024-03-28 16:18:49 +01:00
Frank Schubert 13320b755e Merge branch 'fronkdev' into 'master'
Added workorder team filter in Preorder/Index

See merge request fronk/thetool!302
2024-03-22 11:34:30 +00:00
Frank Schubert 31d9c458d1 Added workorder team filter in Preorder/Index 2024-03-22 12:33:27 +01:00
Frank Schubert 429c0d27fc Merge branch 'fronkdev' into 'master'
Fixed saving workorder assigned team

See merge request fronk/thetool!301
2024-03-21 18:36:38 +00:00
Frank Schubert 95af0c65eb Fixed saving workorder assigned team 2024-03-21 19:36:11 +01:00
Frank Schubert 4e297822ff Merge branch 'fronkdev' into 'master'
Changed output filenames in rimo-import script

See merge request fronk/thetool!300
2024-03-21 16:57:28 +00:00
Frank Schubert 2ee8bd0b49 Changed output filenames in rimo-import script 2024-03-21 17:57:00 +01:00
Frank Schubert dace70cde4 Merge branch 'fronkdev' into 'master'
Added saving output to rimo-import script

See merge request fronk/thetool!299
2024-03-21 14:51:27 +00:00
Frank Schubert a4f4c2b779 Added saving output to rimo-import script 2024-03-21 15:49:47 +01:00
Frank Schubert bb59ca006e Merge branch 'fronkdev' into 'master'
Added Preding to rimo import; added workorder team

See merge request fronk/thetool!298
2024-03-21 12:38:18 +00:00
Frank Schubert 068adf890e Added Preding to rimo import; added workorder team 2024-03-20 19:50:57 +01:00
Frank Schubert 81e3b1ccd5 Merge branch 'fronkdev' into 'master'
Fronkdev

See merge request fronk/thetool!297
2024-03-12 21:56:56 +00:00
Frank Schubert 1e7911de80 Showing voicenumber in Order/Index 2024-03-12 22:56:12 +01:00
Frank Schubert b4cb70b643 Added voicenumber select in Order 2024-03-12 22:34:28 +01:00
Frank Schubert 06aec3a9e0 Merge branch 'feature/add-domains' into 'master'
Add Domains

See merge request fronk/thetool!294
2024-03-12 19:54:36 +00:00
Frank Schubert 223d6fd7b7 Merge branch 'feature/add-lastname-historicticket' into 'master'
add lastname and filtering to historicticket

See merge request fronk/thetool!293
2024-03-12 18:25:13 +00:00
Frank Schubert e6a04822f0 Merge branch 'feature/add-historic-tickets' into 'master'
Feature/add historic tickets

See merge request fronk/thetool!292
2024-03-12 15:53:46 +00:00
Frank Schubert 1a676fe8aa Merge branch 'master' into fronkdev 2024-03-12 15:55:10 +01:00
Frank Schubert caf41e4a23 Update header.php 2024-03-12 14:52:58 +00:00
Frank Schubert 396fabc957 Merge branch 'master' into fronkdev 2024-03-12 15:46:37 +01:00
Frank Schubert 106ecea2b5 Merge branch 'master' into fronkdev 2024-03-12 15:42:35 +01:00
Frank Schubert 45f2e432d8 Merge branch 'spidev' into 'master'
Zeiterfassungs Update

See merge request fronk/thetool!291
2024-03-12 14:37:03 +00:00
Frank Schubert fab6d2114f Merge branch 'feature/rework-notification' into 'master'
fixed word-breaking and style issues

See merge request fronk/thetool!290
2024-03-12 14:35:07 +00:00
Frank Schubert 33b0c72b72 Merge branch 'fronkdev' into 'master'
Added ciftoken + url to Preorder export

See merge request fronk/thetool!289
2024-03-12 14:27:36 +00:00
Frank Schubert 1255fa9c55 Added ciftoken + url to Preorder export 2024-03-12 15:27:09 +01:00
Frank Schubert c9f0cd61fd Merge branch 'feature/rework-notification' into 'master'
implemented global notification and reworked setFlash Function

See merge request fronk/thetool!283
2024-03-12 14:12:54 +00:00
Frank Schubert 402622271f Merge branch 'spidev' into 'master'
Zeiterfassungs Update

See merge request fronk/thetool!288
2024-03-12 13:05:33 +00:00
Frank Schubert 915be152c1 Merge branch 'spidev' into 'master'
Device Update / Zeiterfassung Update

See merge request fronk/thetool!287
2024-03-12 12:21:53 +00:00
Frank Schubert 901131fbce Merge branch 'fronkdev' into 'master'
Changed order of preorder admin buttons

See merge request fronk/thetool!286
2024-03-07 15:57:10 +00:00
Frank Schubert 983312877c Changed order of preorder admin buttons 2024-03-07 16:56:44 +01:00
Frank Schubert f7f69b4638 Merge branch 'fronkdev' into 'master'
Preorder admin page sorting

See merge request fronk/thetool!285
2024-03-07 15:54:32 +00:00
Frank Schubert 8d24798722 Preorder admin page sorting 2024-03-07 16:53:48 +01:00
Frank Schubert 31ba14ea04 Merge branch 'fronkdev' into 'master'
Preorderadmin & Superexpert mode

See merge request fronk/thetool!284
2024-03-07 15:44:25 +00:00
Frank Schubert 2085ab6f29 Added preorder connection split and add units scripts to admin 2024-03-07 16:43:34 +01:00
Frank Schubert 39a5933dce Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!282
2024-03-07 14:35:14 +00:00
Frank Schubert 2df2ca22a1 added superexpert mode 2024-03-07 15:33:59 +01:00
Frank Schubert 2ac6d8e178 Merge branch 'fronkdev' into 'master'
Added Lieboch West1

See merge request fronk/thetool!281
2024-03-06 13:19:40 +00:00
Frank Schubert 39478b9fb9 Added Lieboch West1 2024-03-06 14:16:58 +01:00
Frank Schubert 1e25c79256 Merge branch 'fronkdev' into 'master'
Changed status_code for Preorderlogistics to 140

See merge request fronk/thetool!280
2024-03-05 14:20:07 +00:00
Frank Schubert 23920c2b78 Changed status_code for Preorderlogistics to 140 2024-03-05 15:19:16 +01:00
Frank Schubert 41cce8e337 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!276
2024-03-05 13:07:07 +00:00
Frank Schubert 9a6e25b1a8 Merge branch 'feature/improve-dashboard-loading-times' into 'master'
[Enhancement] AddressModel: Added 'id' parameter to getSqlFilter method

See merge request fronk/thetool!279
2024-03-05 12:54:46 +00:00
Frank Schubert 39f0940d42 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!275
2024-02-29 14:32:00 +00:00
Frank Schubert c1ff9d9cfb Merge branch 'fronkdev' into 'master'
readded network check in Preorder API CIF modules

See merge request fronk/thetool!274
2024-02-29 13:27:59 +00:00
Frank Schubert 9776a27601 readded network check in Preorder API CIF modules 2024-02-29 14:26:25 +01:00
Frank Schubert 659339c44a Merge branch 'fronkdev' into 'master'
Fixed getting ciftoken in userSetCif Preorder api EP

See merge request fronk/thetool!273
2024-02-28 16:17:24 +00:00
Frank Schubert 15586820e2 Fixed getting ciftoken in userSetCif Preorder api EP 2024-02-28 17:16:25 +01:00
Frank Schubert 63f7fe6a83 Merge branch 'fronkdev' into 'master'
Added Lieboch to rimo api import

See merge request fronk/thetool!272
2024-02-28 14:28:37 +00:00
Frank Schubert a0754d8c5d Added Lieboch to rimo api import 2024-02-28 15:27:42 +01:00
Frank Schubert 566f71972b Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!271
2024-02-27 18:51:35 +00:00