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

186 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] 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
copilot-swe-agent[bot] 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
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
github-actions[bot] e709f2646c chore(release): update build metadata files [skip ci] 2026-03-09 23:01:00 +00:00
github-actions[bot] 5d5784f069 chore(release): update build metadata files [skip ci] 2026-03-09 21:30:44 +00:00
github-actions[bot] 04d51bab22 chore(release): update build metadata files [skip ci] 2026-03-09 12:01:14 +00:00
github-actions[bot] 5f548e29fa chore(release): update build metadata files [skip ci] 2026-03-09 01:47:12 +00:00
github-actions[bot] e4157e3373 chore(release): update build metadata files [skip ci] 2026-03-09 00:06:00 +00:00
github-actions[bot] 39150cb9ab chore(release): update build metadata files [skip ci] 2026-03-08 23:46:58 +00:00
github-actions[bot] a171186f93 chore(release): update build metadata files [skip ci] 2026-03-08 22:13:18 +00:00
github-actions[bot] 84e8ea2fb2 chore(release): update build metadata files [skip ci] 2026-03-08 22:12:01 +00:00
github-actions[bot] 2e241dd5f3 chore(release): update build metadata files [skip ci] 2026-03-08 22:11:10 +00:00
github-actions[bot] 5144f03dc8 chore(release): update build metadata files [skip ci] 2026-03-08 22:10:46 +00:00
github-actions[bot] 069433ccbc chore(release): update build metadata files [skip ci] 2026-03-08 21:24:32 +00:00
github-actions[bot] 95fc54a16d chore(release): update build metadata files [skip ci] 2026-03-08 21:07:08 +00:00
github-actions[bot] bab5967d88 chore(release): update build metadata files [skip ci] 2026-03-08 20:42:51 +00:00
github-actions[bot] 222f3cf4e7 chore(release): update build metadata files [skip ci] 2026-03-08 19:23:38 +00:00
github-actions[bot] 4cbda5c228 chore(release): update build metadata files [skip ci] 2026-03-08 18:59:34 +00:00
github-actions[bot] 107ac9f4e9 chore(release): update build metadata files [skip ci] 2026-03-08 18:08:32 +00:00
github-actions[bot] 13d2230089 chore(release): update build metadata files [skip ci] 2026-03-08 17:58:24 +00:00
github-actions[bot] c2c7a73dee chore(release): update build metadata files [skip ci] 2026-03-08 17:12:24 +00:00
github-actions[bot] b2196a47be chore(release): update build metadata files [skip ci] 2026-03-08 17:11:35 +00:00
github-actions[bot] 98ae72aef2 chore(release): update build metadata files [skip ci] 2026-03-08 15:14:50 +00:00
github-actions[bot] 68c100fc7e chore(release): update build metadata files [skip ci] 2026-03-08 15:13:54 +00:00
github-actions[bot] 211d479eb9 chore(release): update build metadata files [skip ci] 2026-03-08 14:45:47 +00:00
github-actions[bot] 555b0a6627 chore(release): update build metadata files [skip ci] 2026-03-08 12:59:58 +00:00
github-actions[bot] 16b2ad3b24 chore(release): update build metadata files [skip ci] 2026-03-08 12:15:37 +00:00
github-actions[bot] 21ac4f3308 chore(release): update build metadata files [skip ci] 2026-03-08 11:51:31 +00:00
github-actions[bot] 1db1803e97 chore(release): update build metadata files [skip ci] 2026-03-08 11:32:59 +00:00
github-actions[bot] f03227c248 chore(release): update build metadata files [skip ci] 2026-03-08 11:14:26 +00:00
github-actions[bot] d5af0903e2 chore(release): update build metadata files [skip ci] 2026-03-08 11:02:39 +00:00
github-actions[bot] 97616beb11 chore(release): update build metadata files [skip ci] 2026-03-08 10:58:59 +00:00
github-actions[bot] 42dc335747 chore(release): update build metadata files [skip ci] 2026-03-08 10:58:35 +00:00
github-actions[bot] 70e188125b chore(release): update build metadata files [skip ci] 2026-03-08 10:53:13 +00:00
github-actions[bot] 0b28e33fae chore(release): update build metadata files [skip ci] 2026-03-08 09:05:43 +00:00
github-actions[bot] c69dc1b8c1 chore(release): update build metadata files [skip ci] 2026-03-08 09:05:01 +00:00
github-actions[bot] 0854e901ac chore(release): update build metadata files [skip ci] 2026-03-08 09:04:40 +00:00
github-actions[bot] 0942609d03 chore(release): update build metadata files [skip ci] 2026-03-08 08:08:54 +00:00
github-actions[bot] de8a1e18e8 chore(release): update build metadata files [skip ci] 2026-03-07 21:03:20 +00:00
github-actions[bot] d256e66574 chore(release): update build metadata files [skip ci] 2026-03-07 20:58:38 +00:00
github-actions[bot] 3a1ecaf63a chore(release): update build metadata files [skip ci] 2026-03-07 20:45:44 +00:00
github-actions[bot] 5a9d2e7ad6 chore(release): update build metadata files [skip ci] 2026-03-07 20:45:01 +00:00
github-actions[bot] 79e76522e3 chore(release): update build metadata files [skip ci] 2026-03-07 20:38:51 +00:00
github-actions[bot] b30bbaea99 chore(release): update build metadata files [skip ci] 2026-03-07 17:42:00 +00:00
github-actions[bot] 81c905a8bb chore(release): update build metadata files [skip ci] 2026-03-07 17:34:52 +00:00
github-actions[bot] ba95ddb930 chore(release): update build metadata files [skip ci] 2026-03-07 14:39:14 +00:00
github-actions[bot] 7bc8bb428e chore(release): update build metadata files [skip ci] 2026-03-07 09:59:23 +00:00
github-actions[bot] 0c3b8d0556 chore(release): update build metadata files [skip ci] 2026-03-06 15:28:57 +00:00
github-actions[bot] 2c02d33a28 chore(release): update build metadata files [skip ci] 2026-03-06 11:21:10 +00:00