gitea-admin/gh-christianlouis-docuelevate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,833 Commits 28 Branches 0 Tags
a08b103271a7a6001c36b87008bef82c270f2fa2
Commit Graph

6 Commits

Author SHA1 Message Date
copilot-swe-agent[bot] 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
copilot-swe-agent[bot] 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] e6a4995a5c style: run ruff format on 6 files to fix formatting issues 
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
 2026-02-13 22:39:34 +00:00
copilot-swe-agent[bot] 510b10c010 fix: resolve ruff linting errors in test file 
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
 2026-02-13 22:20:10 +00:00
copilot-swe-agent[bot] 0cf4bb6448 test: fix docstring line references per code review 
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
 2026-02-13 22:12:06 +00:00
copilot-swe-agent[bot] c007ebc7e9 test: add comprehensive coverage tests for S3, SFTP uploads, notifications, and send_to_all 
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
 2026-02-13 22:11:00 +00:00