minor v1.12.0 #166

Merged

jkeffects merged 41 commits from develop into main 2026-01-05 15:49:21 +00:00

Conversation 0 Commits 41 Files changed 213 +6478 -1583

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

Owner

Copy link

enhance: instant permssion change on info
Merge pull request 'feature/#61-notifications' (#165) from feature/#61-notifications into develop
enhance: Use Custom SimpleDate for Interval calc
extend: add ability addValue
update socket manager behaviour
Merge branch 'develop' into feature/#61-notifications
Merge pull request 'milestone/ff-admin-unit' (#164) from milestone/ff-admin-unit into develop
Merge pull request 'unify-module-appearance-cross-app' (#163) from unify-module-appearance-cross-app into develop
Merge pull request 'unit/#143-consumables' (#162) from unit/#143-consumables into milestone/ff-admin-unit
fix: UI success or fail scaling for config
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
change: undo uncomment

enhance: instant permssion change on info Merge pull request 'feature/#61-notifications' (#165) from feature/#61-notifications into develop enhance: Use Custom SimpleDate for Interval calc extend: add ability addValue update socket manager behaviour Merge branch 'develop' into feature/#61-notifications Merge pull request 'milestone/ff-admin-unit' (#164) from milestone/ff-admin-unit into develop Merge pull request 'unify-module-appearance-cross-app' (#163) from unify-module-appearance-cross-app into develop Merge pull request 'unit/#143-consumables' (#162) from unit/#143-consumables into milestone/ff-admin-unit fix: UI success or fail scaling for config 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 change: undo uncomment

jkeffects self-assigned this 2026-01-05 14:54:03 +00:00

jkeffects added 39 commits 2026-01-05 14:54:03 +00:00

change: undo uncomment ... b2001ad50a

has no effect

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

fix: UI success or fail scaling for config 1698b63c49

rename new field to FIN 3706b030b8

rename slide in notifications to toast bec44d495d

base UI for notification and setting display 481951d6c5

animate icon on new notification 05f3e24010

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

unify config modules 91ff482e54

unify management modules c2b04150fa

change loading of newsletter config data 7d3105f1c8

Merge pull request 'unify-module-appearance-cross-app' (#163) from unify-module-appearance-cross-app into develop ... 8f6d8f7e24

Reviewed-on: #163

api path update user to account 55741fde05

remove obsolete console log 4e76c9df77

base notification fetch c59654a4d0

Merge branch 'develop' into feature/#61-notifications ... 99c8bbc0a1

# Conflicts:
#	src/views/account/Administration.vue

notification interaction c12ba53757

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

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

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

Reviewed-on: #164

Merge branch 'develop' into feature/#61-notifications 9881f0b5fe

update socket manager behaviour 9e9a09e48e

extend: add ability addValue ca28ab1f36

notification setting operations 360bb29047

notification receive & app session 93192aab96

enhance: Use Custom SimpleDate for Interval calc f2b8afc0f2

update UI and helper 1514606f81

update interval helper to match server 0eb88d9c5d

fix set browser type error 01206150da

Merge pull request 'feature/#61-notifications' (#165) from feature/#61-notifications into develop ... 5e6e0a74c5

Reviewed-on: #165

enhance: instant permssion change on info 695fb23c4f

jkeffects added 1 commit 2026-01-05 15:48:24 +00:00

fix: reload newsletter config on change 3c4420c8ce

jkeffects changed title from WIP: minor v1.12.0 to minor v1.12.0 2026-01-05 15:48:27 +00:00

jkeffects added 1 commit 2026-01-05 15:48:31 +00:00

Merge branch 'main' into develop be973c132d

jkeffects merged commit eef2ef4a78 into main 2026-01-05 15:49:21 +00:00

jkeffects referenced this pull request from a commit 2026-01-05 15:49:23 +00:00

Merge pull request 'minor v1.12.0' (#166) from develop into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

  

feature

  

feature

backlog

  

feature

optional

No labels

bug

feature

feature

backlog

feature

optional

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

jkeffects

1 participant

Notifications

Subscribe

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!166

No description provided.