a08b103271
fix: merge main into feature branch - resolve all merge conflicts cleanly
...
Merges origin/main (v0.156.0) into the classification feature branch,
properly resolving all 23 merge conflicts:
- Auto-generated files (BUILD_DATE, VERSION, etc.): accept main's version
- Non-classification files (SharePoint, QR auth, session mgmt, mobile): accept main's version
- Classification files (api/__init__.py, models.py, migrations/env.py, conftest.py):
keep classification additions alongside main's content
Previously the branch was incorrectly removing files from main (SharePoint
integration, QR scanner, session management). This merge properly preserves
all main branch content while maintaining the classification feature additions.
Migration chain validated: 038_add_classification_rules chains from
037_add_user_sessions_and_qr_challenges.
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com >
2026-03-17 16:14:45 +00:00
7e1ed14ee6
fix: address code review feedback - remove extra blank lines from merge
...
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com >
2026-03-17 11:12:21 +00:00
c7d67031d4
fix: resolve merge conflicts with main branch
...
Merge origin/main into feature branch, resolving 18 conflicts:
- app/api/__init__.py: add classification_rules_router alongside system_reset_router
- app/config.py: keep system reset settings from main
- app/models.py: keep ClassificationRuleModel alongside main's models
- app/utils/settings_service.py: keep factory reset settings from main
- app/views/__init__.py: keep system_reset_router from main
- tests/conftest.py: add ClassificationRuleModel import
- migrations/env.py: add ClassificationRuleModel import
- .env.demo, docs/*, frontend/*, mobile/*: keep additions from main
- BUILD_DATE, GIT_SHA, RUNTIME_INFO, VERSION, CHANGELOG.md: accept main's version
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com >
2026-03-17 11:09:39 +00:00
651b48658c
fix: resolve merge conflicts with main branch
...
Merge origin/main into feature branch, resolving 3 conflicts:
- app/api/__init__.py: add classification_rules_router alongside new
routers from main (audit_logs, i18n, mobile, compliance, translation)
- app/models.py: keep ClassificationRuleModel alongside new models from
main (MobileDevice, ComplianceTemplate, PipelineRoutingRule)
- tests/conftest.py: import both ClassificationRuleModel and new models
from main (AuditLog, ComplianceTemplate)
Also renumber migration from 027 to 037 to chain from the latest
migration on main (036_add_document_translation_fields).
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com >
2026-03-16 22:33:59 +00:00
copilot-swe-agent[bot]