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

..

__init__.py

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

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

admin_users.py

fix(auth): activate account on password reset and fix is_active check order

2026-03-08 12:07:25 +00:00

api_tokens.py

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

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

audit_logs.py

fix: resolve merge conflicts with main branch

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

azure.py

style: fix all flake8 linter errors across app/ directory

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

backup.py

feat(backup): extend backup and restore to PostgreSQL and MySQL/MariaDB

2026-03-08 09:56:58 +00:00

billing.py

fix: resolve merge conflicts with main branch

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

classification_rules.py

feat(classify): add rule-based document classification engine, task, and API

2026-03-09 23:38:05 +00:00

common.py

refactor: consolidate get_db into single module

2026-02-09 15:37:23 +00:00

compliance.py

fix: resolve merge conflicts with main branch

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

database.py

fix: address code review feedback

2026-03-05 22:22:49 +00:00

diagnostic.py

feat(api): add GET /api/diagnostic/health endpoint for monitoring

2026-03-01 18:36:38 +00:00

dropbox.py

fix: resolve merge conflicts with main branch

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

duplicates.py

fix: resolve merge conflicts with main branch

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

files.py

fix: resolve merge conflicts with main branch

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

google_drive.py

fix: resolve merge conflicts with main branch

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

graphql_api.py

fix: resolve merge conflicts with main branch

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

i18n.py

fix: resolve merge conflicts with main branch

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

imap_accounts.py

fix: resolve merge conflicts with main branch

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

imap_profiles.py

fix: resolve merge conflicts with main branch

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

integrations.py

fix: resolve merge conflicts with main branch

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

local_auth.py

fix: resolve merge conflicts with main branch

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

logs.py

feat(security): add comprehensive input validation and sanitization (#172)

2026-02-22 16:02:00 +00:00

mobile.py

fix: resolve merge conflicts with main branch

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

notifications.py

fix: resolve merge conflicts with main branch

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

onboarding.py

feat(notifications): admin push notifications and webhooks for user signup, plan changes, and payment issues

2026-03-07 20:15:39 +00:00

onedrive.py

fix: resolve merge conflicts with main branch

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

openai.py

fix(api): swap parameter order in test_ai_extraction to fix 500 error

2026-02-23 21:35:36 +00:00

pipelines.py

feat(classify): add rule-based document classification engine, task, and API

2026-03-09 23:38:05 +00:00

plans.py

fix: resolve merge conflicts with main branch

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

process.py

Apply Black and isort formatting to modified files

2026-02-07 15:00:18 +00:00

profile.py

fix: resolve merge conflicts with main branch

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

qr_auth.py

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

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

queue.py

refactor(queue): address code review feedback — extract constants and sync refresh interval

2026-02-27 00:47:58 +00:00

routing_rules.py

fix: resolve merge conflicts with main branch

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

saved_searches.py

fix(security): address CodeQL clear-text logging and weak hashing alerts

2026-03-08 19:33:55 +00:00

scheduled_jobs.py

fix: code standards audit — 100% coverage, Pydantic v2 model_config, asyncio.run(), targeted edge-case tests

2026-03-09 19:00:13 +00:00

search.py

feat(search): add content-finding filters, saved searches, and text quality to Search view

2026-03-01 13:46:15 +00:00

sessions.py

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

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

settings.py

feat(settings): add dynamic autocomplete for AWS/Azure regions, OCR langs, and embedding models

2026-03-05 22:00:22 +00:00

shared_links.py

fix: resolve merge conflicts with main branch

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

similarity.py

fix(similarity): address code review - column-only queries, configurable batch size, WCAG touch targets

2026-03-02 13:39:10 +00:00

subscriptions.py

feat(subscriptions): add subscription change management with upgrade/downgrade scheduling

2026-03-07 20:14:12 +00:00

system_reset.py

fix: resolve merge conflicts with main branch

2026-03-17 11:09:39 +00:00

translation.py

fix: resolve merge conflicts with main branch

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

url_upload.py

fix: resolve merge conflicts with main branch

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

user.py

fix: resolve merge conflicts with main branch

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

webhooks.py

feat(webhooks): add webhook support for external integrations

2026-03-01 20:42:57 +00:00