Commit graph

1451 commits

Author SHA1 Message Date
Carter
840c3b0126 Merge branch 'pending_changes' into dev_environment 2026-06-25 12:33:23 -06:00
Carter
ffd5e0a769 preventing form updates when settings dialog is open 2026-06-25 12:33:14 -06:00
Carter
e8cc509915 less restrictive on receiving websockets 2026-06-25 12:15:49 -06:00
Carter
2992121744 Merge branch 'pending_changes' into dev_environment 2026-06-24 14:40:10 -06:00
Carter
b9a13c5781 fixed pending change race condition 2026-06-24 14:40:04 -06:00
Carter
b92768a954 Merge branch 'pending_changes' into dev_environment 2026-06-24 14:17:01 -06:00
Carter
879a5ae1f0 fixed pending state logic 2026-06-24 14:16:54 -06:00
Carter
e1a4443a38 merged pending changes branch 2026-06-24 13:14:42 -06:00
Carter
895ed8e50b opening interaction websocket to detect accepted pending changes 2026-06-24 13:13:14 -06:00
Carter
6b07859d00 Merge branch 'firmware_mismatch' into pending_changes 2026-06-24 12:13:50 -06:00
csawatzky
f73eb0fcbd proto update 2026-06-23 16:44:42 -06:00
csawatzky
728d07a07e proto update 2026-06-23 16:42:30 -06:00
csawatzky
e19e1f03eb Merge branch 'analog_pressure_component' into staging_environment 2026-06-23 16:41:36 -06:00
csawatzky
270df1a118 fixed unit from V to mV for analog pressure 2026-06-23 16:40:09 -06:00
csawatzky
0cc8a7878a Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment 2026-06-19 13:44:53 -06:00
csawatzky
f99f30a15e protobuf update 2026-06-19 13:43:14 -06:00
csawatzky
6ef69f8b98 Merge branch 'plenum_ambient_component' into dev_environment 2026-06-19 13:43:00 -06:00
csawatzky
d69d8b38f5 set up the new component types 2026-06-19 13:25:12 -06:00
Carter
935ee2c587 updated dev proto 2026-06-17 16:30:18 -06:00
Carter
376dcff7db Merge branch 'firmware_mismatch' into dev_environment 2026-06-17 16:19:53 -06:00
Carter
0984ae0f37 got rid of warning signifier on firmware print 2026-06-17 16:19:35 -06:00
Carter
ca2d1e3331 Merge branch 'firmware_mismatch' into dev_environment 2026-06-17 15:41:45 -06:00
Carter
d9846ea02b firmware renders with warning styling if it wasn't found in the server 2026-06-17 15:41:26 -06:00
Carter
19c4725991 merge email control and updated proto 2026-06-17 14:19:06 -06:00
Carter
b378764d62 added some info about email control to the control tab for the component settings 2026-06-17 14:11:43 -06:00
csawatzky
a4ed52db1e also displaying the inventory control type next to "Bin Fill" in the inventory summary and added a fallback to display the inventory in the bin using the basic grain fill when there are no nodes to be able to render the heatmaps, also adjusted the brightness and colour of the basic grain fill 2026-06-16 12:40:07 -06:00
Carter
c4999a0ba5 adding control emails to control component settings form 2026-06-16 12:32:43 -06:00
csawatzky
572d1001f8 proto update 2026-06-12 15:00:45 -06:00
csawatzky
1d98035297 Merge branch 'analog_pressure_component' into dev_environment 2026-06-12 15:00:11 -06:00
csawatzky
1051534bb5 proto update to stagings proto 2026-06-12 14:58:30 -06:00
csawatzky
bbc9c4ee7f changing some naming for the component 2026-06-12 14:43:37 -06:00
csawatzky
370134a401 Merge branch '3d_bin' into staging_environment 2026-06-12 14:17:54 -06:00
csawatzky
964af32ec0 commented out unused parts of the new bin page, dont know if they will be used in the future so that is why they are commented and not removed 2026-06-12 14:14:12 -06:00
csawatzky
cd5fbb29b7 changing the visualizer to use the bins status controllers rather than controllers being passed in 2026-06-12 14:05:32 -06:00
csawatzky
a6b31c30c9 implemented touch controls for the camera 2026-06-12 11:43:58 -06:00
csawatzky
e8c31b23ee adjusted the default zoom level when loading the bin page 2026-06-12 11:33:42 -06:00
csawatzky
ea13f97c57 more visual tweaks and design, fixed a coule bugs and removed some console logs 2026-06-11 16:48:00 -06:00
Carter
8c45dbd00e merged sendgrid whitelabel 2026-06-11 13:58:37 -06:00
Carter
7b1642bb1a changing user settings defined whitelabel when mismatched, giving team whitelabel if it's empty 2026-06-11 13:37:07 -06:00
csawatzky
f04213af1e full width on desktop scollable on mobile 2026-06-10 16:42:00 -06:00
csawatzky
124856baac made some changes to the checkbox for the labels, and made sure that the tabs are scrollable in mobile view 2026-06-10 16:40:50 -06:00
csawatzky
2cffc20daa finished some tweaks for the new bin page 2026-06-10 16:06:07 -06:00
csawatzky
87382dd5d8 cables now start at the top of the sidewall and dont go into the roof, added skeletons to the bin page for when it is loading, also fixed an issue with the camera being very zoomed in sometimes when the page loads 2026-06-09 15:47:44 -06:00
Carter
6acfa3c365 Merge branch 'sidebar_changes' into dev_environment 2026-06-09 10:20:54 -06:00
Carter
7dd7504415 hiding help when it's unavailable 2026-06-09 10:20:46 -06:00
Carter
51f86188a3 Merge branch 'sidebar_changes' into dev_environment 2026-06-09 10:06:47 -06:00
Carter
c35b6b1f15 clicking help opens chat assistant 2026-06-09 10:06:22 -06:00
csawatzky
f6de509561 finished tweaking the bin players visual aspect and controls, made some smaller visual adjustments and added a checkbox for showing labels 2026-06-08 16:58:47 -06:00
Carter
9d6af5dd16 added a help button at the bottom of the scrollbar 2026-06-08 16:19:46 -06:00
csawatzky
d30ed99ca7 play button works, just need to build out the controls 2026-06-05 16:06:32 -06:00