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

143 Commits

Author SHA1 Message Date
copilot-swe-agent[bot] e518bce922 fix: merge main branch and renumber migration 037→040 
Resolve all merge conflicts between our automation feature branch and
current main (v0.163.0, 920 commits ahead).

Conflicts resolved:
- app/api/__init__.py: add automation_router alongside main's new routers
  (classification_rules, qr_auth, sessions, system_reset)
- app/config.py: add main's new settings (dropbox_use_global_credentials,
  factory_reset_on_startup, enable_factory_reset)
- app/models.py: add main's new models (ClassificationRuleModel, UserSession,
  QRLoginChallenge, SharePoint integration type)
- app/utils/settings_service.py: merge automation_hooks_enabled with main's
  new metadata entries
- docs/API.md: merge automation API docs with main's classification rules docs
- docs/ConfigurationGuide.md: add factory reset settings
- tests/conftest.py: import both AutomationHook and new main models

Migration renumbered:
- 037_add_automation_hooks → 040_add_automation_hooks
- down_revision: 039_add_classification_rules (was 036_add_document_translation_fields)
- Chain: 036 → 037 → 038 → 039 → 040 (automation hooks)

For all non-automation files with conflicts, main's version was taken since
our branch did not modify those files (conflicts were from a stale prior merge).

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
Agent-Logs-Url: https://github.com/christianlouis/DocuElevate/sessions/cb62f012-3b69-4415-835e-3857ce3e9f45
 2026-03-20 23:54:04 +00:00
copilot-swe-agent[bot] 204000aabc fix: merge main branch and renumber migration 027→037 
Resolve 3 merge conflicts and renumber the automation_hooks migration
to follow main's migration chain (036_add_document_translation_fields).

Conflicts resolved:
- app/api/__init__.py: add automation_router alongside main's new routers
- app/utils/settings_service.py: add automation_hooks_enabled alongside compliance_enabled
- tests/conftest.py: add AutomationHook alongside AuditLog/ComplianceTemplate imports

Migration renumbered:
- 027_add_automation_hooks → 037_add_automation_hooks
- down_revision: 026_add_scheduled_jobs → 036_add_document_translation_fields

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
 2026-03-16 22:40:15 +00:00
semantic-release d5ed512612 0.114.0 
Automatically generated by python-semantic-release
 2026-03-09 23:00:57 +00:00
semantic-release 91549c8f5e 0.113.0 
Automatically generated by python-semantic-release
 2026-03-09 21:30:41 +00:00
semantic-release 8fa3e9bc4a 0.112.0 
Automatically generated by python-semantic-release
 2026-03-09 12:01:11 +00:00
semantic-release aea9e227db 0.111.1 
Automatically generated by python-semantic-release
 2026-03-09 01:47:09 +00:00
semantic-release 708962b6a7 0.111.0 
Automatically generated by python-semantic-release
 2026-03-09 00:05:57 +00:00
semantic-release ea2e927054 0.110.1 
Automatically generated by python-semantic-release
 2026-03-08 23:46:54 +00:00
semantic-release 50271ff21f 0.110.0 
Automatically generated by python-semantic-release
 2026-03-08 22:13:16 +00:00
semantic-release 14330d1a83 0.109.0 
Automatically generated by python-semantic-release
 2026-03-08 22:11:59 +00:00
semantic-release 5914d9f511 0.108.0 
Automatically generated by python-semantic-release
 2026-03-08 22:11:07 +00:00
semantic-release b701787ef4 0.107.0 
Automatically generated by python-semantic-release
 2026-03-08 22:10:44 +00:00
semantic-release dce75473a5 0.106.0 
Automatically generated by python-semantic-release
 2026-03-08 21:24:30 +00:00
semantic-release 8ba5d0c15b 0.105.0 
Automatically generated by python-semantic-release
 2026-03-08 21:07:06 +00:00
github-actions[bot] 289eb422f3 docs(changelog): update changelog [skip ci] 2026-03-08 20:51:29 +00:00
semantic-release 189613b482 0.104.0 
Automatically generated by python-semantic-release
 2026-03-08 20:42:48 +00:00
semantic-release fce2b4b01c 0.103.0 
Automatically generated by python-semantic-release
 2026-03-08 19:23:36 +00:00
semantic-release b181799553 0.102.0 
Automatically generated by python-semantic-release
 2026-03-08 18:59:31 +00:00
semantic-release 9b4d8e2bfe 0.101.0 
Automatically generated by python-semantic-release
 2026-03-08 18:08:29 +00:00
semantic-release d846704aa6 0.100.0 
Automatically generated by python-semantic-release
 2026-03-08 17:58:21 +00:00
semantic-release 0cda2dafdc 0.99.0 
Automatically generated by python-semantic-release
 2026-03-08 17:12:21 +00:00
semantic-release 6437364800 0.98.0 
Automatically generated by python-semantic-release
 2026-03-08 17:11:32 +00:00
semantic-release bf43fc8ed2 0.97.0 
Automatically generated by python-semantic-release
 2026-03-08 15:14:47 +00:00
semantic-release 8acf76fe93 0.96.0 
Automatically generated by python-semantic-release
 2026-03-08 15:13:51 +00:00
semantic-release 3e36f4c888 0.95.0 
Automatically generated by python-semantic-release
 2026-03-08 14:45:44 +00:00
semantic-release ba9f32a039 0.94.0 
Automatically generated by python-semantic-release
 2026-03-08 12:59:54 +00:00
github-actions[bot] e68bf13949 docs(changelog): update changelog [skip ci] 2026-03-08 12:26:45 +00:00
github-actions[bot] 195febfb09 docs(changelog): update changelog [skip ci] 2026-03-08 12:23:49 +00:00
github-actions[bot] cc6acc1f03 docs(changelog): update changelog [skip ci] 2026-03-08 12:21:08 +00:00
semantic-release f6c6712550 0.93.1 
Automatically generated by python-semantic-release
 2026-03-08 12:15:34 +00:00
github-actions[bot] be0a0922dc docs(changelog): update changelog [skip ci] 2026-03-08 12:12:54 +00:00
github-actions[bot] 5a11f14681 docs(changelog): update changelog [skip ci] 2026-03-08 12:05:46 +00:00
github-actions[bot] 53f7ab37d5 docs(changelog): update changelog [skip ci] 2026-03-08 12:03:43 +00:00
github-actions[bot] 754ea99092 docs(changelog): update changelog [skip ci] 2026-03-08 12:00:11 +00:00
github-actions[bot] 8db0093562 docs(changelog): update changelog [skip ci] 2026-03-08 11:59:02 +00:00
github-actions[bot] 2be09efd99 docs(changelog): update changelog [skip ci] 2026-03-08 11:52:43 +00:00
semantic-release f589fc7fa5 0.93.0 
Automatically generated by python-semantic-release
 2026-03-08 11:51:29 +00:00
semantic-release b5c0d3ca88 0.92.1 
Automatically generated by python-semantic-release
 2026-03-08 11:32:56 +00:00
copilot-swe-agent[bot] 2d754d52ef fix(merge): resolve conflicts with main v0.92.0 keeping path-param regression tests 
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
 2026-03-08 11:19:22 +00:00
copilot-swe-agent[bot] c31b72810e fix(merge): resolve tests/test_auth.py conflict keeping all tests from both branches 
Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
 2026-03-08 11:11:21 +00:00
semantic-release 6a14a7956f 0.90.0 
Automatically generated by python-semantic-release
 2026-03-08 09:05:40 +00:00
semantic-release 8996715c0c 0.89.1 
Automatically generated by python-semantic-release
 2026-03-08 09:04:59 +00:00
semantic-release 31b4d9387b 0.89.0 
Automatically generated by python-semantic-release
 2026-03-08 09:04:37 +00:00
semantic-release 0955765525 0.88.2 
Automatically generated by python-semantic-release
 2026-03-08 09:04:16 +00:00
semantic-release 7f20dc7782 0.88.1 
Automatically generated by python-semantic-release
 2026-03-08 08:08:52 +00:00
semantic-release 5f0c9b8205 0.88.0 
Automatically generated by python-semantic-release
 2026-03-07 21:03:18 +00:00
semantic-release a264ba474a 0.87.0 
Automatically generated by python-semantic-release
 2026-03-07 20:58:35 +00:00
semantic-release e8c2854325 0.86.0 
Automatically generated by python-semantic-release
 2026-03-07 20:45:41 +00:00
semantic-release cfb1e2d62d 0.85.0 
Automatically generated by python-semantic-release
 2026-03-07 20:44:58 +00:00
semantic-release 3f67b80a42 0.84.0 
Automatically generated by python-semantic-release
 2026-03-07 20:38:48 +00:00