fixes the stock merge function for stocks with large pedigrees by not parsing the entire pedigree, just retrieving the parents; fixes a bug in the stock merge that resulted in duplicate attributes when they were present in both stocks; fixes issues with cached data when analyses and datasets are being deleted; removes redundant code in genotyping plate functions; sort labels in lists correctly in label designer; relax constraints on timestamps in phenotyping simple format files; fix an issue on the summary section of the regeneration phenotyping page that caused a data table error.

lukasmueller · lukasmueller · commit ee5de68fc884 · 2026-07-15T05:46:40.000-04:00
diff --git a/cxgn/cassbase b/cxgn/cassbase
@@ -1 +1 @@
-Subproject commit d441fa64004799429d28c5300008ceb8bb531082
+Subproject commit fb63fd3dfc034468a49e418db68d9a603426290f
diff --git a/cxgn/sgn b/cxgn/sgn
@@ -1 +1 @@
-Subproject commit 8ae0f0368fc2d3f1a6b2563ef262bf082e809db9
+Subproject commit 9364e3c8fa0553c2c136dddc384bd16f7a1d8ae1
