Commit Graph

2824 Commits

Author SHA1 Message Date
Daniel Spitzer
3840a6428a Merge branch 'spidev' into 'master'
Kalender Updates

See merge request fronk/thetool!901
2025-01-14 18:39:27 +00:00
Daniel Spitzer
4ac8fb51de Kalender Updates
* Predefine Vorlagen entfernt
2025-01-14 19:38:24 +01:00
Daniel Spitzer
6ddbc129a0 Merge branch 'spidev' into 'master'
Kalender Updates

See merge request fronk/thetool!900
2025-01-14 17:57:08 +00:00
Daniel Spitzer
6263f2e12a Kalender Updates
* Vorlagen können nun erstellt und editiert werden.
* neue Migration für CalendarTemplates
2025-01-14 18:54:51 +01:00
Daniel Spitzer
7c0c585b91 Kalender Updates
* Vorlagen können nun erstellt und editiert werden.
* neue Migration für CalendarTemplates
2025-01-14 18:54:18 +01:00
Daniel Spitzer
1f107a3fa5 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!899
2025-01-14 14:01:58 +00:00
Daniel Spitzer
2099f28a58 Zeiterfassung
Diäten Basispreis geändert
2025-01-14 15:00:57 +01:00
Frank Schubert
a11262f2ed Merge branch 'fronkdev' into 'master'
ConstructionConsent Filter update

See merge request fronk/thetool!898
2025-01-14 13:57:44 +00:00
Frank Schubert
ae7d565398 ConstructionConsent Filter update 2025-01-14 14:57:03 +01:00
Luca Haid
c5227b6002 Merge branch 'change-preorder-filter' into 'master'
changed rimo-workorder-status filter

See merge request fronk/thetool!897
2025-01-14 13:06:07 +00:00
Luca Haid
6605910804 changed rimo-workorder-status filter 2025-01-14 14:05:46 +01:00
Frank Schubert
ee901f33d6 Merge branch 'fronkdev' into 'master'
anyone can delete Workorders in Preorder now

See merge request fronk/thetool!896
2025-01-14 12:53:22 +00:00
Frank Schubert
fd88903963 anyone can delete Workorders in Preorder now 2025-01-14 13:52:04 +01:00
Luca Haid
dbbf49a9a9 Merge branch 'fix-addr-model' into 'master'
fixed address model

See merge request fronk/thetool!895
2025-01-14 12:39:19 +00:00
Luca Haid
963aa08a2c fixed address model 2025-01-14 13:38:14 +01:00
Luca Haid
1250bf17d3 Merge branch 'added-enter-searching' into 'master'
added enter to search

See merge request fronk/thetool!894
2025-01-14 12:31:04 +00:00
Luca Haid
8d0067adc1 added enter to search 2025-01-14 13:30:45 +01:00
Luca Haid
d07cdfce12 Merge branch 'fix-tt-autocomplete' into 'master'
fixed touch input

See merge request fronk/thetool!893
2025-01-14 11:57:09 +00:00
Luca Haid
6233454b66 fixed touch input 2025-01-14 12:56:12 +01:00
Luca Haid
a5d56d9350 Merge branch 'fix-tt-autocomplete' into 'master'
fixed touch issue

See merge request fronk/thetool!892
2025-01-14 11:34:10 +00:00
Luca Haid
1ec1afd859 fixed touch issue 2025-01-14 12:33:55 +01:00
Luca Haid
18ad06395e Merge branch 'add-radius-connection' into 'master'
added link to edit user

See merge request fronk/thetool!891
2025-01-14 11:08:11 +00:00
Luca Haid
e86db7d2e1 added link to edit user 2025-01-14 12:07:44 +01:00
Luca Haid
0f42830ffb Update Radius.js 2025-01-14 08:36:36 +00:00
Luca Haid
0465c6c57d Merge branch 'add-radius-connection' into 'master'
added new radius module

See merge request fronk/thetool!890
2025-01-14 08:10:58 +00:00
Luca Haid
08b4c27c5d added new radius module 2025-01-14 09:10:24 +01:00
Luca Haid
896692d25d Merge branch 'add-radius-connection' into 'master'
added new radius module

See merge request fronk/thetool!889
2025-01-14 07:53:21 +00:00
Luca Haid
35e5040155 added new radius module 2025-01-14 08:52:50 +01:00
Frank Schubert
e74a03e1a1 Merge branch 'fronkdev' into 'master'
Added image upload to ConstructionConsent Form

See merge request fronk/thetool!888
2025-01-13 18:07:20 +00:00
Frank Schubert
f2cfefc7a2 Added image upload to ConstructionConsent Form 2025-01-13 19:06:50 +01:00
Frank Schubert
c04b506edf Merge branch 'fronkdev' into 'master'
WIP ConstructionConsent

See merge request fronk/thetool!887
2025-01-13 15:30:07 +00:00
Frank Schubert
15bfe7c734 WIP ConstructionConsent 2025-01-13 2025-01-13 16:28:56 +01:00
Luca Haid
d1ec42b017 Merge branch 'dashboard-chart-edit' into 'master'
made points inside chart bigger

See merge request fronk/thetool!886
2025-01-13 10:32:01 +00:00
Luca Haid
bb4eee7caa made points inside chart bigger 2025-01-13 11:31:42 +01:00
Luca Haid
7ee2a1e8b2 Merge branch 'shipping-note-add-inv-addr' into 'master'
added invoice addr to shipping note pdf

See merge request fronk/thetool!885
2025-01-13 10:31:07 +00:00
Luca Haid
65755afd2d added invoice addr to shipping note pdf 2025-01-13 11:30:49 +01:00
Luca Haid
0641753ee5 Merge branch 'rework-dashboard' into 'master'
fixed cache disabling

See merge request fronk/thetool!884
2025-01-13 09:48:01 +00:00
Luca Haid
101cd50261 fixed cache disabling 2025-01-13 10:47:18 +01:00
Luca Haid
9dcddbd1ec Merge branch 'rework-dashboard' into 'master'
Updated Dashboard and made it live

See merge request fronk/thetool!883
2025-01-13 09:45:44 +00:00
Luca Haid
a6df4c6496 Updated Dashboard and made it live 2025-01-13 10:44:32 +01:00
Luca Haid
9f7338c77f Merge branch 'rework-dashboard' into 'master'
Rework dashboard

See merge request fronk/thetool!881
2025-01-10 12:31:06 +00:00
Luca Haid
534febd8e7 Rework dashboard 2025-01-10 12:31:05 +00:00
Frank Schubert
5f752da41f WIP 2025-01-09 ConstructionConsent 2025-01-10 12:35:25 +01:00
Luca Haid
3eabc30c58 Merge branch 'rework-dashboard' into 'master'
Rework dashboard

See merge request fronk/thetool!880
2025-01-10 11:12:33 +00:00
Luca Haid
50fb2ca7d8 Rework dashboard 2025-01-10 11:12:33 +00:00
Luca Haid
1147cb259f Merge branch 'rework-dashboard' into 'master'
Rework dashboard

See merge request fronk/thetool!878
2025-01-10 10:01:36 +00:00
Luca Haid
c5813d9839 Rework dashboard 2025-01-10 10:01:36 +00:00
Luca Haid
a504e02733 Merge branch 'rework-dashboard' into 'master'
Fixed User-Select for new Dashboard

See merge request fronk/thetool!877
2025-01-10 10:00:40 +00:00
Luca Haid
c562d2e5fb Fixed User-Select for new Dashboard 2025-01-10 10:00:39 +00:00
Luca Haid
fe4506bc9e Merge branch 'rework-dashboard' into 'master'
Added Graph for Orders in NewDashboard

See merge request fronk/thetool!876
2025-01-10 08:07:36 +00:00