Carter
|
9216d5ee27
|
updated dev protobuf
|
2026-07-09 13:42:36 -06:00 |
|
Carter
|
637c0faa35
|
Merge branch 'tag_fix3' into dev_environment
|
2026-07-09 11:59:03 -06:00 |
|
Carter
|
487afc6464
|
removed component type logs
|
2026-07-09 11:58:32 -06:00 |
|
Carter
|
1eb00fd5a1
|
Merge branch 'tag_fix3' into dev_environment
|
2026-07-08 15:56:13 -06:00 |
|
Carter
|
3fc663a4b6
|
removed interaction logs
|
2026-07-08 15:56:03 -06:00 |
|
Carter
|
62cc25d775
|
Merge branch 'pending_changes' into dev_environment
|
2026-07-07 15:56:31 -06:00 |
|
Carter
|
71fb67bba4
|
pending changes indication for device and component changes
|
2026-07-07 11:28:34 -06:00 |
|
Carter
|
10f0aa46cc
|
merged staging
|
2026-06-30 10:51:17 -06:00 |
|
Carter
|
8706446108
|
proto update and audit
|
2026-06-30 10:50:29 -06:00 |
|
Carter
|
9534eed94c
|
Merge branch 'new_header' into staging_environment
|
2026-06-30 09:47:51 -06:00 |
|
Carter
|
d6603e394e
|
Merge branch 'new_header' into dev_environment
|
2026-06-30 09:44:11 -06:00 |
|
Carter
|
3eb66e3622
|
changed header to match new theme
|
2026-06-30 09:43:38 -06:00 |
|
csawatzky
|
5dc3a3e975
|
Merge branch 'bin_player_inventory_changes' into staging_environment
|
2026-06-29 14:17:48 -06:00 |
|
csawatzky
|
7666fbf9b6
|
update to the bin player to set the bin bushels in the status using the measurements from the bin measurements
|
2026-06-26 15:25:18 -06:00 |
|
Carter
|
64fcc934ce
|
Merge branch 'email_control' into staging_environment
|
2026-06-25 14:04:04 -06:00 |
|
Carter
|
cca981308d
|
Merge branch 'pending_changes' into staging_environment
|
2026-06-25 12:48:28 -06:00 |
|
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 |
|
csawatzky
|
4ea0d53c94
|
adding analog pressure to have the cable id show up for analog cables
|
2026-06-24 12:38:29 -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
|
939a53d072
|
had claude look at the bin player to determine how to take into account the component history for the top nodes
|
2026-06-23 16:25:31 -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 |
|