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

..

404.html

fix: resolve merge conflicts with main branch

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

500.html

fix: resolve merge conflicts with main branch

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

about.html

fix: resolve merge conflicts with main branch

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

admin_plans.html

fix: resolve merge conflicts with main branch

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

admin_scheduled_jobs.html

feat(tasks): add scheduled batch processing infrastructure (model, migration, tasks, API, view, template)

2026-03-09 18:01:34 +00:00

admin_stripe_wizard.html

fix(billing): address code review - remove duplicate mode logic, accessibility improvements, robust test assertions

2026-03-08 15:18:53 +00:00

admin_users.html

fix: resolve merge conflicts with main branch

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

api_tokens.html

fix: resolve merge conflicts with main branch

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

attribution.html

fix: resolve merge conflicts with main branch

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

audit_log.html

feat(ui): add ARIA attributes for accessibility improvements

2026-02-28 16:04:33 +00:00

audit_logs.html

fix: resolve merge conflicts with main branch

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

backup.html

fix: resolve merge conflicts with main branch

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

base.html

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

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

billing_success.html

fix: resolve merge conflicts with main branch

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

compliance.html

fix: resolve merge conflicts with main branch

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

cookies.html

fix: resolve merge conflicts with main branch

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

credentials.html

fix: resolve merge conflicts with main branch

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

db_wizard.html

docs(database): update configuration guides with wizard cross-references, clean up review feedback

2026-03-06 10:13:40 +00:00

devices.html

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

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

dropbox_callback_error.html

chore: apply ruff formatting and fix whitespace issues

2026-02-13 09:12:11 +00:00

dropbox_callback.html

fix: 100% coverage, WCAG accessibility fixes, and documentation updates for per-user OAuth wizards

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

dropbox.html

fix: 100% coverage, WCAG accessibility fixes, and documentation updates for per-user OAuth wizards

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

duplicates.html

fix: resolve merge conflicts with main branch

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

file_detail.html

fix: resolve merge conflicts with main branch

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

file_view.html

fix: resolve merge conflicts with main branch

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

filemanager.html

fix: resolve merge conflicts with main branch

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

files.html

fix: resolve merge conflicts with main branch

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

forgot_password.html

chore: update plan to include forgot-username and login label clarification

2026-03-08 09:44:59 +00:00

forgot_username.html

feat(auth): password reset, forgot username, and admin user management for local accounts

2026-03-08 10:06:08 +00:00

google_drive_callback_error.html

chore: apply ruff formatting and fix whitespace issues

2026-02-13 09:12:11 +00:00

google_drive_callback.html

fix: 100% coverage, WCAG accessibility fixes, and documentation updates for per-user OAuth wizards

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

google_drive.html

fix(templates): remove orphan </div> in google_drive.html causing HTML accessibility lint failure

2026-03-09 21:46:38 +00:00

help.html

fix: resolve merge conflicts with main branch

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

imap_accounts.html

fix: resolve merge conflicts with main branch

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

imprint.html

fix: resolve merge conflicts with main branch

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

index.html

fix: resolve merge conflicts with main branch

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

integrations_dashboard.html

fix: resolve merge conflicts with main branch

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

license.html

fix: resolve merge conflicts with main branch

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

login.html

fix: resolve merge conflicts with main branch

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

notifications_dashboard.html

feat(notifications): add per-user notification system with inbox, email, and webhook targets

2026-03-08 21:34:25 +00:00

onboarding.html

feat: add multi-step user onboarding wizard

2026-03-07 11:12:21 +00:00

onedrive_callback_error.html

chore: apply ruff formatting and fix whitespace issues

2026-02-13 09:12:11 +00:00

onedrive_callback.html

fix: 100% coverage, WCAG accessibility fixes, and documentation updates for per-user OAuth wizards

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

onedrive.html

fix: 100% coverage, WCAG accessibility fixes, and documentation updates for per-user OAuth wizards

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

password_reset_form.html

feat(auth): add local user signup, email verification, and Stripe billing

2026-03-07 13:15:15 +00:00

pipelines.html

fix: resolve merge conflicts with main branch

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

pricing.html

fix(ui): make pricing page CTAs link to /signup when local signup is enabled

2026-03-07 21:18:17 +00:00

privacy.html

fix: resolve merge conflicts with main branch

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

profile.html

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

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

qr_login.html

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

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

queue_dashboard.html

fix: resolve merge conflicts with main branch

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

search.html

fix: resolve merge conflicts with main branch

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

settings.html

fix: resolve merge conflicts with main branch

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

setup_wizard.html

feat: update all OpenAI/ChatGPT refs + settings dropdown for fixed-value fields

2026-02-23 20:06:57 +00:00

shared_link_view.html

fix(sharing): address security review findings

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

shared_links.html

fix: resolve merge conflicts with main branch

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

signup.html

feat(auth): enable local user signup without SMTP, add admin user creation

2026-03-07 19:59:10 +00:00

similarity_dashboard.html

fix: resolve merge conflicts with main branch

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

status_dashboard.html

fix: resolve merge conflicts with main branch

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

subscription.html

fix: resolve merge conflicts with main branch

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

system_reset.html

fix: resolve merge conflicts with main branch

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

terms.html

fix: resolve merge conflicts with main branch

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

upload.html

fix: resolve merge conflicts with main branch

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

verify_email_sent.html

fix: resolve merge conflicts with main branch

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

version.html

feat: add license page and version display in templates, update LICENSE file, and enhance footer with license information

2025-04-03 22:12:12 +02:00