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