From 27fb820ae9081fb56957cf75e79eccd8a99edd52 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sat, 14 Feb 2026 19:14:48 +0000
Subject: [PATCH] =minor css changes, queue merge logic restructured, and double checking changes actually changed in cRUD.js before sending to server
---
inc/registry/CheckCustomTables.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inc/registry/CheckCustomTables.php b/inc/registry/CheckCustomTables.php
index 9ec862a..aeccf6c 100644
--- a/inc/registry/CheckCustomTables.php
+++ b/inc/registry/CheckCustomTables.php
@@ -457,7 +457,7 @@
`priority` ENUM('high', 'normal', 'low') DEFAULT 'normal',
`state` enum('pending', 'scheduled', 'processing', 'completed') DEFAULT 'pending',
- `outcome` enum('pending', 'success', 'partial', 'failed','failed_permanent') DEFAULT 'pending',
+ `outcome` enum('pending', 'success', 'partial', 'merged', 'failed', 'failed_permanent') DEFAULT 'pending',
`retries` int(11) DEFAULT 0,
`last_error_hash` CHAR(32) DEFAULT NULL,
@@ -470,6 +470,7 @@
`metadata` JSON DEFAULT NULL,
`result` JSON,
`dependencies` JSON,
+ `merged_into` VARCHAR(64) DEFAULT NULL,
`user_dismissed` tinyint(1) DEFAULT 0,
`created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
--
Gitblit v1.10.0