FF-Admin/ff-admin

Fork 0

milestone/ff-admin-unit #164

Merged

jkeffects merged 13 commits from milestone/ff-admin-unit into develop

2025-12-29 14:18:01 +00:00

jkeffects commented

2025-12-28 18:06:40 +00:00

Owner

Merge branch 'develop' into milestone/ff-admin-unit
Merge pull request 'unit/#143-consumables' (#162) from unit/#143-consumables into milestone/ff-admin-unit
Merge branch 'milestone/ff-admin-unit' into unit/#143-consumables
consumable management
consumableType
adapt models
base routing structure
rename new field to FIN
extend: add standard to maintenance and inspection plan
enhance: UI routing and interlinks in unit section
extend: add licenseplate and identNumber to vehicle
extend: connect equipment and vehicle with member
Merge branch 'develop' into milestone/ff-admin-unit

Merge branch 'develop' into milestone/ff-admin-unit Merge pull request 'unit/#143-consumables' (#162) from unit/#143-consumables into milestone/ff-admin-unit Merge branch 'milestone/ff-admin-unit' into unit/#143-consumables consumable management consumableType adapt models base routing structure rename new field to FIN extend: add standard to maintenance and inspection plan enhance: UI routing and interlinks in unit section extend: add licenseplate and identNumber to vehicle extend: connect equipment and vehicle with member Merge branch 'develop' into milestone/ff-admin-unit

jkeffects self-assigned this

2025-12-28 18:06:41 +00:00

jkeffects added 13 commits

2025-12-28 18:06:41 +00:00

Merge branch 'develop' into milestone/ff-admin-unit 2fc9ac2efb

extend: connect equipment and vehicle with member 7b0a3be844

extend: add licenseplate and identNumber to vehicle 98e7ed039a

enhance: UI routing and interlinks in unit section 88e418bcdd

extend: add standard to maintenance and inspection plan 279c5b342f

rename new field to FIN 3706b030b8

base routing structure 539e8586a3

adapt models e6e1382d1e

consumableType 2eb6edc906

consumable management 08131cec2b

Merge branch 'milestone/ff-admin-unit' into unit/#143-consumables d636e75c45

Merge pull request 'unit/#143-consumables' (#162 ) from unit/#143-consumables into milestone/ff-admin-unit e4c9de1265

Reviewed-on: #162

Merge branch 'develop' into milestone/ff-admin-unit 94c2c16b70

# Conflicts:
#	src/views/admin/unit/equipment/UpdateEquipment.vue
#	src/views/admin/unit/vehicle/UpdateVehicle.vue

jkeffects merged commit 66bfe5caba into develop

2025-12-29 14:18:01 +00:00

jkeffects referenced this pull request from a commit

2025-12-29 14:18:01 +00:00

Merge pull request 'milestone/ff-admin-unit' (#164) from milestone/ff-admin-unit into develop

jkeffects referenced this pull request

2026-01-05 14:54:03 +00:00

minor v1.12.0 #166

No reviewers

No labels

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

FF-Admin/ff-admin!164

No description provided.

Rows
Columns