From e89852bcc777c04d5d13182ed9bbb4ec6ef45ff3 Mon Sep 17 00:00:00 2001
From: kwhuber <kaden.huber@gmail.com>
Date: Mon, 27 Oct 2025 12:48:25 -0500
Subject: [PATCH 1/8] fix: adjusted highlight color for selected chronostrat

---
 specifyweb/frontend/js_src/lib/components/Atoms/Form.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/specifyweb/frontend/js_src/lib/components/Atoms/Form.tsx b/specifyweb/frontend/js_src/lib/components/Atoms/Form.tsx
index cf0f6294094..ec74ed1ff5b 100644
--- a/specifyweb/frontend/js_src/lib/components/Atoms/Form.tsx
+++ b/specifyweb/frontend/js_src/lib/components/Atoms/Form.tsx
@@ -352,9 +352,9 @@ export const Select = wrap<
        * the background in dark-mode. This is a fix:
        */
       if (props.required !== true && props.multiple === true) {
-        selected.map((option) => option.classList.add('dark:bg-neutral-100'));
+        selected.map((option) => option.classList.add('dark:bg-neutral-500')); // highlights selected object less bright
         unselected.map((option) =>
-          option.classList.remove('dark:bg-neutral-100')
+          option.classList.remove('dark:bg-neutral-500') // prevents a previously selected option from remaining highlighted
         );
       }
       const value = (event.target as HTMLSelectElement).value;

From 297ed2b89268af24f94b75f69812af18060d0371 Mon Sep 17 00:00:00 2001
From: kwhuber <kaden.huber@gmail.com>
Date: Mon, 3 Nov 2025 13:28:02 -0600
Subject: [PATCH 2/8] merge conflicts

---
 .DS_Store                                     | Bin 0 -> 10244 bytes
 .env                                          |   2 +-
 .github/.DS_Store                             | Bin 0 -> 6148 bytes
 .vscode/launch.json                           |  31 ++++++++++++++++++
 .vscode/settings.json                         |  23 +++++++++++++
 Dockerfile                                    |  21 +++++++++++-
 docker-compose.yml                            |   2 ++
 manage.py                                     |   6 ++++
 requirements-testing.txt                      |   7 +++-
 specify7/.DS_Store                            | Bin 0 -> 6148 bytes
 specifyweb/.DS_Store                          | Bin 0 -> 8196 bytes
 specifyweb/backend/.DS_Store                  | Bin 0 -> 6148 bytes
 specifyweb/frontend/.DS_Store                 | Bin 0 -> 6148 bytes
 specifyweb/frontend/js_src/.DS_Store          | Bin 0 -> 6148 bytes
 specifyweb/frontend/js_src/lib/.DS_Store      | Bin 0 -> 6148 bytes
 .../frontend/js_src/lib/components/.DS_Store  | Bin 0 -> 8196 bytes
 .../__snapshots__/Form.test.tsx.snap          |   4 +--
 specifyweb/frontend/js_src/package-lock.json  |   3 +-
 specifyweb/frontend/js_src/package.json       |   2 +-
 specifyweb/specify/.DS_Store                  | Bin 0 -> 6148 bytes
 20 files changed, 94 insertions(+), 7 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 .github/.DS_Store
 create mode 100644 .vscode/launch.json
 create mode 100644 .vscode/settings.json
 create mode 100644 specify7/.DS_Store
 create mode 100644 specifyweb/.DS_Store
 create mode 100644 specifyweb/backend/.DS_Store
 create mode 100644 specifyweb/frontend/.DS_Store
 create mode 100644 specifyweb/frontend/js_src/.DS_Store
 create mode 100644 specifyweb/frontend/js_src/lib/.DS_Store
 create mode 100644 specifyweb/frontend/js_src/lib/components/.DS_Store
 create mode 100644 specifyweb/specify/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..1b6c0564f459cd52c4a71a3db937748c8eb82d9e
GIT binary patch
literal 10244
zcmeHML66%+6n@_BZk$b_QPrY~3dslwaoC1U3%f<2Doqo?QlMg!QX$F)dy^*CI(A6B
zn?|ceQ7=fqi6bEX0*F%&TsR?d0)fgAi8JhxOAqk9v9}pJcIc&m#Edk4<MDfM-uJzk
zamFDct-RAL5*b9Kqq58&#U-KebFNcmF6>!_)L>6eyI9-uy1gk))u9+r3@8Q^1BwB~
zz<-4SytBFJxj?F`Vn8vV7`Vp(?+*ql%Tg%EffQQ@F5(CPIgf5p(9UxM(g<ZKl;c3+
z35ph&LI$Q<c*M{GbMzabUMZC0KnCWdg@+F<99aubD4G}@{tcl{S}Bm~su)lVOf$e|
z_jxK%n{4vs^LysblOM~^x?ZJXIi7_+eXsM?<|o&`y%>GoocX-hnS2|_{91x3We&%s
z4(*U7k52T_3)32M4BEzp@4^^je!AWyl5{OO9tw61_OnX^+9Hpd)QZNla3PFG(vaiX
z`1HrGH(wW=#Qezdq-#au2{yl@bctS~i}V`3NL6};u0R&3OU-r1+X{2R+a2ej@TVwf
z5wYDm)zM#vyaM|IFx{XVF}p8fc8dbJ3r(BaQC;n^S-LV)n)CDT(2e+#d9uIx{+H7)
z3!Y*+ldPrb$Q)@tMj<)|tc<Wu8^Btos{%7KmcW$uAuMF3a-3)2H8KAj@?qlw`^_kJ
z!SCl1zsF(afvauU_UVjZtxG-h4bW4d5pv|jd@$Ftj}tK;EsX5L+erAa#a#jZI#E9&
z53-*nsz|YL<{WCpY#6m{lfhhC2X9sIR-<ZEo6%|yOK5d^75p&PMDGM-5&bOCn~2}U
zp2BSOXcQfRF+?nMSTODpv>CY_(?|Rf{Uzw|e&y0lSnz7aoQ>KD6z@qWvX~!L^j3hT
z3ajZ=#5iP&Q^-b(-o?zYMXQTD&d~rF_t75U$}zOz%||4DGy;KA_Loofmu%0dW&0fG
z3R$}<W_q38Ohs`Z;eJTW$rfhY8B`OInq;A3rY6LDpO*4^zkF-$56rI_<H)Q3hiC7e
zH)~?`&$O8A1@~tm?+ll3i4V{xfw4zx)BtV^S6-Vwve`p>3vZm3SiuQvOw1jb30-(%
zeH&|FL~AkTI8!tAt>K^-?$@`io?{REm6bc%+>!Z(#f+ZObNbu0jyJ6NroS^NoBg-=
zuI_n`b=WqoH|*B1kw0<CbA8ixTYX_*H(OA-e$959-mvWLxXppEtpyMCte$P;PwnlU
zU0qo=&J~OM%f{YwXN$|mGv`+K_p|!RC!T(Oqp|IDUGD?r5Jl4hiF`&2?;%q>$n#*K
zdGLOcj-37e>Fx93JA2BP{Fa=hCue%`H<9TnU%R!w>v(P(@i3mHSpJ5{y%o(N=X`Ec
zS~rO{GTuiIerl%qmN8$ueeZWlqE8w3-|5QOAOGx243GC8&+^IK6xgsc4AGB0GK!Ml
ze-V_ABw9DHKlD(8Rg$*DV!w>|I-cTd7i%po9=r)6J{XZIiUGxdVn8wQpcyz43}ECS
ztLgv$Kj<)&f5m`e;9q1wo3GR=Wdv~e<3An?e`_~T-$CWVdgDL}6I{gScu4U%9yk0s
h{wY+}U17-u?NTVmfkY3=KmKQcI{&Nl|Ns2_{};E;cQOC~

literal 0
HcmV?d00001

diff --git a/.env b/.env
index 8473a84c7a8..a65260454e3 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 DATABASE_HOST=mariadb
 DATABASE_PORT=3306
 MYSQL_ROOT_PASSWORD=password
-DATABASE_NAME=specify
+DATABASE_NAME=uw_geo_collections_2025_09_09
 
 # The following are database users with specific roles and privileges. 
 # If the migrator and app user are not defined, the system will use the master user credentials.
diff --git a/.github/.DS_Store b/.github/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..9dca596f8a793f47055de09ec5173d23a13259e0
GIT binary patch
literal 6148
zcmeHKOG*Pl5Phu?;)f8(MsPD%$PFfOA}Ib~bf+jW7{P>ziex)SaP1x3xOL%5+<O6+
zUc*=2O`IVyi3k#;Ds;V`nyT)uH*{ATfT`cMsz4b)kxj6$L^VR>y|f{j^OhB&v11$}
z=5G^w*d6j#gEF8D%o+o-cPogvXJf1*yMIq`fChH3k8RYX-)UFlv!vT|DJ)z~AK6W!
zsM$%Hj3}0$p5NEDUTZ&zZv7&<cadGSoO3AIY-48Iz=SMIFO&SUxmDf<xs9Epn|x(7
zZA?CoQ1Vzr9|^8;iF0(=>*FT>jgH%+y|Qb5eE8V7KeFFr#CX}2j`z&3?@rdIGTRKW
zW{VV;9jaCalmTU6z<`_&0h?gxF?DE<4k~*EAQou0!oIDs#6S$h&|~V57K(A9L>FrO
z6~nl2+5_(wdQ2U<a2Pu?$MG{8e?u{LcG?5$4ih?5tqdpwc?Ra)V_E8d<NN!6K1iRG
z0cGG{F<=T&9MzeUudPGLNv#doPT54nFLh``sC+rL9Vx}DY*zR#kPb2Qm^!3|qJIP|
L4XTuZKV{$(RfmNh

literal 0
HcmV?d00001

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000000..41ce5c5f4df
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Run Django",
+      "type": "python",
+      "request": "attach",
+      "pathMappings": [
+        {
+          "localRoot": "${workspaceFolder}/specifyweb",
+          "remoteRoot": "/opt/specify7/specifyweb"
+        }
+      ],
+      "port": 3000,
+      "host": "127.0.0.1",
+    },
+    {
+      "name": "Run Worker",
+      "type": "python",
+      "request": "attach",
+      "pathMappings": [
+        {
+          "localRoot": "${workspaceFolder}/specifyweb",
+          "remoteRoot": "/opt/specify7/specifyweb"
+        }
+      ],
+      "port": 3001,
+      "host": "127.0.0.1",
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000000..ce16f58ca76
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,23 @@
+[
+    {
+        "python.testing.unittestArgs": [
+            "-v",
+            "-s",
+            "./specifyweb",
+            "-p",
+            "*test*.py"
+        ],
+        "python.testing.pytestEnabled": false,
+        "python.testing.unittestEnabled": true,
+        "python.linting.mypyEnabled": true,
+        "python.linting.enabled": true,
+        "typescript.tsdk": "./specifyweb/frontend/js_src/node_modules/typescript/lib"
+    },
+    {
+        "typescript.tsdk": "./specifyweb/frontend/js_src/node_modules/typescript/lib",
+        "eslint.experimental.useFlatConfig": true,
+        "eslint.workingDirectories": [
+           {"pattern": "./specifyweb/frontend/js_src/"}
+        ]
+    }
+]
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 6655b0cc524..fc2402945c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -260,7 +260,26 @@ USER specify
 
 COPY requirements-testing.txt /home/specify/
 
-# RUN ve/bin/pip install --no-cache-dir -r /home/specify/requirements-testing.txt
+RUN ve/bin/pip install --no-cache-dir -r /home/specify/requirements-testing.txt
+
+# RUN mkdir /opt/specify7/.vscode
+# RUN echo "[pytest]\nDJANGO_SETTINGS_MODULE=specifyweb.settings\npython_files=*test*.py testparsing.py\naddopts = --ignore=specifyweb/specify/selenium_tests.py" > /opt/specify7/specifyweb/pytest.ini 
+# RUN cat <<EOF > .vscode/settings.json
+# {
+# 	"python.pythonPath": "ve/bin/python/",
+# 	"python.testing.pytestArgs": [
+# 		"specifyweb",
+# 		"-s",
+# 		"-vv",
+# 		"-o",
+# 		"python_files=*test*.py"
+# 	],
+# 	"python.testing.pytestEnabled": true,
+# 	"python.testing.nosetestsEnabled": false,
+# 	"python.testing.unittestEnabled": false
+# }
+
+# EOF
 
 COPY mypy.ini ./
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 41c149c0f16..353a9523b23 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,6 +33,8 @@ services:
     build:
       context: ./.
       target: run-development
+    ports: 
+      - "3000:3000"
     command: ve/bin/python manage.py runserver 0.0.0.0:8000
     init: true
     restart: unless-stopped
diff --git a/manage.py b/manage.py
index a7615029a5f..12212617947 100644
--- a/manage.py
+++ b/manage.py
@@ -7,6 +7,12 @@
 
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "specifyweb.settings")
+    from django.conf import settings
+    if settings.DEBUG:
+        if os.environ.get('RUN_MAIN') or os.environ.get('WERKZEUG_RUN_MAIN'):
+            import debugpy
+            debugpy.listen(("0.0.0.0", 3000))
+            print('Attached!')
     try:
         from django.core.management import execute_from_command_line
     except ImportError:
diff --git a/requirements-testing.txt b/requirements-testing.txt
index 21bba85648c..129049a116d 100644
--- a/requirements-testing.txt
+++ b/requirements-testing.txt
@@ -3,4 +3,9 @@ mypy==1.5.1
 hypothesis>=6.131.9,<7
 hypothesis-jsonschema==0.19.0
 types-requests==2.28.5
-lxml
\ No newline at end of file
+lxml
+debugpy==1.6.5
+pytest==7.2.1
+pytest-django==4.5.2
+django-extensions==3.2.3
+# django-debug-toolbar==4.4.6
\ No newline at end of file
diff --git a/specify7/.DS_Store b/specify7/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..23d7b1f05ad7197bf5efe7c7a54adcdd4c8cbc2a
GIT binary patch
literal 6148
zcmeHKJ5Iwu5S<MHS)xfvxmU;ymdIRyTmS_lC}KHHD3Ke)sc2}p4B`yD`2-WJNK{CO
zH`2`8ot>GrU*YkHNLp;0xyVdJDyX77sTqr&tBzz6o+&VCjq9%6sPDLWKTs<&2GHDz
z+{?}ScE0?UZ~nHc>(#njA+BnlA0A&WU(a_rZPy$;+uRNHPTuUXhFiHJ17v^<kO4CA
ze;Gi}R;f-MX~_T?AOoKa==UK*6-!|6XrB%k8v%g&8*hTO%@V+@4qyrF9pQl_PX&5v
ziV-7uI{Z1}N?`Bk>5}Yb)QOu@Oeo22hd*1mq~b_R2FSoZ14q7{Y5%`~{&Z&FufiP}
zAOnAyfi$g`^#X4Yy>;|1+G{iP3c3@-S~!fgVxYBRY_t`heTmDu#(4?s9W5PxO9%2t
MKzX5%f!|=@1GoJt?*IS*

literal 0
HcmV?d00001

diff --git a/specifyweb/.DS_Store b/specifyweb/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c502bc823f25d6934f424db8dae5f05116da8583
GIT binary patch
literal 8196
zcmeI1ziSjh6vy9q2QHq1SOtSHMFh1<ER2n?38zGD0x2vEoVmNr5AN1Iau?*f#lpr$
zEK~UhSc-jY0)l97VM;-?v$F9!Z-%>>o7;;vBDtAk=WTYsZ}xNF*&p{dL?o8?nhQiT
zL=<6B@q7i{n5Oot#cQX`7Ktd3Pt>3dEZdY&%~OXB!GYjFa3DAk90(5l4-Vj&ty)y@
z+}C?U9~=k{Or-<r{vffa7@L^u$hQu3Tmm4Lv6&mzQ3r62G%+?Y*O5~(rmh}@NfoBV
z5IP<ErII7YCgwWobP_t9ggLS>6^h`aBTurNM66@zg9E_<-vNnD6;$gr>QLXQ-)rry
zg|$YOc68F&2gS-Xt5)mntPVx=a_-s3OZN_!CaIf$q3&$k6cWSIX{z&kh8Es4Jf^0@
zx%m2<udw-6ueNUPuQT7sIB7QIDpol>D{Rg=@a$2Sc0iLLc4-%Xx7E7CM&+Mio1nHi
zOV=;|>fL9~i5WxYKg)3V_02Y-O%P|G@A-~iyw?8;YENUcK0Unk-gr7jHzb^-v$^EK
z5e`XbD21m@e3X|@Fz36JxQ@=sBAv~*__=g6tIx@?W7;!+oYv+fnpd0^TssNa6s?;5
z9rki$?xP>YN}KiJmjP?RxHj$aYL}Ovju99W%yo~?*samCG+hU&r?DB|UHN`zFyA9%
z*>v-7?`~XJ<#X5@&*gfBL*lybvXc#PZBpNv>E|Eb_zIh;b;G)@opEfUVwJ=5;*;VD
zEjVzJ9VqE9H>2wR+r{tyPqGE!y9EcP-T_gru2q*|gQ=}OLsYFTu{^?}n$qPuatb;w
r#}T<4M;!da5bF|Bl@pto>xeCA|NKS3@YlcdD<M4pc{)NjB@X-s<yJhI

literal 0
HcmV?d00001

diff --git a/specifyweb/backend/.DS_Store b/specifyweb/backend/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..2ef22b565edb78a3075d4ecbb9ec04d91dd16792
GIT binary patch
literal 6148
zcmeHKJxfC|6ur@kwN>dLA~^UE1vlyFB2TF(x(F_AYCq88tFN{eN8e8o90d{of`gNw
zi>r%2z}>}jlT;I5`>czI<d)>*<KE=tke4(>B$iv{JW-B_(nyS{46+W!{hVUfr(4E=
zLXOd*I_=O2h4?vh3OEJ+x&r*|W~oSfRH8#NzuzF(&u^8&T3sz+exbW(Ei4p@L0E)G
z`s(8Gd2;=3DapJ11Mm8Q$zqeqjDT;8npCADssNkRKt15H#knt-PWCo=FP_i5ooq<n
z3FFtoPwu@%So{ZGng1Y8$vvEsB|3<4rYTnLi-*Z`{PL--Z_MkHTX!#u4?QrSQ7Fh~
zb^~n6IKPjfW(BosjNQ=N&3FDL*VX&8?UvFsaSl_}USq6v4D&K*h)(4y4zWKf*c;H-
z+7Id5wa#89=a;$J_CDw^p2;-X)8d!8mIVJ;hC7=romJ>^r+`zyDe$2HpAQ}qqpvYi
zD31<g@(BP;p;;QrIW7P_jlRZ6A$nj!g#uNm&`%7Z!qM(&KVM^{P=%9_Gh-Y*v(PUT
zA!kRsC*4W-3SI6La0=K8^s8!)@BfwV?|(bU)tmxOfq$idNENmU%UF`WTVspkyVgV6
rMPg&WNTCctrmtgJ;H!87NgDb*E&zRvkwUb<+#dlcgUg%(zpB7HpP1Cn

literal 0
HcmV?d00001

diff --git a/specifyweb/frontend/.DS_Store b/specifyweb/frontend/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..e7f6a9fee08dfda6f49be6d0a3c13eae2ad326b4
GIT binary patch
literal 6148
zcmeHKOG*Pl5UtWE18%a^U0)$5a17%KvJwO(6Hp{!g5ti9;M&W$a3P3?@>N%<Ofuju
zh`fU8SKalQnFrI|B_cX~Tuem9B2qyO)r<kL<w4h81do7PYTQe^yqV0}ZnYjL^cR=x
z-4EqX9^?wT@%|^TFCUx!Ro680WjDuq)gGL_KVQC`ZO1HrjalFR@RTl|P=Z1R$N(82
z17u()4B*T*sg4{uk^wS62EG}v{UJdO>%i<-whj!X1pwMLx(ICRB`hZe)`8g(9*BA>
z&{H*94E1!Zr--Wqv!kbrM)RTZ<geyM%hORmm2lD8ks}!(1APYeeLA-D{~W)}V3XfZ
z;fxHBfq%w;j+$9B#Ye^2y7hT>)+XpR)WqVl84%dLO8_Rej~o}L`;*y-s{^y6Rk8Jw
P4&+6k5W;~B?0|t!b`vh}

literal 0
HcmV?d00001

diff --git a/specifyweb/frontend/js_src/.DS_Store b/specifyweb/frontend/js_src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..449b05a7293df12e9e07acc6602029a5153da1c0
GIT binary patch
literal 6148
zcmeHK%}T>S5T0!-MD)<3y=Z)df`=YsjZe^%ASf|K#l#e(_gn?9UIgF4y9d4bEWUte
zzu6huEwROuNST4zZ!<re$rs3Eh{z46d7r3DL=lv+wTa~iVLxj_T54gZ<1_lBi>jP>
z>tiF@4F8b<es^su=$f+PGJJm<&vQ>%rD;}F87$HM!Oh_5^y4t}<}19DtKihv7o^cP
z-BLw4jp>X^znh|hG2Mj~^mgyRR>g)j^*#r0M<>3frDvDbyvpCihjs5gymQ?q#(*(k
z46F+S=-DjMmY}W1fH7bU%oyPBLkwk16l+2M>A>Pg0AL4ZFWB=e!8x&FqF4*U196fH
zlvJl9hLd#IV~tA`Ye7jTr^AQSJ3F0FoWDEHk9|0~M9@}az!+F$pe>hO?*GTj=l{hd
zyD|ohfwf}5b<$Bf#3N~MZ9E+J+8BBcW#PD5aF&9NZ^ek^R=flC0(;CGV4_$H!UC}$
N0Z)T1#=xI4@D1(^QL+F4

literal 0
HcmV?d00001

diff --git a/specifyweb/frontend/js_src/lib/.DS_Store b/specifyweb/frontend/js_src/lib/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d55ee0757fb5916944ddbdec45e5723d76e6cb4a
GIT binary patch
literal 6148
zcmeHKOG?B*5UtKch>DVh3&BmUFyH~=5H~JdI2Vxl;D^KxjI)*AcnMG88QgdWHy%Y_
zbr&%q6L2LmR6*72R9AI(UP3BGL}s#HjEPbrN}!C<F3bkudDfmp;^9f-*Rb?JOXwr5
zdeQ3mj|}j$+oL&Is;Gu-o?m%0p3ZGm`$J!*A474KEs9xbXP8e;kDi|2uHMgvV;8@U
zt#4cV-#aWxJG91|bw?$wI;V?X4!X1LGaZh;K2I+EnOgak{W;0zh|d1;EAOwO3@8K2
zz_u`en$42z2UM#JC<Dqs!vKFDGALs%=mPpr2aIn4fHB-&Fy>x@b27nP&;`T{#Dr8}
zNHx-8n2-*CCULo-3mDSLNb_N2XCobo@w;RF%!iZ71FBU9lz}b-qi~sW{XZY>|GP<g
zr3@$oTg8Bhi)k^zElF+d-5l5240;V^;W!ttNx{IEV#IPOK8AXMKjQ%~7jyyPf#{Eb
Mr$LP}@TUxX15ut(r2qf`

literal 0
HcmV?d00001

diff --git a/specifyweb/frontend/js_src/lib/components/.DS_Store b/specifyweb/frontend/js_src/lib/components/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a766c93d0bdefad0fcd86f7ec00282ee17710a11
GIT binary patch
literal 8196
zcmeI1y>HV%7{=do95tm3jFpg(2S7q%$-wT0z`%!uh@chf&?HSMBB`U06tRHC#$Uk1
z%*uqs)`>3s2?*G_fCNJqVBmT0&hcIRQ86GQ^)B+gsqcC3{q>1+?zu!H8k5aB(J~R$
zaBw`egf6G?I3Jnj=`&{$1@eh{^oSyw(1^MjwL9S)a1J;JoCD4Q=fFHTfO|H#TETr^
zjk?}B;2b!X4)FRA;NTeQ7^^6k4s>!0fav42Y<Q1-fXoSW40ViEl&P3g?H+_q6?%&y
zR6523mLrBb#wx0G5-Od9t}OHpMab&N3#6PxsG{qg1I~f01H5-XNh>tO>$bIj$6mgF
zzuxLbgP~0G-`y$G4x(nW(~mmP)OOcCem;F|f2CZ%`B(bkw!yNnfvIT;++)1jc-pW{
z1JLi_C!5;)d9he&GQV0q_iKDzG8fD{h*ILC)fTV6$GkpW#?z4z^(<fM-b-`LWZM7m
zDe-ZdYf|KmTXjj+t<qIlcQEVCr5C7djGDFIetWhyQGQs8)PsD5Rp0x90<=Ik@Y%F!
zi~5LT`?o*f1${<ga{PXNka&<$r7XoNi$~oJ7U?GZV3sbPRdJlTW~yhvl%q1a)(@xG
zORh3yD_2^4l>mitCv0i95k0^a{ls$2`@w&&XEY`oJ^h||mZM9_%5*l@9&??bRqD_!
zIM&8D?Jn4Q^w?ta->(<xOukY5FyYIc)4axy(psF=H_W*RPX3-fqy`9gcy+KSz1Ls!
zRVL$wt@FuxkTai2Sgy4ADlzl9<{X#@2Pz6;nb(sm#n1oe0o5@$2b=@{$N}LuTg?V0
z*L&+s84qUy92+>eu`X6orl4a9pO@Ql#OXf_@jlRFp^mYN7(x3F4+7l%Upnu)<Ltm6
DkVk2Z

literal 0
HcmV?d00001

diff --git a/specifyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/Form.test.tsx.snap b/specifyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/Form.test.tsx.snap
index 85bd1a4cb51..f3058a02cbf 100644
--- a/specifyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/Form.test.tsx.snap
+++ b/specifyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/Form.test.tsx.snap
@@ -50,11 +50,11 @@ exports[`<Select> select multiple calls onValuesChange 1`] = `
   >
     <option />
     <option
-      class="dark:bg-neutral-100"
+      class="dark:bg-neutral-500"
       value="a"
     />
     <option
-      class="dark:bg-neutral-100"
+      class="dark:bg-neutral-500"
       value="b"
     />
   </select>
diff --git a/specifyweb/frontend/js_src/package-lock.json b/specifyweb/frontend/js_src/package-lock.json
index 874f6d4c7cc..3f372fb0a43 100644
--- a/specifyweb/frontend/js_src/package-lock.json
+++ b/specifyweb/frontend/js_src/package-lock.json
@@ -102,7 +102,7 @@
         "tailwindcss": "^3.4.1",
         "tsx": "^4.19.3",
         "typedoc": "^0.23.23",
-        "typescript": "4.8.4",
+        "typescript": "^4.8.4",
         "webpack": "^5.97.1",
         "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^4.10.0",
@@ -16338,6 +16338,7 @@
       "version": "4.8.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
       "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/specifyweb/frontend/js_src/package.json b/specifyweb/frontend/js_src/package.json
index 404c36bbad2..e62d9c5d478 100644
--- a/specifyweb/frontend/js_src/package.json
+++ b/specifyweb/frontend/js_src/package.json
@@ -122,7 +122,7 @@
     "tailwindcss": "^3.4.1",
     "tsx": "^4.19.3",
     "typedoc": "^0.23.23",
-    "typescript": "4.8.4",
+    "typescript": "^4.8.4",
     "webpack": "^5.97.1",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^4.10.0",
diff --git a/specifyweb/specify/.DS_Store b/specifyweb/specify/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..753eebea2a66e085d0398a2ebd56a4eea94009b4
GIT binary patch
literal 6148
zcmeHKu};H44E2=`A??tS@kSW?2cZfqNG$yTXbCDv38|o6nDR;d1tY(JnD_@4p6#O~
z3PGJvg>1?9E<XFtd3TC)MC2yxY)mvFq6o^^+eh<*@HlHrdcnejPUe`=if*Z-J9=n&
zn_(9j;Ju5fz^*Omo@)D-FUHfWvRF#e1A6Q7E6OyT=j9yZ(c}B!$Lj3)xZ5||+IM+V
zTYvb9DQSp2OUme)a-6RVTFYrezmaQvI{VGHp6|=~(O15ma~I`z&fEAm@{XT4Zxds{
z7%&EQjRDkbmS~`8tubH>7y}yy`1|0Yj7h*sQ9d1L<O%@n!z_Y6-z7N42TTH1iWq@7
z4Fzhb3s(%M;jsJQmjtX7HJqHRjCsP!F5FO@tPZ;ucXElMwZ?!k&}3jwA4gpOPrC2_
z%^-U+28@A!#enOl({zGY3bnQMa$IXY^b*R#ewE@T1RW{G@a0l`02P7Va|f6NtQ28^
P*pGnFV2v^Grwn`o=A>T-

literal 0
HcmV?d00001


From 75b393d164eca32ba22da1abe2e956a44f705ab4 Mon Sep 17 00:00:00 2001
From: kwhuber <kaden.huber@gmail.com>
Date: Wed, 3 Dec 2025 11:37:09 -0600
Subject: [PATCH 3/8] pr updates

---
 specifyweb/frontend/js_src/.DS_Store             | Bin 6148 -> 0 bytes
 specifyweb/frontend/js_src/lib/.DS_Store         | Bin 6148 -> 0 bytes
 .../frontend/js_src/lib/components/.DS_Store     | Bin 8196 -> 0 bytes
 specifyweb/frontend/js_src/package.json          |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 specifyweb/frontend/js_src/.DS_Store
 delete mode 100644 specifyweb/frontend/js_src/lib/.DS_Store
 delete mode 100644 specifyweb/frontend/js_src/lib/components/.DS_Store

diff --git a/specifyweb/frontend/js_src/.DS_Store b/specifyweb/frontend/js_src/.DS_Store
deleted file mode 100644
index 449b05a7293df12e9e07acc6602029a5153da1c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5T0!-MD)<3y=Z)df`=YsjZe^%ASf|K#l#e(_gn?9UIgF4y9d4bEWUte
zzu6huEwROuNST4zZ!<re$rs3Eh{z46d7r3DL=lv+wTa~iVLxj_T54gZ<1_lBi>jP>
z>tiF@4F8b<es^su=$f+PGJJm<&vQ>%rD;}F87$HM!Oh_5^y4t}<}19DtKihv7o^cP
z-BLw4jp>X^znh|hG2Mj~^mgyRR>g)j^*#r0M<>3frDvDbyvpCihjs5gymQ?q#(*(k
z46F+S=-DjMmY}W1fH7bU%oyPBLkwk16l+2M>A>Pg0AL4ZFWB=e!8x&FqF4*U196fH
zlvJl9hLd#IV~tA`Ye7jTr^AQSJ3F0FoWDEHk9|0~M9@}az!+F$pe>hO?*GTj=l{hd
zyD|ohfwf}5b<$Bf#3N~MZ9E+J+8BBcW#PD5aF&9NZ^ek^R=flC0(;CGV4_$H!UC}$
N0Z)T1#=xI4@D1(^QL+F4

diff --git a/specifyweb/frontend/js_src/lib/.DS_Store b/specifyweb/frontend/js_src/lib/.DS_Store
deleted file mode 100644
index d55ee0757fb5916944ddbdec45e5723d76e6cb4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOG?B*5UtKch>DVh3&BmUFyH~=5H~JdI2Vxl;D^KxjI)*AcnMG88QgdWHy%Y_
zbr&%q6L2LmR6*72R9AI(UP3BGL}s#HjEPbrN}!C<F3bkudDfmp;^9f-*Rb?JOXwr5
zdeQ3mj|}j$+oL&Is;Gu-o?m%0p3ZGm`$J!*A474KEs9xbXP8e;kDi|2uHMgvV;8@U
zt#4cV-#aWxJG91|bw?$wI;V?X4!X1LGaZh;K2I+EnOgak{W;0zh|d1;EAOwO3@8K2
zz_u`en$42z2UM#JC<Dqs!vKFDGALs%=mPpr2aIn4fHB-&Fy>x@b27nP&;`T{#Dr8}
zNHx-8n2-*CCULo-3mDSLNb_N2XCobo@w;RF%!iZ71FBU9lz}b-qi~sW{XZY>|GP<g
zr3@$oTg8Bhi)k^zElF+d-5l5240;V^;W!ttNx{IEV#IPOK8AXMKjQ%~7jyyPf#{Eb
Mr$LP}@TUxX15ut(r2qf`

diff --git a/specifyweb/frontend/js_src/lib/components/.DS_Store b/specifyweb/frontend/js_src/lib/components/.DS_Store
deleted file mode 100644
index a766c93d0bdefad0fcd86f7ec00282ee17710a11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeI1y>HV%7{=do95tm3jFpg(2S7q%$-wT0z`%!uh@chf&?HSMBB`U06tRHC#$Uk1
z%*uqs)`>3s2?*G_fCNJqVBmT0&hcIRQ86GQ^)B+gsqcC3{q>1+?zu!H8k5aB(J~R$
zaBw`egf6G?I3Jnj=`&{$1@eh{^oSyw(1^MjwL9S)a1J;JoCD4Q=fFHTfO|H#TETr^
zjk?}B;2b!X4)FRA;NTeQ7^^6k4s>!0fav42Y<Q1-fXoSW40ViEl&P3g?H+_q6?%&y
zR6523mLrBb#wx0G5-Od9t}OHpMab&N3#6PxsG{qg1I~f01H5-XNh>tO>$bIj$6mgF
zzuxLbgP~0G-`y$G4x(nW(~mmP)OOcCem;F|f2CZ%`B(bkw!yNnfvIT;++)1jc-pW{
z1JLi_C!5;)d9he&GQV0q_iKDzG8fD{h*ILC)fTV6$GkpW#?z4z^(<fM-b-`LWZM7m
zDe-ZdYf|KmTXjj+t<qIlcQEVCr5C7djGDFIetWhyQGQs8)PsD5Rp0x90<=Ik@Y%F!
zi~5LT`?o*f1${<ga{PXNka&<$r7XoNi$~oJ7U?GZV3sbPRdJlTW~yhvl%q1a)(@xG
zORh3yD_2^4l>mitCv0i95k0^a{ls$2`@w&&XEY`oJ^h||mZM9_%5*l@9&??bRqD_!
zIM&8D?Jn4Q^w?ta->(<xOukY5FyYIc)4axy(psF=H_W*RPX3-fqy`9gcy+KSz1Ls!
zRVL$wt@FuxkTai2Sgy4ADlzl9<{X#@2Pz6;nb(sm#n1oe0o5@$2b=@{$N}LuTg?V0
z*L&+s84qUy92+>eu`X6orl4a9pO@Ql#OXf_@jlRFp^mYN7(x3F4+7l%Upnu)<Ltm6
DkVk2Z

diff --git a/specifyweb/frontend/js_src/package.json b/specifyweb/frontend/js_src/package.json
index e62d9c5d478..404c36bbad2 100644
--- a/specifyweb/frontend/js_src/package.json
+++ b/specifyweb/frontend/js_src/package.json
@@ -122,7 +122,7 @@
     "tailwindcss": "^3.4.1",
     "tsx": "^4.19.3",
     "typedoc": "^0.23.23",
-    "typescript": "^4.8.4",
+    "typescript": "4.8.4",
     "webpack": "^5.97.1",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^4.10.0",

From 2136eee1b86fcfadef98be6b301ffef091faa0cc Mon Sep 17 00:00:00 2001
From: kwhuber <kaden.huber@gmail.com>
Date: Wed, 3 Dec 2025 11:39:55 -0600
Subject: [PATCH 4/8] .env adjusted

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index a65260454e3..8473a84c7a8 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 DATABASE_HOST=mariadb
 DATABASE_PORT=3306
 MYSQL_ROOT_PASSWORD=password
-DATABASE_NAME=uw_geo_collections_2025_09_09
+DATABASE_NAME=specify
 
 # The following are database users with specific roles and privileges. 
 # If the migrator and app user are not defined, the system will use the master user credentials.

From e82f327067aea3afc2a6961d7b5787d6261f1c95 Mon Sep 17 00:00:00 2001
From: kwhuber <kaden.huber@gmail.com>
Date: Wed, 3 Dec 2025 11:41:14 -0600
Subject: [PATCH 5/8] removed 2 files

---
 .vscode/launch.json   | 31 -------------------------------
 .vscode/settings.json | 23 -----------------------
 2 files changed, 54 deletions(-)
 delete mode 100644 .vscode/launch.json
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 41ce5c5f4df..00000000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Run Django",
-      "type": "python",
-      "request": "attach",
-      "pathMappings": [
-        {
-          "localRoot": "${workspaceFolder}/specifyweb",
-          "remoteRoot": "/opt/specify7/specifyweb"
-        }
-      ],
-      "port": 3000,
-      "host": "127.0.0.1",
-    },
-    {
-      "name": "Run Worker",
-      "type": "python",
-      "request": "attach",
-      "pathMappings": [
-        {
-          "localRoot": "${workspaceFolder}/specifyweb",
-          "remoteRoot": "/opt/specify7/specifyweb"
-        }
-      ],
-      "port": 3001,
-      "host": "127.0.0.1",
-    }
-  ]
-}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index ce16f58ca76..00000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-    {
-        "python.testing.unittestArgs": [
-            "-v",
-            "-s",
-            "./specifyweb",
-            "-p",
-            "*test*.py"
-        ],
-        "python.testing.pytestEnabled": false,
-        "python.testing.unittestEnabled": true,
-        "python.linting.mypyEnabled": true,
-        "python.linting.enabled": true,
-        "typescript.tsdk": "./specifyweb/frontend/js_src/node_modules/typescript/lib"
-    },
-    {
-        "typescript.tsdk": "./specifyweb/frontend/js_src/node_modules/typescript/lib",
-        "eslint.experimental.useFlatConfig": true,
-        "eslint.workingDirectories": [
-           {"pattern": "./specifyweb/frontend/js_src/"}
-        ]
-    }
-]
\ No newline at end of file

From a2bdfb3f82dee1438c6560bdd782f4ca30ae3447 Mon Sep 17 00:00:00 2001
From: kwhuber <kaden.huber@gmail.com>
Date: Wed, 3 Dec 2025 11:45:12 -0600
Subject: [PATCH 6/8] reverted to default files

---
 Dockerfile               | 27 ++++++---------------------
 docker-compose.yml       |  6 ++----
 manage.py                |  8 +-------
 requirements-testing.txt |  7 +------
 4 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fc2402945c0..947b97aa9a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -185,6 +185,9 @@ WEB_ATTACHMENT_KEY = os.getenv('ASSET_SERVER_KEY', None)
 WEB_ATTACHMENT_COLLECTION = os.getenv('ASSET_SERVER_COLLECTION', None)
 SEPARATE_WEB_ATTACHMENT_FOLDERS = os.getenv('SEPARATE_WEB_ATTACHMENT_FOLDERS', None)
 
+REDIS_HOST = os.getenv('REDIS_HOST', 'redis')
+REDIS_PORT = os.getenv('REDIS_PORT', 6379)
+REDIS_DB_INDEX = os.getenv('REDIS_DB_INDEX', 0)
 CELERY_BROKER_URL = os.getenv('CELERY_BROKER_URL', None)
 CELERY_RESULT_BACKEND = os.getenv('CELERY_RESULT_BACKEND', None)
 CELERY_TASK_DEFAULT_QUEUE = os.getenv('CELERY_TASK_QUEUE', DATABASE_NAME)
@@ -192,6 +195,8 @@ CELERY_TASK_DEFAULT_QUEUE = os.getenv('CELERY_TASK_QUEUE', DATABASE_NAME)
 ANONYMOUS_USER = os.getenv('ANONYMOUS_USER', None)
 SPECIFY_CONFIG_DIR = os.environ.get('SPECIFY_CONFIG_DIR', '/opt/Specify/config')
 TIME_ZONE = os.environ.get('TIME_ZONE', 'America/Chicago')
+ALLOW_SUPPORT_LOGIN = os.environ.get('ALLOW_SUPPORT_LOGIN', False)
+SUPPORT_LOGIN_TTL = int(os.environ.get('SUPPORT_LOGIN_TTL', 180))
 
 # Resolve ALLOWED_HOSTS in the following precedence:
 # - Use the ALLOWED_HOSTS environment variable (if present)
@@ -260,26 +265,7 @@ USER specify
 
 COPY requirements-testing.txt /home/specify/
 
-RUN ve/bin/pip install --no-cache-dir -r /home/specify/requirements-testing.txt
-
-# RUN mkdir /opt/specify7/.vscode
-# RUN echo "[pytest]\nDJANGO_SETTINGS_MODULE=specifyweb.settings\npython_files=*test*.py testparsing.py\naddopts = --ignore=specifyweb/specify/selenium_tests.py" > /opt/specify7/specifyweb/pytest.ini 
-# RUN cat <<EOF > .vscode/settings.json
-# {
-# 	"python.pythonPath": "ve/bin/python/",
-# 	"python.testing.pytestArgs": [
-# 		"specifyweb",
-# 		"-s",
-# 		"-vv",
-# 		"-o",
-# 		"python_files=*test*.py"
-# 	],
-# 	"python.testing.pytestEnabled": true,
-# 	"python.testing.nosetestsEnabled": false,
-# 	"python.testing.unittestEnabled": false
-# }
-
-# EOF
+# RUN ve/bin/pip install --no-cache-dir -r /home/specify/requirements-testing.txt
 
 COPY mypy.ini ./
 
@@ -292,4 +278,3 @@ RUN mv specifyweb.wsgi specifyweb_wsgi.py
 
 CMD ["ve/bin/gunicorn", "-w", "3", "-b", "0.0.0.0:8000", "-t", "300", "specifyweb_wsgi"]
 
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 353a9523b23..35ab232b831 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@
 services:
   mariadb:
     container_name: mariadb
-    image: mariadb:10.11
+    image: mariadb:11.8
     volumes:
       - "database:/var/lib/mysql" # the data directory for mariadb
       - "./seed-database:/docker-entrypoint-initdb.d"
@@ -33,8 +33,6 @@ services:
     build:
       context: ./.
       target: run-development
-    ports: 
-      - "3000:3000"
     command: ve/bin/python manage.py runserver 0.0.0.0:8000
     init: true
     restart: unless-stopped
@@ -117,4 +115,4 @@ volumes:
   attachments: # the asset-servers attachment files
   database: # the data directory for mariadb
   static-files: # provides Specify 7 static files to the web server
-  webpack-output:
+  webpack-output:
\ No newline at end of file
diff --git a/manage.py b/manage.py
index 12212617947..4b6b9c80f54 100644
--- a/manage.py
+++ b/manage.py
@@ -7,12 +7,6 @@
 
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "specifyweb.settings")
-    from django.conf import settings
-    if settings.DEBUG:
-        if os.environ.get('RUN_MAIN') or os.environ.get('WERKZEUG_RUN_MAIN'):
-            import debugpy
-            debugpy.listen(("0.0.0.0", 3000))
-            print('Attached!')
     try:
         from django.core.management import execute_from_command_line
     except ImportError:
@@ -28,4 +22,4 @@
                 "forget to activate a virtual environment?"
             )
         raise
-    execute_from_command_line(sys.argv)
+    execute_from_command_line(sys.argv)
\ No newline at end of file
diff --git a/requirements-testing.txt b/requirements-testing.txt
index 129049a116d..21bba85648c 100644
--- a/requirements-testing.txt
+++ b/requirements-testing.txt
@@ -3,9 +3,4 @@ mypy==1.5.1
 hypothesis>=6.131.9,<7
 hypothesis-jsonschema==0.19.0
 types-requests==2.28.5
-lxml
-debugpy==1.6.5
-pytest==7.2.1
-pytest-django==4.5.2
-django-extensions==3.2.3
-# django-debug-toolbar==4.4.6
\ No newline at end of file
+lxml
\ No newline at end of file

From be56b397bc37a4a3bec7ce851d6aacb195d21bf9 Mon Sep 17 00:00:00 2001
From: kwhuber <kaden.huber@gmail.com>
Date: Wed, 3 Dec 2025 11:53:13 -0600
Subject: [PATCH 7/8] removed DS_Store

---
 .DS_Store                     | Bin 10244 -> 0 bytes
 .github/.DS_Store             | Bin 6148 -> 0 bytes
 specify7/.DS_Store            | Bin 6148 -> 0 bytes
 specifyweb/.DS_Store          | Bin 8196 -> 0 bytes
 specifyweb/backend/.DS_Store  | Bin 6148 -> 0 bytes
 specifyweb/frontend/.DS_Store | Bin 6148 -> 0 bytes
 specifyweb/specify/.DS_Store  | Bin 6148 -> 0 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 .github/.DS_Store
 delete mode 100644 specify7/.DS_Store
 delete mode 100644 specifyweb/.DS_Store
 delete mode 100644 specifyweb/backend/.DS_Store
 delete mode 100644 specifyweb/frontend/.DS_Store
 delete mode 100644 specifyweb/specify/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 1b6c0564f459cd52c4a71a3db937748c8eb82d9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10244
zcmeHML66%+6n@_BZk$b_QPrY~3dslwaoC1U3%f<2Doqo?QlMg!QX$F)dy^*CI(A6B
zn?|ceQ7=fqi6bEX0*F%&TsR?d0)fgAi8JhxOAqk9v9}pJcIc&m#Edk4<MDfM-uJzk
zamFDct-RAL5*b9Kqq58&#U-KebFNcmF6>!_)L>6eyI9-uy1gk))u9+r3@8Q^1BwB~
zz<-4SytBFJxj?F`Vn8vV7`Vp(?+*ql%Tg%EffQQ@F5(CPIgf5p(9UxM(g<ZKl;c3+
z35ph&LI$Q<c*M{GbMzabUMZC0KnCWdg@+F<99aubD4G}@{tcl{S}Bm~su)lVOf$e|
z_jxK%n{4vs^LysblOM~^x?ZJXIi7_+eXsM?<|o&`y%>GoocX-hnS2|_{91x3We&%s
z4(*U7k52T_3)32M4BEzp@4^^je!AWyl5{OO9tw61_OnX^+9Hpd)QZNla3PFG(vaiX
z`1HrGH(wW=#Qezdq-#au2{yl@bctS~i}V`3NL6};u0R&3OU-r1+X{2R+a2ej@TVwf
z5wYDm)zM#vyaM|IFx{XVF}p8fc8dbJ3r(BaQC;n^S-LV)n)CDT(2e+#d9uIx{+H7)
z3!Y*+ldPrb$Q)@tMj<)|tc<Wu8^Btos{%7KmcW$uAuMF3a-3)2H8KAj@?qlw`^_kJ
z!SCl1zsF(afvauU_UVjZtxG-h4bW4d5pv|jd@$Ftj}tK;EsX5L+erAa#a#jZI#E9&
z53-*nsz|YL<{WCpY#6m{lfhhC2X9sIR-<ZEo6%|yOK5d^75p&PMDGM-5&bOCn~2}U
zp2BSOXcQfRF+?nMSTODpv>CY_(?|Rf{Uzw|e&y0lSnz7aoQ>KD6z@qWvX~!L^j3hT
z3ajZ=#5iP&Q^-b(-o?zYMXQTD&d~rF_t75U$}zOz%||4DGy;KA_Loofmu%0dW&0fG
z3R$}<W_q38Ohs`Z;eJTW$rfhY8B`OInq;A3rY6LDpO*4^zkF-$56rI_<H)Q3hiC7e
zH)~?`&$O8A1@~tm?+ll3i4V{xfw4zx)BtV^S6-Vwve`p>3vZm3SiuQvOw1jb30-(%
zeH&|FL~AkTI8!tAt>K^-?$@`io?{REm6bc%+>!Z(#f+ZObNbu0jyJ6NroS^NoBg-=
zuI_n`b=WqoH|*B1kw0<CbA8ixTYX_*H(OA-e$959-mvWLxXppEtpyMCte$P;PwnlU
zU0qo=&J~OM%f{YwXN$|mGv`+K_p|!RC!T(Oqp|IDUGD?r5Jl4hiF`&2?;%q>$n#*K
zdGLOcj-37e>Fx93JA2BP{Fa=hCue%`H<9TnU%R!w>v(P(@i3mHSpJ5{y%o(N=X`Ec
zS~rO{GTuiIerl%qmN8$ueeZWlqE8w3-|5QOAOGx243GC8&+^IK6xgsc4AGB0GK!Ml
ze-V_ABw9DHKlD(8Rg$*DV!w>|I-cTd7i%po9=r)6J{XZIiUGxdVn8wQpcyz43}ECS
ztLgv$Kj<)&f5m`e;9q1wo3GR=Wdv~e<3An?e`_~T-$CWVdgDL}6I{gScu4U%9yk0s
h{wY+}U17-u?NTVmfkY3=KmKQcI{&Nl|Ns2_{};E;cQOC~

diff --git a/.github/.DS_Store b/.github/.DS_Store
deleted file mode 100644
index 9dca596f8a793f47055de09ec5173d23a13259e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOG*Pl5Phu?;)f8(MsPD%$PFfOA}Ib~bf+jW7{P>ziex)SaP1x3xOL%5+<O6+
zUc*=2O`IVyi3k#;Ds;V`nyT)uH*{ATfT`cMsz4b)kxj6$L^VR>y|f{j^OhB&v11$}
z=5G^w*d6j#gEF8D%o+o-cPogvXJf1*yMIq`fChH3k8RYX-)UFlv!vT|DJ)z~AK6W!
zsM$%Hj3}0$p5NEDUTZ&zZv7&<cadGSoO3AIY-48Iz=SMIFO&SUxmDf<xs9Epn|x(7
zZA?CoQ1Vzr9|^8;iF0(=>*FT>jgH%+y|Qb5eE8V7KeFFr#CX}2j`z&3?@rdIGTRKW
zW{VV;9jaCalmTU6z<`_&0h?gxF?DE<4k~*EAQou0!oIDs#6S$h&|~V57K(A9L>FrO
z6~nl2+5_(wdQ2U<a2Pu?$MG{8e?u{LcG?5$4ih?5tqdpwc?Ra)V_E8d<NN!6K1iRG
z0cGG{F<=T&9MzeUudPGLNv#doPT54nFLh``sC+rL9Vx}DY*zR#kPb2Qm^!3|qJIP|
L4XTuZKV{$(RfmNh

diff --git a/specify7/.DS_Store b/specify7/.DS_Store
deleted file mode 100644
index 23d7b1f05ad7197bf5efe7c7a54adcdd4c8cbc2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJ5Iwu5S<MHS)xfvxmU;ymdIRyTmS_lC}KHHD3Ke)sc2}p4B`yD`2-WJNK{CO
zH`2`8ot>GrU*YkHNLp;0xyVdJDyX77sTqr&tBzz6o+&VCjq9%6sPDLWKTs<&2GHDz
z+{?}ScE0?UZ~nHc>(#njA+BnlA0A&WU(a_rZPy$;+uRNHPTuUXhFiHJ17v^<kO4CA
ze;Gi}R;f-MX~_T?AOoKa==UK*6-!|6XrB%k8v%g&8*hTO%@V+@4qyrF9pQl_PX&5v
ziV-7uI{Z1}N?`Bk>5}Yb)QOu@Oeo22hd*1mq~b_R2FSoZ14q7{Y5%`~{&Z&FufiP}
zAOnAyfi$g`^#X4Yy>;|1+G{iP3c3@-S~!fgVxYBRY_t`heTmDu#(4?s9W5PxO9%2t
MKzX5%f!|=@1GoJt?*IS*

diff --git a/specifyweb/.DS_Store b/specifyweb/.DS_Store
deleted file mode 100644
index c502bc823f25d6934f424db8dae5f05116da8583..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeI1ziSjh6vy9q2QHq1SOtSHMFh1<ER2n?38zGD0x2vEoVmNr5AN1Iau?*f#lpr$
zEK~UhSc-jY0)l97VM;-?v$F9!Z-%>>o7;;vBDtAk=WTYsZ}xNF*&p{dL?o8?nhQiT
zL=<6B@q7i{n5Oot#cQX`7Ktd3Pt>3dEZdY&%~OXB!GYjFa3DAk90(5l4-Vj&ty)y@
z+}C?U9~=k{Or-<r{vffa7@L^u$hQu3Tmm4Lv6&mzQ3r62G%+?Y*O5~(rmh}@NfoBV
z5IP<ErII7YCgwWobP_t9ggLS>6^h`aBTurNM66@zg9E_<-vNnD6;$gr>QLXQ-)rry
zg|$YOc68F&2gS-Xt5)mntPVx=a_-s3OZN_!CaIf$q3&$k6cWSIX{z&kh8Es4Jf^0@
zx%m2<udw-6ueNUPuQT7sIB7QIDpol>D{Rg=@a$2Sc0iLLc4-%Xx7E7CM&+Mio1nHi
zOV=;|>fL9~i5WxYKg)3V_02Y-O%P|G@A-~iyw?8;YENUcK0Unk-gr7jHzb^-v$^EK
z5e`XbD21m@e3X|@Fz36JxQ@=sBAv~*__=g6tIx@?W7;!+oYv+fnpd0^TssNa6s?;5
z9rki$?xP>YN}KiJmjP?RxHj$aYL}Ovju99W%yo~?*samCG+hU&r?DB|UHN`zFyA9%
z*>v-7?`~XJ<#X5@&*gfBL*lybvXc#PZBpNv>E|Eb_zIh;b;G)@opEfUVwJ=5;*;VD
zEjVzJ9VqE9H>2wR+r{tyPqGE!y9EcP-T_gru2q*|gQ=}OLsYFTu{^?}n$qPuatb;w
r#}T<4M;!da5bF|Bl@pto>xeCA|NKS3@YlcdD<M4pc{)NjB@X-s<yJhI

diff --git a/specifyweb/backend/.DS_Store b/specifyweb/backend/.DS_Store
deleted file mode 100644
index 2ef22b565edb78a3075d4ecbb9ec04d91dd16792..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJxfC|6ur@kwN>dLA~^UE1vlyFB2TF(x(F_AYCq88tFN{eN8e8o90d{of`gNw
zi>r%2z}>}jlT;I5`>czI<d)>*<KE=tke4(>B$iv{JW-B_(nyS{46+W!{hVUfr(4E=
zLXOd*I_=O2h4?vh3OEJ+x&r*|W~oSfRH8#NzuzF(&u^8&T3sz+exbW(Ei4p@L0E)G
z`s(8Gd2;=3DapJ11Mm8Q$zqeqjDT;8npCADssNkRKt15H#knt-PWCo=FP_i5ooq<n
z3FFtoPwu@%So{ZGng1Y8$vvEsB|3<4rYTnLi-*Z`{PL--Z_MkHTX!#u4?QrSQ7Fh~
zb^~n6IKPjfW(BosjNQ=N&3FDL*VX&8?UvFsaSl_}USq6v4D&K*h)(4y4zWKf*c;H-
z+7Id5wa#89=a;$J_CDw^p2;-X)8d!8mIVJ;hC7=romJ>^r+`zyDe$2HpAQ}qqpvYi
zD31<g@(BP;p;;QrIW7P_jlRZ6A$nj!g#uNm&`%7Z!qM(&KVM^{P=%9_Gh-Y*v(PUT
zA!kRsC*4W-3SI6La0=K8^s8!)@BfwV?|(bU)tmxOfq$idNENmU%UF`WTVspkyVgV6
rMPg&WNTCctrmtgJ;H!87NgDb*E&zRvkwUb<+#dlcgUg%(zpB7HpP1Cn

diff --git a/specifyweb/frontend/.DS_Store b/specifyweb/frontend/.DS_Store
deleted file mode 100644
index e7f6a9fee08dfda6f49be6d0a3c13eae2ad326b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOG*Pl5UtWE18%a^U0)$5a17%KvJwO(6Hp{!g5ti9;M&W$a3P3?@>N%<Ofuju
zh`fU8SKalQnFrI|B_cX~Tuem9B2qyO)r<kL<w4h81do7PYTQe^yqV0}ZnYjL^cR=x
z-4EqX9^?wT@%|^TFCUx!Ro680WjDuq)gGL_KVQC`ZO1HrjalFR@RTl|P=Z1R$N(82
z17u()4B*T*sg4{uk^wS62EG}v{UJdO>%i<-whj!X1pwMLx(ICRB`hZe)`8g(9*BA>
z&{H*94E1!Zr--Wqv!kbrM)RTZ<geyM%hORmm2lD8ks}!(1APYeeLA-D{~W)}V3XfZ
z;fxHBfq%w;j+$9B#Ye^2y7hT>)+XpR)WqVl84%dLO8_Rej~o}L`;*y-s{^y6Rk8Jw
P4&+6k5W;~B?0|t!b`vh}

diff --git a/specifyweb/specify/.DS_Store b/specifyweb/specify/.DS_Store
deleted file mode 100644
index 753eebea2a66e085d0398a2ebd56a4eea94009b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKu};H44E2=`A??tS@kSW?2cZfqNG$yTXbCDv38|o6nDR;d1tY(JnD_@4p6#O~
z3PGJvg>1?9E<XFtd3TC)MC2yxY)mvFq6o^^+eh<*@HlHrdcnejPUe`=if*Z-J9=n&
zn_(9j;Ju5fz^*Omo@)D-FUHfWvRF#e1A6Q7E6OyT=j9yZ(c}B!$Lj3)xZ5||+IM+V
zTYvb9DQSp2OUme)a-6RVTFYrezmaQvI{VGHp6|=~(O15ma~I`z&fEAm@{XT4Zxds{
z7%&EQjRDkbmS~`8tubH>7y}yy`1|0Yj7h*sQ9d1L<O%@n!z_Y6-z7N42TTH1iWq@7
z4Fzhb3s(%M;jsJQmjtX7HJqHRjCsP!F5FO@tPZ;ucXElMwZ?!k&}3jwA4gpOPrC2_
z%^-U+28@A!#enOl({zGY3bnQMa$IXY^b*R#ewE@T1RW{G@a0l`02P7Va|f6NtQ28^
P*pGnFV2v^Grwn`o=A>T-


From 2eb73791bbf6af6c13996cfc49a8ffddb19e9e2a Mon Sep 17 00:00:00 2001
From: kwhuber <kaden.huber@gmail.com>
Date: Wed, 3 Dec 2025 11:56:13 -0600
Subject: [PATCH 8/8] fixed package-lock.json

---
 specifyweb/frontend/js_src/package-lock.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/specifyweb/frontend/js_src/package-lock.json b/specifyweb/frontend/js_src/package-lock.json
index 3f372fb0a43..874f6d4c7cc 100644
--- a/specifyweb/frontend/js_src/package-lock.json
+++ b/specifyweb/frontend/js_src/package-lock.json
@@ -102,7 +102,7 @@
         "tailwindcss": "^3.4.1",
         "tsx": "^4.19.3",
         "typedoc": "^0.23.23",
-        "typescript": "^4.8.4",
+        "typescript": "4.8.4",
         "webpack": "^5.97.1",
         "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^4.10.0",
@@ -16338,7 +16338,6 @@
       "version": "4.8.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
       "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"