Commit graph

875 commits

Author SHA1 Message Date
Carter
36d7f17bc7 Merge branch 'auth_stuff' into staging_environment 2025-06-25 15:39:12 -06:00
Carter
e2bfa68ca9 Merge branch 'auth_stuff' into dev_environment 2025-06-25 15:37:13 -06:00
Carter
674763de24 saving preferred units on success 2025-06-25 14:10:02 -06:00
Carter
a43ff1a8ad added preferred units back to the user settings menu 2025-06-25 13:44:40 -06:00
Carter
45ea740f0b Merge branch 'auth_stuff' into dev_environment 2025-06-25 12:49:51 -06:00
Carter
437d0357b6 Merge branch 'auth_stuff' into staging_environment 2025-06-25 12:49:38 -06:00
Carter
d3314a1ab9 minor syntax clean 2025-06-25 12:49:14 -06:00
Carter
dd7d67c2d0 Merge branch 'auth_stuff' into staging_environment 2025-06-25 11:05:32 -06:00
Carter
b4877038f1 Merge branch 'auth_stuff' into dev_environment 2025-06-25 11:04:33 -06:00
Carter
338b256d13 took out the login page route again, auth redirect forces login page if doing a sign up 2025-06-25 10:59:20 -06:00
Carter
c983216910 Merge branch 'auth_stuff' into staging_environment 2025-06-25 09:59:19 -06:00
Carter
1b36170a91 Merge branch 'auth_stuff' into dev_environment 2025-06-25 09:59:00 -06:00
Carter
c7848a25ef put the login page back 2025-06-25 09:45:02 -06:00
Carter
15d2a6a690 moved login page logic into the auth file to redirect correctly before auth redirects because you're unauthenticated 2025-06-24 16:46:59 -06:00
csawatzky
898bb9e0f1 fix open weather CI variable again 2025-06-24 11:17:36 -06:00
csawatzky
b314069c86 fix open weather ci variable 2025-06-24 11:16:44 -06:00
csawatzky
f5bc230fb6 changed test button to load scans 2025-06-24 11:01:37 -06:00
Carter
5c4036e974 Merge branch 'team_share' into dev_environment 2025-06-23 12:22:45 -06:00
Carter
f900ba6c9d turning imitation to false when sharing team from the team page 2025-06-23 12:17:02 -06:00
Carter
2e78c3f03c fixed side navigator prop error 2025-06-23 10:24:38 -06:00
Carter
179cbcf542 default argument for page container spacing 2025-06-23 10:07:17 -06:00
csawatzky
7630b67bc7 Merge branch 'i2c_detect' into dev_environment 2025-06-19 12:02:12 -06:00
csawatzky
2c3ba2c1f5 updating the proto and adding a button on the device page to test the scan i2c command 2025-06-19 11:32:21 -06:00
Carter
78884da48c merged in team share branch and update proto 2025-06-18 16:19:29 -06:00
Carter
2a020eb6e7 added login redirect 2025-06-18 16:17:27 -06:00
Carter
e9dce3abc3 master proto 2025-06-13 15:40:30 -06:00
Carter
a2a6acd934 got rid of sticky header's background color 2025-06-13 15:16:57 -06:00
Carter
a13c19aba7 update.html was epmty for some reason? 2025-06-13 14:57:11 -06:00
Carter
ae55e9950e moved update html file to public 2025-06-13 14:45:59 -06:00
Carter
7aca89d715 merged streamline stuff 2025-06-13 14:37:23 -06:00
Carter
86e4b81b77 Merge branch 'staging_environment' of gitlab.com:brandx/bxt-app into staging_environment 2025-06-13 14:26:29 -06:00
Carter
6dd41b7f01 added update html to remove cache and service worker 2025-06-13 14:26:15 -06:00
Carter
1740160077 enabled more buttons in the side navigator for streamline 2025-06-13 11:28:52 -06:00
Carter
d684f6c39a added some streamline whitelabel stuff 2025-06-12 15:52:01 -06:00
csawatzky
10b9cb951d set spacing on device 2025-06-12 12:34:03 -06:00
Carter
fc5ce33445 took https out o fauth audience 2025-06-12 10:34:40 -06:00
Carter
b4204a1998 fixed streamline whiteLabel colors 2025-06-11 15:42:30 -06:00
Carter
af518b58a8 made streamline further up the whitelabel list so it doesn't default to agriculture by accident 2025-06-11 14:35:30 -06:00
csawatzky
769c35f0f7 changed the variant of the circular progress to show progress of the update rather than the looping animation 2025-06-11 14:34:52 -06:00
Carter
8a0c9491c8 added streamline whitelabel 2025-06-11 14:22:47 -06:00
Carter
bfe9d0dd8b trying to fix the tag for the streamline image 2025-06-11 14:01:11 -06:00
csawatzky
7ef12f1078 changing determination of empty to being less than 5 bushels because if hte auto inventory sets it to 0 it causes null issues between golang and the DB 2025-06-11 13:56:44 -06:00
Carter
de713ac8fc trying to fix the tag for the streamline image 2025-06-11 13:55:18 -06:00
csawatzky
d5f3cb727c fixed the centering of the gate cards 2025-06-11 13:47:02 -06:00
Carter
677012a145 pushing to the commit tag 2025-06-11 13:24:08 -06:00
csawatzky
fbc8703ae4 proto update 2025-06-11 13:05:29 -06:00
Carter
a85c958d04 using streamline private key for deployment 2025-06-11 12:27:39 -06:00
Carter
b89a539dd7 fixed build stage 2025-06-11 12:00:21 -06:00
csawatzky
8cfba48968 Merge branch 'co2_bin_activity' into dev_environment 2025-06-11 11:58:15 -06:00
csawatzky
41a17ded94 using co2 for the bin activity along with cables 2025-06-11 11:56:27 -06:00