# Conflicts:
#	package-lock.json
#	package.json
#	src/router/club/newsletterGuard.ts
#	src/router/club/protocolGuard.ts
#	src/router/index.ts
#	src/types/permissionTypes.ts
#	src/views/admin/club/newsletter/NewsletterRecipients.vue

correct type errors d5c33d899f

change models 05555425ce

update inspection schema 8766bbce08

vehicle update and code 0ea9601ea3

damage report and inspections a49babe48d

change of models ee700d9e02

inspection create b359044cb5

inspection plan execute 70e9b47483

vehicle update screen 9ee1cca46d

order of permission and sidebar dd93f7a7b8

Merge branch 'develop' into milestone/ff-admin-unit b6e80b358a

# Conflicts:
#	src/stores/admin/navigation.ts

Merge branch 'milestone/ff-admin-unit' into unit/#70-build-ui-demo 43f46c0fad

add additional fields b83b22d806

adapt unified design in template def32b786c

respiratory create forms d70edd0086

adapt models to backend changes 9b2ab1923e

type safetiy 30baca2567

adapt viewmodel changes 98fd7b64d2

Merge pull request 'unit/#70-build-ui-demo' (#102 ) from unit/#70-build-ui-demo into milestone/ff-admin-unit ab3083c18d

Reviewed-on: #102

update models to backend changes bd1fdaa234

change icon sizing b280654f92

update imports 6c8d57a7e5

connect to backend ddeac1aa26

Merge branch 'develop' into milestone/ff-admin-unit b7f22357ec

# Conflicts:
#	package-lock.json
#	package.json
#	src/views/admin/club/newsletter/NewsletterRecipients.vue

Merge branch 'milestone/ff-admin-unit' into unit/#103-base-management 50fa0128ea

maintainance view and wearable inspection integration 6575948841

search z-index fe0f31ce6b

search select component improvements e7078960ba

inspection Point base form eb4d338583

save inspectionPoints 23bdde5fc2

fill out inspection and inspection plan 1409cf8045

next and running inspections 74b05ee97f

show instances to type adfe64d1f2

correct type inspectionPlans request d96c73d5b1

inspection finish and print 5d26885da3

enable viewing of uploaded files to inspection points 98bf4532aa

refactor 6c8c0939b4

Merge pull request 'unit/#103-base-management' (#110 ) from unit/#103-base-management into milestone/ff-admin-unit 6fa1c67574

Reviewed-on: #110

Merge branch 'develop' into milestone/ff-admin-unit a6892bac85

# Conflicts:
#	package-lock.json
#	package.json

add socketio to app 9ef76a7c26

remodel scan process and visualize external ed947e5777

admin side scan connection 3e47d3ebf6

send external scans to app 304ae1147e

Merge pull request 'unit/#95-use-smartphone-as-barcode-scanner' (#111 ) from unit/#95-use-smartphone-as-barcode-scanner into milestone/ff-admin-unit 3ec74e751a

Reviewed-on: #111

enhance send result button 766114bf53

enable public report 6aae09cd03

show reports inside admin ui 93a04abee1

show details to damage 5ea5a0160a

Enable Edit and View of Reports 31b7ec9c3e

better readable date format c29da7ca1d

Merge pull request 'unit/#99-damage-reports' (#113 ) from unit/#99-damage-reports into milestone/ff-admin-unit c5687729a9

Reviewed-on: #113

Merge branch 'develop' into milestone/ff-admin-unit b9b0381356

base views and store b56347c172

extend report by title b5a3ff4dc6

repair create and view c79d5bb1cd

edit repairs 789272dc37

Merge pull request 'unit/#116-repairs' (#119 ) from unit/#116-repairs into milestone/ff-admin-unit 6c1140f7d2

Reviewed-on: #119

update permissions 8c4a53bc17

update components 4da2e9c792

Merge branch 'develop' into milestone/ff-admin-unit fed08e0232

# Conflicts:
#	src/components/Modal.vue
#	src/components/TextCopy.vue

Merge branch 'develop' into milestone/ff-admin-unit 0b16599d2a

# Conflicts:
#	package-lock.json
#	package.json

adapt to schema update 91ad11e20c

extend inspection_plan by wearable and enable optional interval 583233b95e

improve UI loading vis 8e64b549d7

optimize UI 2c541eb5aa

hide maintenance

remove faulty imports 9b29cd7ba3

1.8.0-beta1 1570c174cc

enhance: socketio sharing /api route 0c5018147e

fix: send repair title to backend 7d08f3c9a8

enhance: show count of used instances 0af32e72ed

fix: camera scaling on scan bd4b08a67d

enhance: optional inspection points 6900fbed0b

enhance: show yet not existing inspections 86b3f6fbe3

Merge branch 'develop' into milestone/ff-admin-unit 5bea979b56

# Conflicts:
#	package-lock.json
#	package.json

enhance: send file only if changed bc990d01da

enhance: add image to equipment b726591ac3

enhance: add image to vehicle and wearable 0536071621

1.8.0-beta2 0d4fb9ac35

add base models 3072574886

fix: permissions assigned in unit b458a83a7e

Merge branch 'milestone/ff-admin-unit' into unit/#112-maintenance 342cdd7b83

maintenance base structure according to inspections 3434eb6bda

has type errors

1.8.0-beta3 c66a34baa1

extend: object list items 7e97fb70b0

fix: set and reset weareable wearer e2b6c5e3e3

change: enable deletion of objects a038da0b78

change: show assigned objects to type ff468085fe

1.8.0-beta4 6f21dbda91

fix: overflow of paginated lists 52b22fedca

change: enable type change if nothing related exists ec34c78bf9

enhance: scanner and interaction 75c8306dd2

Merge branch 'develop' into milestone/ff-admin-unit b7d06320fc

# Conflicts:
#	package-lock.json
#	package.json
#	src/serverCom.ts

1.8.0-beta5 6a7b27fa6b

fix: empty fields in vehicle update form 8860118c06

fix: UI of inspections 67ab56ef2f

enhance: extend objects by description field f5224c9582

enhance: link to damage report from admin d0e5da5a6e

1.8.0-beta6 6f4fa689c0

fix: back nav to list from deep routed 5b31e9ae9f

Merge branch 'milestone/ff-admin-unit' into unit/#112-maintenance 08556935ce

fix errors 2cef49af64

change folder structure 5fc9bca0c2

enhance: show description in list 13ff9990d0

create maintenance with plan 1ee9fa2911

enable maintenance in equipment, vehicle and wearable c40f218727

Merge pull request 'unit/#112-maintenance' (#124 ) from unit/#112-maintenance into milestone/ff-admin-unit 747282475f

Reviewed-on: #124

enhance: search for all objects 27e5517039

1.8.0-beta7 e96a9ff04e

fix: pagination fetch of not existing inspections and maintenances c167e740f0

extend: enable update of inspection and maintenance 362d4cadac

enhance: image zoom on click d4155fa328

enhance: enable image zoom for damage reports ca8d3c720f

Merge branch 'develop' into milestone/ff-admin-unit 0cb923e9ed

# Conflicts:
#	package-lock.json
#	package.json
#	src/serverCom.ts

1.8.0-beta8 6b69b1b35e

fix: wording 45014a7b86

fix: sorting of inspectionpoints 815be2d48f

change: consistent formatting in inspections and maintenances c39261a07e

fix: missing store reset on loading/leaving objects 2b50b36c37

extend: add description to inspection plan fa9db31827

Merge branch 'develop' into milestone/ff-admin-unit 65dcd08b2f

# Conflicts:
#	package-lock.json
#	package.json

extend: show status history to reports and repairs acec282388

fix: ts type corrections after package updates 2eb562f6ea

enhance: select last used camera on scan 791a38c820

1.8.0-beta9 c3c368f55c

Merge branch 'develop' into milestone/ff-admin-unit aba8dc79a4

# Conflicts:
#	package-lock.json
#	package.json

extend: enable deletion of inspections and maintenance plans b617c95bc5

1.8.0-beta10 cba0c3e702

enhance: enable linking to object of unassigned report aff37ae6c1

fix: enable report link inside setup eb8018ea3b

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

Reviewed-on: #129

fix: auth guard admin links missed marking active fec9ee6871

jkeffects changed title from ~~minor v1.7.0~~ to minor v1.8.0

2025-09-11 08:41:54 +00:00

jkeffects added 1 commit

2025-09-11 08:43:07 +00:00

Merge branch 'main' into develop 11249f7c08

# Conflicts:
#	package-lock.json
#	package.json

jkeffects added 1 commit

2025-09-11 08:45:06 +00:00

package update eec89109d7

jkeffects merged commit 3d18e408cf into main

2025-09-11 08:48:12 +00:00

jkeffects referenced this pull request from a commit

2025-09-11 08:48:12 +00:00

Merge pull request 'minor v1.8.0' (#130) from develop into main

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: Ehrenamt/ff-admin#130

No description provided.

Rows
Columns