merged in messages changes

This commit is contained in:
Carter 2026-02-24 13:01:21 -06:00
commit 13e2f689e9
66 changed files with 2105 additions and 609 deletions

8
package-lock.json generated
View file

@ -43,7 +43,11 @@
"mui-tel-input": "^7.0.0",
"notistack": "^3.0.1",
"openweathermap-ts": "^1.2.10",
<<<<<<< HEAD
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#dev",
=======
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
>>>>>>> messages_overhaul
"query-string": "^9.2.1",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
@ -11967,7 +11971,11 @@
},
"node_modules/protobuf-ts": {
"version": "1.0.0",
<<<<<<< HEAD
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#bcf085706791036841f7047a5b37f00c18e54574",
=======
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#ab9e8d4fd38f9af7802398403d38fddda5eb01da",
>>>>>>> messages_overhaul
"dependencies": {
"protobufjs": "^6.8.8"
}