Commit Graph

8957 Commits (e21676afc2e17ff6707009140a8d6478907e03bd)

Author SHA1 Message Date
Rick Carlino e21676afc2 First implementation of telemetry channel 2019-10-23 13:44:07 -05:00
Rick Carlino cb49531eb5
Merge pull request #1521 from FarmBot/cosmetic-fixes
Routine Upgrades
2019-10-23 12:18:51 -05:00
Rick Carlino 59b31a85d7
Merge branch 'staging' into cosmetic-fixes 2019-10-23 10:39:34 -05:00
Rick Carlino 987e0754ec Style and dep. updates 2019-10-23 10:34:31 -05:00
Rick Carlino ef15148c5b
Merge pull request #1505 from AscendFB/cosmetic-fixes
Updates to box-select and Select panel in FarmDesigner + some fixes
2019-10-23 10:22:21 -05:00
AscendFB 2f331f0f9d Try to keep 'selected' in a defined state 2019-10-23 12:15:53 +02:00
AscendFB d80309f129
Merge branch 'staging' into cosmetic-fixes 2019-10-23 12:00:22 +02:00
Rick Carlino 0445717cbb
Merge pull request #1513 from FarmBot/css_bloopers
Fix toast colors (whoops!)
2019-10-22 16:28:58 -05:00
Rick Carlino fce9acd721 Fix toast colors 2019-10-22 15:51:22 -05:00
Rick Carlino 604e985447
Merge pull request #1508 from FarmBot/css_stuff
Make the groups button a different shade of blue
2019-10-22 12:56:55 -05:00
Gabriel Burnworth 7d989e82b2
fix minor css bug 2019-10-22 10:35:33 -07:00
Rick Carlino 08f7e7373c
Merge branch 'staging' into cosmetic-fixes 2019-10-22 11:52:59 -05:00
Rick Carlino fd5ce8084a
Merge branch 'staging' into css_stuff 2019-10-22 11:47:24 -05:00
Rick Carlino 209a88c5e4
Merge pull request #1509 from gabrielburnworth/staging
Fixes and cleanup
2019-10-22 11:44:33 -05:00
gabrielburnworth 5d76123682 misc fixes 2019-10-22 09:03:00 -07:00
Rick Carlino d4824a5e63 Merge branch 'css_stuff' of github.com:FarmBot/Farmbot-Web-App into css_stuff 2019-10-22 10:39:16 -05:00
Rick Carlino ba8f326502 Fix failing test. 2019-10-22 10:36:34 -05:00
Rick Carlino da2b764be0 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into css_stuff 2019-10-22 09:36:34 -05:00
Rick Carlino f225a4279a
Merge branch 'staging' into css_stuff 2019-10-22 09:36:31 -05:00
Rick Carlino b473884621 Fix groups panel button, probably 2019-10-22 09:28:27 -05:00
Rick Carlino 29ecee243c
Merge branch 'staging' into cosmetic-fixes 2019-10-22 08:25:18 -05:00
Rick Carlino 3871a0b083
Merge pull request #1507 from FarmBot/css_stuff
Minor Update to Feature Flag
2019-10-21 17:35:54 -05:00
Rick Carlino 46bd4f2b32 Update feature flag rendering for `boot_sequence` 2019-10-21 16:17:05 -05:00
Rick Carlino fb388cc103
Merge pull request #1506 from FarmBot/real_release_candidate
Release Candidate II
2019-10-21 15:10:35 -05:00
Rick Carlino fed514c2e3 Linter fixes 2019-10-21 14:47:01 -05:00
Rick Carlino bfa2f2fd38 Test coverage increases 2019-10-21 14:37:16 -05:00
Rick Carlino 638821cf66 Possible fix- `customFilterRule` prop. 2019-10-21 10:47:13 -05:00
AscendFB 1bed755e88 Add dark-blue button css, so existing "light"blue buttons will remain as they were 2019-10-20 16:01:12 +02:00
AscendFB 8f593ea098 Merge branch 'cosmetic-fixes' of https://github.com/AscendFB/Farmbot-Web-App into cosmetic-fixes 2019-10-20 13:04:13 +02:00
AscendFB 49bbee536e
Merge pull request #11 from FarmBot/staging
Merge changes
2019-10-20 12:53:46 +02:00
AscendFB 71eda445df More changes mostly to #1426, also resolved #1385 2019-10-20 11:57:13 +02:00
Rick Carlino da5820f23b
Merge pull request #1503 from FarmBot/release_candidate
CSS, Nav Bar updates
2019-10-14 12:00:10 -04:00
Rick Carlino 4e3d499ccd Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into release_candidate 2019-10-13 15:52:55 -05:00
Rick Carlino d038f1268f
Merge pull request #1502 from FarmBot/updates
Routine Updates
2019-10-13 16:51:44 -04:00
Rick Carlino 8d83215bd9 Add new FBOS informational_setting fields, hide some links, expose others. 2019-10-13 15:48:11 -05:00
Rick Carlino 66817cc21a Merge branch 'updates' into release_candidate 2019-10-13 15:29:12 -05:00
Rick Carlino 1901dd3a20 Update Gemfile.lock 2019-10-13 15:20:36 -05:00
Rick Carlino 75cabbf90a Final updates (Ruby version) 2019-10-13 15:14:58 -05:00
Rick Carlino 3c09d0bb1a Updates, part III (Bundler) 2019-10-13 14:50:40 -05:00
Rick Carlino 1c5e03d54c Updates, part II (blueprint) 2019-10-13 14:29:44 -05:00
Rick Carlino 16d4966361 Updates, part I 2019-10-13 14:20:53 -05:00
AscendFB 5bfa90e53d Issues #1406 , #1495 , #1411 , #1426 2019-10-13 18:41:29 +02:00
AscendFB 9a249b3416
Merge pull request #10 from FarmBot/staging
update
2019-10-13 18:35:50 +02:00
Rick Carlino d44e3e5944 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into release_candidate 2019-10-10 15:16:25 -05:00
Rick Carlino 65226a32e4 WIP 2019-10-10 15:13:35 -05:00
Rick Carlino a2487d9b2e disallowGroups => hideGroups 2019-10-10 14:47:09 -05:00
Rick Carlino e353eda31f New LocationForm prop: `allowGroups` 2019-10-10 14:26:13 -05:00
Rick Carlino f84fa4275d Revert changes to variable dropdowns 2019-10-10 14:04:09 -05:00
Rick Carlino 98baa520e9 Remove tests that were testing presence of nav items (pre-icon nav stuff) 2019-10-10 13:46:40 -05:00
Rick Carlino 2792281043 [UNSTABLE] More feature flag removals 2019-10-10 12:43:44 -05:00