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

..

api

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

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

middleware

feat(api): add personal API tokens and enhance webhook integration UI

2026-03-08 18:42:55 +00:00

tasks

refactor: address code review feedback - simplify dispatch, add warning log

2026-03-16 22:36:24 +00:00

templates/email

fix(merge): resolve tests/test_auth.py conflict keeping all tests from both branches

2026-03-08 11:11:21 +00:00

utils

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

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

views

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

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

__init__.py

feat: add frontend views and file management functionality, enhance user response structure, and update configuration guide

2025-04-03 21:49:15 +02:00

auth.py

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

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

celery_app.py

fix: resolve merge conflicts with main branch

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

celery_worker.py

fix: resolve merge conflicts with main branch

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

cli.py

feat(cli): add docuelevate CLI tool for power users

2026-03-08 21:50:18 +00:00

config.py

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

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

database.py

fix: resolve merge conflicts with main branch

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

frontend.py

style: fix all flake8 linter errors across app/ directory

2026-02-08 17:42:33 +00:00

main.py

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

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

models.py

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

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