copilot-swe-agent[bot] 342e2d1614 fix: merge main into feature branch - resolve all 18 conflicts cleanly ...

Merges origin/main (v0.155.0) into the classification feature branch,
resolving all 18 conflicted files by accepting main's version and
re-applying only classification-specific additions:

- Renumber migration from 037 to 038 (chains from 037_user_sessions)
- Re-add ClassificationRuleModel to models.py, env.py, conftest.py
- Re-add classification_rules_router to api/__init__.py
- All session management, QR auth, and devices code preserved from main

Migration chain validated. 62 classification tests pass.

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>

2026-03-17 13:22:28 +00:00

..

af.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

am.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ar.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

az.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

bg.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

bn.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ca.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

cs.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

cy.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

da.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

de.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

dk.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

el.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

en.json

fix: merge main into feature branch - resolve all 18 conflicts cleanly

2026-03-17 13:22:28 +00:00

eo.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

es.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

et.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

fa.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

fi.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

fr.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

fy.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ga.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

gl.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

gu.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ha.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

he.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

hi.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

hr.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

hu.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

hy.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

id.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ig.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

is.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

it.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ja.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

jv.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ka.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

kk.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

km.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

kn.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ko.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

lb.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

li.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

lt.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

lv.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ml.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

mn.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

mr.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ms.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

nb.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

nds.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ne.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

nl.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

no.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

pa.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

pl.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

pt-br.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

pt.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ro.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

si.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

sk.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

sl.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

sr.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

sv.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

sw.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ta.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

te.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

th.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

tl.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

tr.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

translation_state.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

uk.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

ur.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

uz.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

vi.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

vls.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

yo.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

zh-TW.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

zh.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00

zu.json

fix: resolve merge conflicts with main branch

2026-03-16 22:33:59 +00:00