Commit Graph

2448 Commits

Author SHA1 Message Date
Luca Haid
899e5c88ff Merge branch 'feature/shipping-note-refinements' into 'master'
Feature/shipping note refinements

See merge request fronk/thetool!727
2024-11-13 12:28:46 +00:00
Luca Haid
c3bf25f668 Feature/shipping note refinements 2024-11-13 12:28:45 +00:00
Luca Haid
4ea9a5aea0 Merge branch 'feature/shipping-note-refinements' into 'master'
Feature/shipping note refinements

See merge request fronk/thetool!726
2024-11-13 12:18:21 +00:00
Luca Haid
41a9b0bbd9 Feature/shipping note refinements 2024-11-13 12:18:20 +00:00
Frank Schubert
54b6d18fe7 Merge branch 'fronkdev' into 'master'
Removed debugging

See merge request fronk/thetool!725
2024-11-13 12:09:40 +00:00
Frank Schubert
97dc4446dc Removed debugging 2024-11-13 13:09:12 +01:00
Frank Schubert
97cb964353 Merge branch 'fronkdev' into 'master'
Added Maintenace date to MaintenanceNotification Index

See merge request fronk/thetool!724
2024-11-12 17:46:23 +00:00
Frank Schubert
b43cda8c3d Added Maintenace date to MaintenanceNotification Index 2024-11-12 18:45:52 +01:00
Frank Schubert
5ef2737612 Merge branch 'fronkdev' into 'master'
Fixed subject in MaintenanceNotification Index

See merge request fronk/thetool!723
2024-11-12 17:42:26 +00:00
Frank Schubert
b80b480fba Fixed subject in MaintenanceNotification Index 2024-11-12 18:41:52 +01: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
be089593ea Merge branch 'feature/update-shipping-note' into 'master'
Updated WarehouseShippingNote

See merge request fronk/thetool!721
2024-11-12 17:29:35 +00:00
Luca Haid
c03876ffa6 Updated WarehouseShippingNote 2024-11-12 18:29:10 +01:00
Luca Haid
154968d1cf Merge branch 'feature/update-shipping-note' into 'master'
Updated WarehouseShippingNote

See merge request fronk/thetool!720
2024-11-12 17:27:20 +00:00
Luca Haid
560563aaa4 Updated WarehouseShippingNote 2024-11-12 18:27:03 +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
Luca Haid
d8ea1bb7f5 Merge branch 'hotfix/warehouse-eshop-gls-mail-parser' into 'master'
fixed email fetching utf8

See merge request fronk/thetool!718
2024-11-12 13:14:35 +00:00
Luca Haid
50228c36e4 fixed email fetching utf8 2024-11-12 14:14:15 +01:00
Luca Haid
85f8bfb57a Merge branch 'hotfix/warehouse-eshop-gls-mail-parser' into 'master'
fixed email fetching utf8

See merge request fronk/thetool!717
2024-11-12 13:09:47 +00:00
Luca Haid
24676a67a0 fixed email fetching utf8 2024-11-12 14:09:02 +01:00
Frank Schubert
4c5feb00b7 Merge branch 'fronkdev' into 'master'
Changed Preordercampaign/Index table cols

See merge request fronk/thetool!716
2024-11-12 12:41:13 +00:00
Frank Schubert
3a39731ffd Changed Preordercampaign/Index table cols 2024-11-12 13:40:38 +01:00
Luca Haid
b7ebc3cd30 Update 20241106120000_add_historic_bill.php 2024-11-12 12:37:31 +00:00
Luca Haid
b3bfc3edfc Merge branch 'hotfix/warehouse-eshop-gls-mail-parser' into 'master'
fixed for loop

See merge request fronk/thetool!715
2024-11-12 12:36:23 +00:00
Frank Schubert
cfeeb85878 Merge branch 'fronkdev' into 'master'
Fixed Migration for HistoricBill

See merge request fronk/thetool!714
2024-11-12 12:35:15 +00:00
Luca Haid
acf7dc151e fixed for loop 2024-11-12 13:34:31 +01:00
Frank Schubert
d223a4a9eb Fixed Migration for HistoricBill 2024-11-12 13:34:30 +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
Frank Schubert
dc80de5184 Merge branch 'fronkdev2' into 'master'
Added buildingType in ADB hausnummer and rimo import

See merge request fronk/thetool!711
2024-11-11 17:37:29 +00:00
Frank Schubert
632160dce9 Added buildingType in ADB hausnummer and rimo import 2024-11-11 18:36:45 +01:00
Daniel Spitzer
830beac84f Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!710
2024-11-11 10:45:21 +00:00
Daniel Spitzer
857403bbc2 Kalender
* Update (Geburtstage von Austritten werden nun nicht mehr angezeigt)
2024-11-11 11:44:54 +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
986168e1d3 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!706
2024-11-10 20:49:29 +00:00
Daniel Spitzer
9633d7e4ec Kalender ADDRESS MODEL
* Update des Address Models Hab einen Searchkey hinzugefügt
2024-11-10 21:47:44 +01:00
Daniel Spitzer
73b8ed545c Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!705
2024-11-10 20:38:53 +00:00
Daniel Spitzer
612a7fbb67 Kalender
* Generelle Updates
2024-11-10 21:38:46 +01:00
Daniel Spitzer
0e81ecdc88 Kalender
* Generelle Updates
2024-11-10 21:29:57 +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