Commit Graph

4942 Commits

Author SHA1 Message Date
Frank Schubert
c5a2f1a2bb Merge branch 'fronkdev' into 'master'
Changed Unit status update in Citycom import

See merge request fronk/thetool!1873
2025-11-07 12:44:05 +00:00
Frank Schubert
033a465b27 Changed Unit status update in Citycom import 2025-11-07 13:43:30 +01:00
Frank Schubert
382bf0a982 Merge branch 'fronkdev' into 'master'
PreorderBilling: Not creating billing record when enduser_setup is zero

See merge request fronk/thetool!1872
2025-11-06 12:04:06 +00:00
Frank Schubert
99d3ad0032 PreorderBilling: Not creating billing record when enduser_setup is zero 2025-11-06 13:03:16 +01:00
Frank Schubert
63889acbf5 Merge branch 'fronkdev' into 'master'
Fixed redirect in mfBaseController

See merge request fronk/thetool!1871
2025-11-06 11:55:17 +00:00
Frank Schubert
27ec0712f7 Fixed redirect in mfBaseController 2025-11-06 12:54:47 +01:00
Daniel Spitzer
220be9b4cd Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1870
2025-11-05 20:29:38 +00:00
Daniel Spitzer
d2bb93b2ba Zeiterfassung Update 2025-11-05 21:29:16 +01:00
Daniel Spitzer
355493faa9 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1869
2025-11-05 20:25:31 +00:00
Daniel Spitzer
2234b5a0af Zeiterfassung Update 2025-11-05 21:25:09 +01:00
Daniel Spitzer
39eec35f8b Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1868
2025-11-05 20:19:13 +00:00
Daniel Spitzer
afe6626183 Zeiterfassung Update 2025-11-05 21:18:15 +01:00
Frank Schubert
b18a30dc66 Merge branch 'fronkdev' into 'master'
Added rimo update button in AdressDB/Index

See merge request fronk/thetool!1867
2025-11-05 16:52:06 +00:00
Frank Schubert
f8306cfb7f Added rimo update button in AdressDB/Index 2025-11-05 17:51:20 +01:00
Frank Schubert
8a52252968 Merge branch 'master' into fronkdev 2025-11-05 16:55:32 +01:00
Luca Haid
fc92fbfc38 Merge branch 'Radius/hotfix' into 'master'
Clear Bookstack article cache on first load

See merge request fronk/thetool!1866
2025-11-04 15:31:48 +00:00
f9a89f79b0 Clear Bookstack article cache on first load 2025-11-04 16:31:37 +01:00
Luca Haid
d074605be2 Update RadiusUsers.js 2025-11-04 12:52:08 +00:00
Daniel Spitzer
547febd236 Merge branch 'spidev' into 'master'
Pops Bugfix

See merge request fronk/thetool!1865
2025-11-04 12:19:27 +00:00
Daniel Spitzer
a6bf3e915e Pops Bugfix
* Popnamen beim bearbeiten werden nun nicht werden nun nicht mehr mit Vorder- und Rückseite verfälscht.
* Wenn ein Rack 1/3 oder 1/4 Zoll hat und der 1te Slot belegt wurde wurde 1/2 Slot beim bearbeiten angezeigt
2025-11-04 13:17:43 +01:00
Luca Haid
4bc6a75668 Merge branch 'Radius/connect' into 'master'
Enhance IP address tooltip and add Ctrl+Click functionality for scanning

See merge request fronk/thetool!1864
2025-11-04 11:31:02 +00:00
2bfea1d0d7 Enhance IP address tooltip and add Ctrl+Click functionality for scanning 2025-11-04 12:30:52 +01:00
Daniel Spitzer
275258563a Pops Bugfix
* Popnamen beim bearbeiten werden nun nicht werden nun nicht mehr mit Vorder- und Rückseite verfälscht.
2025-11-04 10:18:14 +01:00
Luca Haid
e809ccab02 Merge branch 'Preorder/Rimotypemap' into 'master'
Add context menu for missing buildings and update fault handling

See merge request fronk/thetool!1863
2025-11-04 08:45:38 +00:00
98be5e1614 Add context menu for missing buildings and update fault handling 2025-11-04 09:45:26 +01:00
Luca Haid
5c94fe3205 Merge branch 'Workorder/add-2-new-fields' into 'master'
added new rml stuff

See merge request fronk/thetool!1862
2025-11-03 12:23:29 +00:00
Luca Haid
5dac241ca2 added new rml stuff 2025-11-03 13:23:17 +01:00
Luca Haid
56d572292b Merge branch 'Workorder/add-2-new-fields' into 'master'
added new rml stuff

See merge request fronk/thetool!1861
2025-11-03 11:59:14 +00:00
Luca Haid
887552a734 added new rml stuff 2025-11-03 12:59:00 +01:00
Luca Haid
37be99b284 Update RadiusUsers.js 2025-10-31 10:51:07 +00:00
Luca Haid
f4a8a88d7e Update RadiusUsers.js 2025-10-31 08:53:38 +00:00
Luca Haid
781b6a6d6b Merge branch 'CpeProvisioning/improve-search' into 'master'
improve search

See merge request fronk/thetool!1860
2025-10-29 07:56:23 +00:00
1b3859d60a improve search 2025-10-29 08:56:08 +01:00
Luca Haid
02dd58442e Merge branch 'CpeProvisioning/add-partner-number' into 'master'
added partner number

See merge request fronk/thetool!1859
2025-10-29 07:12:32 +00:00
7c450fb83f added partner number 2025-10-29 08:12:17 +01:00
Daniel Spitzer
899e007da9 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1858
2025-10-28 16:55:22 +00:00
Daniel Spitzer
21326d4757 Zeiterfassung Update
* Neues Genehmigungsverfahren für Buchhaltung eingeführt
* Buchungsarten für Mitarbeiter erweitert Arztbesuch/Behörde/Weiterbildung
* Neues Flag in Personaladministration für von Buchhaltung zu genehmigen
2025-10-28 17:54:18 +01:00
Frank Schubert
9a1ca605ae Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2025-10-24 11:41:56 +02:00
Luca Haid
7feb4c6b4d Merge branch 'Preorder/add-files' into 'master'
added file uploads

See merge request fronk/thetool!1857
2025-10-24 08:16:44 +00:00
87a0b01e57 added file uploads 2025-10-24 10:16:35 +02:00
Luca Haid
55cdfbecc5 fixed typo 2025-10-24 07:33:21 +00:00
Luca Haid
e569d4fa13 fixed migration 2025-10-24 07:32:59 +00:00
Luca Haid
b03c8c4c70 fixed migrations 2025-10-24 07:32:19 +00:00
Luca Haid
04b302a6d5 Merge branch 'Preorder/add-files' into 'master'
added file uploads

See merge request fronk/thetool!1856
2025-10-24 07:31:07 +00:00
6af9d8dc32 added file uploads 2025-10-24 09:30:48 +02:00
Luca Haid
0131f472f0 added billed for xinon campaigns aswell 2025-10-23 09:21:21 +00:00
Daniel Spitzer
6cbf850681 Merge branch 'spidev' into 'master'
Kalender Update

See merge request fronk/thetool!1855
2025-10-22 11:17:12 +00:00
Daniel Spitzer
6bc1096700 Kalender Update
* Übergang Sommerzeit Winterzeit Bugfix
2025-10-22 13:13:59 +02:00
Daniel Spitzer
b3aafcd528 Merge branch 'spidev' into 'master'
Kalender Update

See merge request fronk/thetool!1854
2025-10-22 07:43:00 +00:00
Daniel Spitzer
ba4964f2bd Kalender Update
* Übergang Sommerzeit Winterzeit Bugfix
2025-10-22 09:41:48 +02:00