copilot-swe-agent[bot]
1afd42bc57
fix: merge main (v0.161.0) into classification feature branch
Resolve all 40 merge conflicts from merging origin/main into the
classification feature branch. Key resolutions:
- Auto-generated files (BUILD_DATE, VERSION, etc.): use main's version
- API tokens: take main's version (token expiry, reactivation, hard-delete)
- Auth: take main's Dropbox credential sharing + token expiry checking
- Config: take main's social_auth_dropbox_use_global_credentials option
- Files API: take main's improved duplicate handling + rate limiting
- Models: keep ClassificationRuleModel alongside main's new models
- Mobile: take main's mature implementation
- Templates/translations: take main's versions (device deletion, reactivation keys)
- Migration: renumber 038_add_classification_rules → 039_add_classification_rules
to chain after main's 038_add_api_token_expires_at
- Requirements: take main's version (adds segno QR library)
- Tests: take main's more complete token tests, keep classification imports
2026-03-20 13:08:41 +00:00
..
2025-03-26 16:27:36 +00:00
2026-02-26 14:21:58 +00:00
2026-03-20 13:08:41 +00:00
2026-02-13 09:10:52 +00:00
2026-02-13 09:10:52 +00:00
2026-03-06 15:32:43 +00:00
2026-02-13 09:12:11 +00:00
2026-03-08 11:19:22 +00:00
2026-02-23 22:12:08 +00:00
2026-03-19 19:11:44 +00:00
2026-03-16 22:33:59 +00:00
2026-03-16 22:33:59 +00:00
2026-02-14 00:05:57 +00:00
2026-02-13 09:10:52 +00:00
2026-03-09 23:38:05 +00:00
2026-02-12 03:21:41 +00:00
2026-02-23 23:24:27 +00:00
2026-03-16 22:33:59 +00:00
2026-03-20 08:19:48 +00:00
2026-02-12 03:21:41 +00:00
2026-03-01 17:31:56 +00:00
2026-02-13 09:10:52 +00:00
2026-02-26 09:16:49 +00:00
2026-02-14 00:17:16 +00:00
2026-02-13 09:10:52 +00:00
2026-03-16 22:33:59 +00:00
2026-03-08 13:01:14 +00:00
2026-03-19 20:22:20 +00:00
2026-02-22 16:02:00 +00:00
2026-03-20 09:08:08 +00:00
2026-02-23 09:33:48 +00:00
2026-03-16 22:33:59 +00:00
2026-03-16 22:33:59 +00:00
2026-02-13 09:10:52 +00:00
2026-02-23 21:14:08 +00:00
2026-03-07 10:58:39 +00:00
2026-03-07 15:06:48 +00:00
2026-02-14 00:16:21 +00:00
2026-03-16 22:33:59 +00:00
2026-03-16 22:33:59 +00:00
2026-03-01 13:46:15 +00:00
2026-02-25 15:24:42 +00:00
2026-02-13 09:10:52 +00:00
2026-02-22 20:56:58 +00:00
2026-03-08 11:54:56 +00:00
2026-03-18 23:43:16 +00:00
2026-03-16 22:33:59 +00:00
2026-03-08 17:37:29 +00:00
2026-02-22 14:24:27 +00:00
2026-03-16 22:33:59 +00:00
2026-02-13 09:10:52 +00:00
2026-03-08 11:11:21 +00:00
2026-03-16 22:33:59 +00:00
2026-03-08 12:11:07 +00:00
2026-03-08 15:18:53 +00:00
2026-03-01 13:46:43 +00:00
2026-03-01 14:41:29 +00:00
2026-03-16 22:33:59 +00:00
2026-03-08 18:38:22 +00:00
2026-03-17 11:09:39 +00:00
2026-02-12 03:21:41 +00:00
2026-02-23 20:23:06 +00:00
2026-03-09 23:40:09 +00:00
2026-03-09 23:38:05 +00:00
2026-03-08 21:50:18 +00:00
2026-03-16 22:33:59 +00:00
2026-02-23 12:54:34 +00:00
2026-02-14 00:12:30 +00:00
2026-02-25 21:08:24 +00:00
2026-03-16 22:33:59 +00:00
2026-02-21 09:40:52 +00:00
2026-02-13 09:10:52 +00:00
2026-02-13 09:10:52 +00:00
2026-03-02 14:01:26 +00:00
2026-02-22 20:56:58 +00:00
2026-02-13 09:10:52 +00:00
2026-02-23 23:23:28 +00:00
2026-02-13 09:10:52 +00:00
2026-03-16 22:33:59 +00:00
2026-03-16 22:33:59 +00:00
2026-03-17 16:14:45 +00:00
2026-03-18 22:25:27 +00:00
2026-02-25 13:59:49 +00:00
2026-03-01 14:40:19 +00:00
2026-03-17 12:03:04 +00:00
2026-03-06 10:13:40 +00:00
2026-03-16 22:33:59 +00:00
2026-03-06 10:02:04 +00:00
2026-03-17 13:22:28 +00:00
2026-03-16 23:52:56 +00:00
2026-03-01 07:51:07 +00:00
2026-03-19 14:11:08 +00:00
2026-02-13 16:12:39 +00:00
2026-02-13 09:10:52 +00:00
2026-02-13 09:10:52 +00:00
2026-02-14 00:16:21 +00:00
2026-03-16 22:33:59 +00:00
2026-03-16 22:33:59 +00:00
2026-03-06 10:38:58 +00:00
2026-02-12 03:21:41 +00:00
2026-03-07 15:18:07 +00:00
2026-02-13 09:10:52 +00:00
2026-03-01 17:31:56 +00:00
2026-02-27 00:51:14 +00:00
2026-02-15 10:24:48 +00:00
2026-02-27 16:38:10 +00:00
2026-03-16 22:33:59 +00:00
2026-02-15 10:28:44 +00:00
2026-02-13 23:40:31 +00:00
2026-02-26 23:50:46 +00:00
2026-03-16 22:33:59 +00:00
2026-03-16 22:33:59 +00:00
2026-03-16 22:33:59 +00:00
2026-02-13 09:10:52 +00:00
2026-03-16 22:33:59 +00:00
2026-03-16 22:33:59 +00:00
2026-02-22 16:12:58 +00:00
2026-03-19 18:58:19 +00:00
2026-03-16 22:33:59 +00:00
2026-02-14 00:05:57 +00:00
2026-03-08 22:40:15 +00:00
2026-02-12 17:32:17 +00:00
2026-02-13 09:10:52 +00:00
2026-03-16 22:33:59 +00:00
2026-02-13 09:10:52 +00:00
2026-02-16 15:56:19 +00:00
2026-03-16 22:33:59 +00:00
2026-02-09 20:56:35 +00:00
2026-02-12 03:21:41 +00:00
2026-02-13 09:10:52 +00:00
2026-02-24 18:02:19 +00:00
2026-02-24 19:25:41 +01:00
2026-03-08 21:47:12 +00:00
2026-03-07 11:12:21 +00:00
2026-03-06 10:00:33 +00:00
2026-03-16 22:33:59 +00:00
2026-03-08 21:49:49 +00:00
2026-02-25 15:24:42 +00:00
2026-02-13 09:10:52 +00:00
2026-02-27 00:47:58 +00:00
2026-02-13 09:10:52 +00:00
2026-02-13 09:10:52 +00:00
2026-02-13 09:10:52 +00:00
2026-02-09 15:14:40 +00:00
2026-03-01 18:38:07 +00:00
2026-02-22 15:25:48 +00:00
2026-03-01 17:37:41 +00:00
2026-02-28 12:57:50 +00:00
2026-03-16 22:33:59 +00:00
2026-03-09 19:00:13 +00:00
2026-02-13 16:51:07 +00:00
2026-03-17 16:14:45 +00:00
2026-03-08 21:09:17 +00:00
2026-03-17 16:14:45 +00:00
2026-03-16 22:33:59 +00:00
2026-02-24 18:17:22 +00:00
2026-02-16 15:47:20 +00:00
2026-02-25 15:24:42 +00:00
2026-03-16 22:33:59 +00:00
2026-03-02 16:37:28 +00:00
2026-02-12 03:21:41 +00:00
2026-03-08 21:55:55 +00:00
2026-03-06 10:40:58 +00:00
2026-03-16 22:33:59 +00:00
2026-03-06 10:42:09 +00:00
2026-02-13 09:10:52 +00:00
2026-02-23 23:09:55 +00:00
2026-03-08 12:05:17 +00:00
2026-03-07 20:53:42 +00:00
2026-03-05 22:00:22 +00:00
2026-03-17 11:09:39 +00:00
2026-02-25 13:03:21 +00:00
2026-03-16 22:33:59 +00:00
2026-03-16 22:33:59 +00:00
2026-02-13 16:51:07 +00:00
2026-02-13 23:33:25 +00:00
2026-03-08 22:21:15 +00:00
2026-03-17 12:15:12 +00:00
2026-02-13 09:10:52 +00:00
2026-02-13 09:10:52 +00:00
2026-03-08 11:11:21 +00:00
2026-02-13 09:10:52 +00:00
2026-03-16 22:33:59 +00:00
2026-02-13 23:45:11 +00:00
2026-02-13 09:10:52 +00:00
2026-02-13 09:10:52 +00:00
2026-02-17 04:35:00 +00:00
2026-02-17 11:40:34 +00:00
2026-03-17 16:14:45 +00:00
2026-02-13 09:10:52 +00:00
2026-02-13 16:51:07 +00:00
2026-02-13 09:10:52 +00:00
2026-02-13 09:10:52 +00:00
2026-03-16 22:33:59 +00:00
2026-03-07 20:52:44 +00:00
2026-03-08 21:24:14 +00:00
2026-03-16 22:33:59 +00:00
2026-02-09 20:55:53 +00:00
2026-03-07 15:03:11 +00:00
2026-03-08 12:15:39 +00:00
2026-03-16 22:33:59 +00:00
2026-02-13 09:10:52 +00:00
2026-03-20 08:19:48 +00:00
2026-02-24 00:04:42 +00:00
2026-03-07 11:14:49 +00:00
2026-02-25 15:15:24 +00:00
2026-03-09 20:19:19 +00:00
2026-03-08 18:33:39 +00:00
2026-03-08 18:48:11 +00:00
2026-02-17 12:01:40 +00:00
2026-03-16 22:33:59 +00:00
2026-03-09 20:19:19 +00:00
2026-03-08 11:41:18 +00:00
2026-03-01 13:46:15 +00:00
2026-02-24 00:04:42 +00:00
2026-03-08 15:10:46 +00:00
2026-03-08 11:57:37 +00:00
2026-03-01 17:40:54 +00:00
2026-03-09 09:29:43 +00:00
2026-03-01 20:42:57 +00:00
2026-02-23 10:01:07 +00:00