Commit Graph
344 Commits
Author SHA1 Message Date
Luca Haid ef5e2b151e Merge branch 'feature/partner-search-preorder' into 'master'
Removed Price as necesatiy

See merge request fronk/thetool!766
2024-11-27 11:54:41 +00:00
Luca Haid 6ee92de994 Removed Price as necesatiy 2024-11-27 12:54:22 +01:00
Daniel Spitzer bf7693d5ec Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!763
2024-11-26 19:55:58 +00:00
Daniel Spitzer 02c5e0b8b6 Kalender
Update:
* Serientermine werden nun als Eventweise richtig angezeigt
2024-11-26 20:53:46 +01:00
Luca Haid f3a1aef719 switched 2 inputs 2024-11-25 10:47:06 +00:00
Luca Haid 0cf35b19b1 switched 2 inputs 2024-11-21 09:12:44 +00:00
Luca Haid 5bb51fd676 switched 2 inputs 2024-11-20 12:26:22 +00:00
Luca Haid b36f8108ad Merge branch 'feature/graphing' into 'master'
Added Graphing

See merge request fronk/thetool!753
2024-11-19 19:20:03 +00:00
Luca Haid 6b2c292282 Added Graphing 2024-11-19 20:19:46 +01:00
Daniel Spitzer 4d55a584fb Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!752
2024-11-19 14:31:33 +00:00
Daniel Spitzer 857e850d32 Kalender
Update:
* Abwesenheiten werden nun bei den Kalendern angezeigt
2024-11-19 15:29:35 +01:00
Daniel Spitzer e549ca703f Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!747
2024-11-18 12:11:51 +00:00
Daniel Spitzer 962a5db94f Kalender
Update:
* Serientermine werden nun angezeigt
* Serientermine können nun angenommen/abgelehnt bzw. geändert werden.
* Serientermin Serienzeiten ändern ist noch offen
* Alle Js nun local im Calendar Ordner
2024-11-18 13:08:20 +01:00
Luca Haid 115856cd07 Update ContractView.js 2024-11-15 09:13:38 +00:00
Luca Haid bab46867e9 Update HistoricBill.js 2024-11-15 09:11:27 +00:00
Luca Haid 902f38e395 Feature/improve warehouse shipping note 2024-11-14 10:13:15 +00:00
Luca Haid 5914ac6320 Added some permissions for warehouse 2024-11-14 11:08:01 +01:00
Luca Haid c393d8e6a1 - Disabled default Car being ID:2
- Showing Message if User has no default car
2024-11-13 18:16:11 +01:00
Luca Haid 78a0019564 fixed overflowing shopping cart on weird zoom factors 2024-11-13 15:04:18 +01:00
Luca Haid 5690f08892 Reworked Contract View to Vue.js 2024-11-13 13:51:49 +00:00
Luca Haid 41a9b0bbd9 Feature/shipping note refinements 2024-11-13 12:18:20 +00:00
Frank Schubert a13dcdecf5 Merge branch 'fronkdev' into 'master'
Added MaintenanceNotification

See merge request fronk/thetool!722
2024-11-12 17:31:53 +00:00
Frank Schubert 667a985293 Added MaintenanceNotification 2024-11-12 18:31:21 +01:00
Luca Haid 76b58543ee Merge branch 'feature/update-shipping-note' into 'master'
Updated WarehouseShippingNote

See merge request fronk/thetool!719
2024-11-12 17:25:30 +00:00
Luca Haid e42a13041b Updated WarehouseShippingNote 2024-11-12 18:24:25 +01:00
Daniel Spitzer 5095329963 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!713
2024-11-12 10:19:24 +00:00
Daniel Spitzer 413b730397 Kalender
Update:
* resource wurde bei Teilnehmern entfernt
* wenn es keinen Status für die Terminteilnahme gibt wird der busy Status hergenommen ohne Rahmeninformationen
2024-11-12 11:12:07 +01:00
Daniel Spitzer 329d8fd2fa Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!712
2024-11-12 09:36:28 +00:00
Daniel Spitzer f4766549e7 Kalender
Update:
* In der Planungsansicht wird beim erstellen eines Eintrages automatisch der jeweilige Kalender (wenn berechtigt vorgeschlagen)
* In der Planungsansicht kann nun bei neuen Kalendereinträgen alle aktiven Kalender als Teilnehmer mit einem Klick eingefügt werden.
2024-11-12 10:35:19 +01:00
Daniel Spitzer fec286bd53 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!709
2024-11-11 09:49:15 +00:00
Daniel Spitzer ef2a2edf42 Kalender
* Update (Kalenderstream behandelt nur mehr angezeigte Kalender)
2024-11-11 10:48:14 +01:00
Daniel Spitzer 5506807793 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!708
2024-11-11 07:55:26 +00:00
Daniel Spitzer 7567467818 Kalender
* Update (Feiertage und Geburtstage werden nun richtig angezeigt)
2024-11-11 08:54:13 +01:00
Daniel Spitzer 56b35eb665 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!707
2024-11-11 06:34:58 +00:00
Daniel Spitzer 8ab5f87109 Kalender
* Update Suche (Suche wird nun auf aktive Kalender eingeschränkt)
2024-11-11 07:33:23 +01:00
Daniel Spitzer be18972f92 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!704
2024-11-10 19:48:50 +00:00
Daniel Spitzer de7330e331 Kalender
* Generelle Updates
2024-11-10 20:47:09 +01:00
Frank Schubert c9c74fd17c Merge branch 'fronkdev2' into 'master'
Preorder AHA Report Download

See merge request fronk/thetool!703
2024-11-08 15:57:25 +00:00
Frank Schubert bddc73ce79 Cleanup of old dev stuff 2024-11-08 16:56:31 +01:00
Frank Schubert 6c0d334bbc WIP tmp 2024-11-07 16:28:05 +01:00
Luca Haid a696f60383 Feature/add historic bills 2024-11-06 12:39:14 +00:00
Luca Haid 7960531197 hotfix on if check 2024-11-05 20:45:16 +01:00
Luca Haid a148da16e4 hotfix on if check 2024-11-05 20:44:31 +01:00
Luca Haid eb9a1a3995 added zabbix sync and view for Device 2024-11-05 20:42:16 +01:00
Luca Haid bea341f869 added new view for device congestion 2024-11-05 19:12:19 +01:00
Daniel Spitzer 7e1dae3fa4 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!688
2024-11-03 20:45:30 +00:00
Daniel Spitzer 44e8be482c Kalender
* Updates
2024-11-03 21:43:33 +01:00
Daniel Spitzer 9a659106a6 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!687
2024-11-03 18:01:07 +00:00
Daniel Spitzer 6ab580c11b Kalender
* Updates
2024-11-03 18:59:39 +01:00
Daniel Spitzer df9945d946 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!686
2024-11-03 17:39:46 +00:00