Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity
1,398 Commits 7 Branches 0 Tags
c5c70a5ccdaeec33229151c3753b9dd14b2bcbc9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank Schubert c5c70a5ccd Merge branch 'fronkdev' into 'master' 
Limited VatgroupController to Fibu user

See merge request fronk/thetool!259
 2024-02-20 21:38:18 +00:00
Frank Schubert 78916bdd0f Limited VatgroupController to Fibu user 2024-02-20 22:37:47 +01:00
Frank Schubert 06da66bef7 Merge branch 'fronkdev' into 'master' 
Added legacy_account in Vatrate

See merge request fronk/thetool!258
 2024-02-20 21:26:48 +00:00
Frank Schubert b0cd82d0dd Added legacy_account in Vatrate 2024-02-20 22:26:20 +01:00
Frank Schubert 6ddad09943 Merge branch 'fronkdev' into 'master' 
Added Vatgroup & Vatrate

See merge request fronk/thetool!257
 2024-02-20 21:13:25 +00:00
Frank Schubert 7cb5ac6329 Added Vatgroup & Vatrate 2024-02-20 22:12:59 +01:00
Frank Schubert efbf23d974 Merge branch 'fronkdev' into 'master' 
Fixed saving network without adb_netzgebiet_id

See merge request fronk/thetool!256
 2024-02-20 20:57:31 +00:00
Frank Schubert cdb1f1fef7 Fixed saving network without adb_netzgebiet_id 2024-02-20 21:57:04 +01:00
Frank Schubert 80cf3d2fc8 Merge branch 'fronkdev' into 'master' 
Address: changed country to country_id with Country table

See merge request fronk/thetool!255
 2024-02-20 19:21:37 +00:00
Frank Schubert 20163e6008 Address: changed country to country_id with Country table 2024-02-20 20:20:48 +01:00
Frank Schubert e1139b6d8e Merge branch 'fronkdev' into 'master' 
Added Country table and import script

See merge request fronk/thetool!254
 2024-02-20 14:42:38 +00:00
Frank Schubert c83fc9bcca Added Country table and import script 2024-02-20 15:42:11 +01:00
Frank Schubert d238ec0335 Merge branch 'spidev' into 'master' 
Zeiterfassung update

See merge request fronk/thetool!253
 2024-02-19 14:04:19 +00:00
Frank Schubert 7c1a6f17b0 Merge branch 'bugfix/raspberrydisplay-auth-fix' into 'master' 
Bugfix/raspberrydisplay auth fix

See merge request fronk/thetool!252
 2024-02-19 11:55:20 +00:00
Frank Schubert 36b3f1e0f8 Merge branch 'fronkdev' into 'master' 
Added robots.txt

See merge request fronk/thetool!251
 2024-02-15 20:57:40 +00:00
Frank Schubert 6527c67d31 Added robots.txt 2024-02-15 21:56:17 +01:00
Frank Schubert 81108f7f35 Merge branch 'fronkdev' into 'master' 
New Preorder cancelling

See merge request fronk/thetool!250
 2024-02-15 19:54:29 +00:00
Frank Schubert dfa8d7ca1d New Preorder cancelling 2024-02-15 20:44:04 +01:00
Frank Schubert 48ee058660 Merge branch 'fronkdev' into 'master' 
Fixed sometimes failing redirect to UserProfile in Router

See merge request fronk/thetool!249
 2024-02-15 14:31:46 +00:00
Frank Schubert 0d62e07d3e Fixed sometimes failing redirect to UserProfile in Router 2024-02-15 15:30:19 +01:00
Frank Schubert d13628f76f Merge branch 'fronkdev' into 'master' 
Added Preordercampaign Admin function updateOaidFromUnit()

See merge request fronk/thetool!248
 2024-02-14 15:31:27 +00:00
Frank Schubert 0c1e248bc7 Added Preordercampaign Admin function updateOaidFromUnit() 2024-02-14 16:30:42 +01:00
Frank Schubert c616e2ab77 Merge branch 'fronkdev' into 'master' 
Added mureck to preorder scripts

See merge request fronk/thetool!247
 2024-02-14 14:36:25 +00:00
Frank Schubert cb5df1783a Added mureck to preorder scripts 2024-02-14 15:35:09 +01:00
Frank Schubert 5d65740330 Fixed Type in translation file 2024-02-14 15:32:18 +01:00
Frank Schubert 8a746386a3 Merge branch 'fronkdev' into 'master' 
AddressDB: visibility / resetFilter button in Preorder/Index / php-qrcode to version 4 in composer.json

See merge request fronk/thetool!246
 2024-02-14 13:01:44 +00:00
Frank Schubert 7ecf8e32e6 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-02-14 14:00:47 +01:00
Frank Schubert f5c192a65b Merge branch 'master' into fronkdev 2024-02-14 13:59:41 +01:00
Frank Schubert 2b6df7f96b Merge branch 'master' into 'fronkdev' 
# Conflicts:
#   composer.json
 2024-02-14 12:58:02 +00:00
Frank Schubert 2b5b22d5f0 Fixed composer.json merge conflict 2024-02-14 13:57:17 +01:00
Frank Schubert 5288ff5f1e Fixed php-qrcode to major version 4 in composer.json 2024-02-14 13:50:16 +01:00
Frank Schubert b40e32e6d2 Merge branch 'feature/RaspberryDisplay' into 'master' 
created RasberryDisplay Module

See merge request fronk/thetool!245
 2024-02-14 12:41:35 +00:00
Frank Schubert 75453d44af Fixed resetFilter button in Preorder/Index 2024-02-13 16:56:43 +01:00
Frank Schubert 9d5c6a9b4a AddressDB: Added visibility in Form 2024-02-13 16:19:17 +01:00
Frank Schubert 0bc5359277 WIP Contractqueue 2024-02-13 16:18:54 +01:00
Frank Schubert 8bf9e3efa3 Merge branch 'fronkdev' into 'master' 
Fixed order_date

See merge request fronk/thetool!244
 2024-02-12 11:34:07 +00:00
Frank Schubert 3a12056db7 Fixed order_date 2024-02-12 12:33:40 +01:00
Frank Schubert 7021da184c Merge branch 'spidev' into 'master' 
Zeiterfassung update

See merge request fronk/thetool!243
 2024-02-12 11:02:20 +00:00
Frank Schubert ade4a3e2e5 Merge branch 'spidev' into 'master' 
Spidev

See merge request fronk/thetool!242
 2024-02-12 10:52:54 +00:00
Frank Schubert c20b5e325a Merge branch 'fronkdev' into 'master' 
Preorder map: Removed netzgebiet outlines for non-admins

See merge request fronk/thetool!241
 2024-02-09 17:23:48 +00:00
Frank Schubert 4681e5435b Preorder map: Removed netzgebiet outlines for non-admins 2024-02-09 18:23:03 +01:00
Frank Schubert 7df9ce526f Merge branch 'fronkdev' into 'master' 
Added user property to enforce 2fa or not

See merge request fronk/thetool!240
 2024-02-09 17:09:39 +00:00
Frank Schubert fc260c996d Added user property to enforce 2fa or not 2024-02-09 18:09:02 +01:00
Frank Schubert 3d9868f2da Merge branch 'fronkdev' into 'master' 
Importing adb netzgebiet borderpoly

See merge request fronk/thetool!239
 2024-02-09 16:52:49 +00:00
Frank Schubert c8bd553505 Importing adb netzgebiet borderpoly 2024-02-09 17:52:29 +01:00
Frank Schubert dcc6d26b9f Merge branch 'fronkdev' into 'master' 
Added netzgebiet border polygon

See merge request fronk/thetool!238
 2024-02-09 16:52:00 +00:00
Frank Schubert 65c23a30c2 Added netzgebiet border polygon 2024-02-09 17:51:34 +01:00
Frank Schubert ece7ead34d Merge branch 'fronkdev' into 'master' 
Optimizing PreoderController::getFilteredPreorderApi return values

See merge request fronk/thetool!237
 2024-02-09 14:33:15 +00:00
Frank Schubert 4babf202a6 Optimizing PreoderController::getFilteredPreorderApi return values 2024-02-09 15:32:52 +01:00
Frank Schubert 7084b006a0 Merge branch 'fronkdev' into 'master' 
Optimizing PreoderController::getFilteredPreorderApi return values

See merge request fronk/thetool!236
 2024-02-09 14:26:47 +00:00
Frank Schubert 7408d27b3c Optimizing PreoderController::getFilteredPreorderApi return values 2024-02-09 15:26:13 +01:00
Frank Schubert fbae92efee Merge branch 'fronkdev' into 'master' 
Not showing trenches in Preorder Map

See merge request fronk/thetool!235
 2024-02-09 14:19:58 +00:00
Frank Schubert c5e9cb7742 Not showing trenches in Preorder Map 2024-02-09 15:19:30 +01:00
Frank Schubert b0d977df66 Merge branch 'fronkdev' into 'master' 
Changed Preorder map to basemap.at & added lines

See merge request fronk/thetool!234
 2024-02-09 13:21:10 +00:00
Frank Schubert 7b84ded53f Changed Preorder map to basemap.at & added lines 2024-02-09 14:20:12 +01:00
Frank Schubert e20b50420b Merge branch 'fronkdev' into 'master' 
Fixed order_date

See merge request fronk/thetool!233
 2024-02-09 11:58:36 +00:00
Frank Schubert 371e6c8b0e Fixed order_date 2024-02-09 12:58:09 +01:00
Frank Schubert 9c7f565cbc Merge branch 'fronkdev' into 'master' 
Added Mureck import & borderpoint testing & hausnummer visibility

See merge request fronk/thetool!232
 2024-02-09 00:52:54 +00:00
Frank Schubert 063be46a49 Added Mureck import & borderpoint testing 2024-02-09 01:51:31 +01:00
Frank Schubert ce51785985 Added borderpoint and trench coords to hausnummer 2024-02-08 16:55:17 +01:00
Frank Schubert e80ef28d32 Added visibility to Hausnummer 2024-02-08 16:55:02 +01:00
Frank Schubert c7eee21004 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-02-08 13:06:35 +01:00
Frank Schubert bc591f9357 Merge branch 'fronkdev' into 'master' 
Changed /preorder/:code/clientInstallationFinished to POST

See merge request fronk/thetool!231
 2024-02-08 10:44:54 +00:00
Frank Schubert e0864507c5 Changed /preorder/:code/clientInstallationFinished to POST 2024-02-08 11:44:17 +01:00
Frank Schubert d3429aa9ef Merge branch 'fronkdev' into 'master' 
Fixed typo in api docs

See merge request fronk/thetool!230
 2024-02-08 10:40:21 +00:00
Frank Schubert 70b2642bd1 Fixed type in api docs 2024-02-08 11:38:58 +01:00
Frank Schubert 0b51f6f41a Merge branch 'feature/improve-order-loading-times' into 'master' 
Add caching for network sections and add indexes for order tables

See merge request fronk/thetool!229
 2024-02-07 16:20:02 +00:00
Frank Schubert 04abfb816e Merge branch 'doc/add-migration-readme' into 'master' 
Add TheTool database migration documentation

See merge request fronk/thetool!226
 2024-02-07 16:17:34 +00:00
Frank Schubert 3bdb7243d6 Merge branch 'feature/fix-select2-responsive' into 'master' 
fix select2-container width

See merge request fronk/thetool!225
 2024-02-07 16:17:23 +00:00
Frank Schubert f57db118f0 Merge branch 'feature/improve-voiceplan-loading' into 'master' 
Add indexes for voice plan tables

See merge request fronk/thetool!224
 2024-02-07 16:17:14 +00:00
Frank Schubert b174fe59a5 Merge branch 'master' of code.fronk.at:fronk/thetool 2024-02-07 16:39:22 +01:00
Frank Schubert e49297aea9 Merge branch 'fronkdev' 2024-02-07 16:35:49 +01:00
Frank Schubert 51155a18ba Merge branch 'fronkdev' into 'master' 
Fixed setting correct status when canceling preorder

See merge request fronk/thetool!228
 2024-02-07 15:26:22 +00:00
Frank Schubert 985441cb01 Fixed setting correct status when canceling preorder 2024-02-07 16:25:22 +01:00
Frank Schubert 0b1e9fa62e Merge branch 'feature/add-docker-setup' into 'master' 
Added Docker Setup

See merge request fronk/thetool!227
 2024-02-07 14:58:40 +00:00
Frank Schubert 724c0dd0fc Merge branch 'fronkdev' into 'master' 
Added sepa_date import from ivt script

See merge request fronk/thetool!219
 2024-02-06 20:03:02 +00:00
Frank Schubert 0f22ae89a6 Added sepa_date import from ivt script 2024-02-06 21:02:23 +01:00
Frank Schubert 28f9f1828e Merge branch 'fronkdev' into 'master' 
sepa_date & contract_term

See merge request fronk/thetool!218
 2024-02-06 19:49:37 +00:00
Frank Schubert 38ec49ddb3 Added sepa date 2024-02-06 20:47:44 +01:00
Frank Schubert e9937f2df8 Added contract_term to Order/Product/Contract 2024-02-06 20:46:05 +01:00
Frank Schubert e2b1f2757b Merge branch 'fronkdev' into 'master' 
Reduced database connections on startup

See merge request fronk/thetool!217
 2024-02-06 17:43:44 +00:00
Frank Schubert afac1ff9c9 Reduced database connections on startup 2024-02-06 18:42:55 +01:00
Frank Schubert ef526b83ac Merge branch 'fronkdev' into 'master' 
Added extended search to Preorder Index

See merge request fronk/thetool!216
 2024-02-05 16:43:53 +00:00
Frank Schubert 01f41c9eaa Added extended search to Preorder Index 2024-02-05 17:43:24 +01:00
Frank Schubert f98100ee12 Merge branch 'fronkdev' into 'master' 
Fixed Preorder search with addon query

See merge request fronk/thetool!215
 2024-02-05 14:24:46 +00:00
Frank Schubert 4c8d0e7509 Fixed Preorder search with addon query 2024-02-05 15:24:10 +01:00
Frank Schubert 7e5d22e5eb Merge branch 'fronkdev' into 'master' 
Added wettmannstaetten to preorder scripts

See merge request fronk/thetool!214
 2024-02-05 14:16:11 +00:00
Frank Schubert f09ffb622f Added wettmannstaetten to preorder scripts 2024-02-05 15:15:40 +01:00
Frank Schubert b6c982af08 Merge branch 'fronkdev' into 'master' 
Added rimo import network wettmanstaetten

See merge request fronk/thetool!213
 2024-02-05 12:40:19 +00:00
Frank Schubert e65296d2fc Added rimo import network wettmanstaetten 2024-02-05 13:39:49 +01:00
Frank Schubert d064de4f90 Merge branch 'fronkdev' into 'master' 
Added RML Import & subcd

See merge request fronk/thetool!212
 2024-02-05 11:40:37 +00:00
Frank Schubert f25170e398 Added RML Import & subcd 2024-02-05 12:39:40 +01:00
Frank Schubert c7c16830f7 Merge branch 'fronkdev' into 'master' 
2FA can now be forced for logged-in users

See merge request fronk/thetool!211
 2024-02-03 20:46:09 +00:00
Frank Schubert 4e278e6c61 2FA can now be forced for logged-in users 2024-02-03 21:45:24 +01:00
Frank Schubert 7354acb602 Merge branch 'fronkdev' into 'master' 
Added St. Stefan Stainz to rimo import

See merge request fronk/thetool!210
 2024-01-31 14:51:02 +00:00
Frank Schubert 3ec626e02e Added St. Stefan Stainz to rimo import 2024-01-31 15:50:19 +01:00
Frank Schubert 6b2e829805 Merge branch 'fronkdev' into 'master' 
Added warning triangle in topbar when 2fa disabled

See merge request fronk/thetool!209
 2024-01-31 14:17:53 +00:00
Frank Schubert 96ac7aae8c Added warning triangle in topbar when 2fa disabled 2024-01-31 15:17:26 +01:00
Frank Schubert 19fa5328ba Merge branch 'fronkdev' into 'master' 
upgraded mysql connection charset to utf8mb4

See merge request fronk/thetool!208
 2024-01-31 13:47:43 +00:00
Frank Schubert bdb155f997 upgraded mysql connection charset to utf8mb4 2024-01-31 14:46:14 +01:00