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>

frontend/templates/files.html

@@ -524,6 +524,7 @@
           <option value="webdav" {% if storage_provider == "webdav" %}selected{% endif %}>WebDAV</option>
           <option value="ftp" {% if storage_provider == "ftp" %}selected{% endif %}>FTP</option>
           <option value="sftp" {% if storage_provider == "sftp" %}selected{% endif %}>SFTP</option>
+          <option value="sharepoint" {% if storage_provider == "sharepoint" %}selected{% endif %}>SharePoint</option>
           <option value="icloud" {% if storage_provider == "icloud" %}selected{% endif %}>iCloud Drive</option>
         </select>
       </div>

frontend/templates/help.html

@@ -33,7 +33,7 @@
       "name": "Which cloud storage providers does DocuElevate support?",
       "acceptedAnswer": {
         "@type": "Answer",
-        "text": "DocuElevate integrates with Dropbox, Google Drive, OneDrive, Amazon S3, Nextcloud, WebDAV, SFTP, FTP, and Paperless-ngx."
+        "text": "DocuElevate integrates with Dropbox, Google Drive, OneDrive, SharePoint, Amazon S3, Nextcloud, WebDAV, SFTP, FTP, and Paperless-ngx."
       }
     },
     {
@@ -188,6 +188,14 @@
         </div>
       </div>
 
+      <div class="flex items-start bg-white shadow rounded-lg p-5">
+        <i class="fab fa-microsoft text-purple-600 text-xl mr-3 mt-0.5" aria-hidden="true"></i>
+        <div>
+          <h3 class="font-semibold text-gray-800 text-sm">SharePoint</h3>
+          <p class="text-gray-500 text-xs">Upload to SharePoint Online document libraries via Graph API.</p>
+        </div>
+      </div>
+
       <div class="flex items-start bg-white shadow rounded-lg p-5">
         <i class="fab fa-aws text-yellow-600 text-xl mr-3 mt-0.5" aria-hidden="true"></i>
         <div>

frontend/templates/qr_login.html

@@ -126,6 +126,8 @@ function qrLoginPage() {
     errorMsg: '',
     _pollTimer: null,
     _countdownTimer: null,
+    _ttlSeconds: 0,
+    _receivedAt: null,
 
     _csrfToken() {
       return document.cookie
@@ -156,6 +158,8 @@ function qrLoginPage() {
         this.challengeToken = data.challenge_token;
         this.qrPayload = data.qr_payload;
         this.expiresAt = new Date(data.expires_at);
+        this._ttlSeconds = data.ttl_seconds || 120;
+        this._receivedAt = Date.now();
         this.status = 'pending';
         this.deviceName = '';
 
@@ -214,8 +218,9 @@ function qrLoginPage() {
     },
 
     _updateCountdown() {
-      if (!this.expiresAt) { this.countdown = 0; return; }
-      const remaining = Math.max(0, Math.floor((this.expiresAt - new Date()) / 1000));
+      if (!this._receivedAt) { this.countdown = 0; return; }
+      const elapsed = (Date.now() - this._receivedAt) / 1000;
+      const remaining = Math.max(0, Math.floor(this._ttlSeconds - elapsed));
       this.countdown = remaining;
     },