spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity
8,909 Commits
35 Branches
79 Tags
40 MiB
Commit Graph

8909 Commits (75cabbf90a8cd6d03941f099d99e23888039c9b1)

Author SHA1 Message Date
Rick Carlino 4cb735b098 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into final_groups_stuff 2019-10-03 10:43:28 -05:00
Rick Carlino 5c56a2b764
Merge branch 'staging' into fix-nav-shifting 2019-10-03 10:17:45 -05:00
Rick Carlino 0b4ce5dd44
Merge pull request #1485 from kbravh/mark-as-sprouted 
add sprouted to the MARK AS options
 2019-10-03 10:17:06 -05:00
Karey Higuera 23db485363 add sprouted to the MARK AS options 2019-10-02 14:49:28 -05:00
Rick Carlino 7f55338e54 Trigger an auto_sync message when point_group_items are destroyed 2019-10-02 12:14:13 -05:00
Karey Higuera 5342c2eae7 Fix nav jiggle by adding data-title attribute and css:after 
Reorder content and display order in navbar.scss
 2019-10-02 11:05:59 -05:00
Rick Carlino a466a2997f Fix PointGroup referential integrity issues 2019-10-02 09:24:57 -05:00
Rick Carlino ae9465873e [BIG CHANGE] Retroactively fix referential integrity issues 2019-10-02 08:04:53 -05:00
Rick Carlino bbb9dcdfcc Possible fix for refernetial integrity issues with Point <=> PointGroup after Point#destroy 2019-10-01 16:23:30 -05:00
Rick Carlino 20ce166d46 WIP 2019-10-01 16:05:42 -05:00
Rick Carlino 0d67345d8d BUG: PointGroup#update does not accept sort_type, part II 2019-10-01 15:26:12 -05:00
Rick Carlino e52e7c8169 BUG: PointGroup#update does not accept sort_type 2019-10-01 15:16:38 -05:00
Rick Carlino a2154a10e1 <FBSelect/> for sort order 2019-10-01 15:02:29 -05:00
Rick Carlino 144fa34e29 Deploy ability to set `sort_type` while I work on the Real VersionTM 2019-10-01 11:53:11 -05:00
Rick Carlino 8300086835 Move `boot sequence` selector to below firmware selection. 2019-10-01 10:15:24 -05:00
Rick Carlino e03dc38160 Remove every_point and associated corpus entries 2019-10-01 09:50:17 -05:00
Rick Carlino 2e79d97e5e
Merge pull request #1475 from FarmBot/final_groups_stuff 
Add `sort_type` (API-side only)
 2019-09-30 17:28:31 -05:00
Rick Carlino 2ef6480816 Add `sort_type` (API-side only) 2019-09-30 17:09:00 -05:00
Rick Carlino 1222ce54fe
Merge pull request #1474 from FarmBot/monday 
Group Bug Fixes
 2019-09-30 14:19:30 -05:00
Rick Carlino 1a9c7f3508 mapStateToProps() test 2019-09-30 13:49:54 -05:00
Rick Carlino b5a8d53b02 Update createGroup() tests 2019-09-30 11:22:11 -05:00
Rick Carlino 6b1db0c51c Bug fix: Allow creation of PointGroups that contain points created during current session. 2019-09-30 10:22:12 -05:00
Rick Carlino 9213d4f37e Bug fix: Dont crash PointGroup detail view if OF Icon is `null`. 2019-09-30 09:45:09 -05:00
Rick Carlino 66bd0a9c27 Update NPM deps 2019-09-28 19:21:56 -05:00
Rick Carlino ee85a8e6e3
Merge pull request #1465 from FarmBot/friday 
Dep Upgrades
 2019-09-28 10:15:41 -05:00
Rick Carlino 6a1ee3830b Merge branch 'staging' of https://github.com/AscendFB/Farmbot-Web-App into friday 2019-09-27 11:32:50 -05:00
Rick Carlino d2e1a84005 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into friday 2019-09-27 11:30:43 -05:00
Rick Carlino 8f41f7d87d Update bundler deps 2019-09-27 11:26:21 -05:00
Rick Carlino 1c83bf4ad8 Update NPM deps 2019-09-27 11:20:31 -05:00
Rick Carlino ab6472510d Re-arrange help text in ubuntu_setup.sh 2019-09-27 08:25:43 -05:00
AscendFB 22665da324 Merge branch 'staging' of https://github.com/AscendFB/Farmbot-Web-App into staging 2019-09-27 11:14:02 +02:00
AscendFB 7549312b1c again linters, should fix my settings now 🔰 2019-09-27 11:13:41 +02:00
AscendFB 61c9fe62b4
Linter fix 2019-09-27 10:45:26 +02:00
AscendFB 8934b10832
Merge pull request #8 from FarmBot/staging 
Pull latest changes
 2019-09-27 10:00:53 +02:00
Rick Carlino 5547dd69f7
Merge pull request #1463 from FarmBot/groups_vii 
Ability to use groups for iteration
 2019-09-26 16:30:18 -05:00
Rick Carlino 3f5159267c Linter fix 2019-09-26 15:57:53 -05:00
Rick Carlino 2e15b74ce9 ✔️ Tests done 2019-09-26 15:48:10 -05:00
Rick Carlino e0e88119db De-Curry newVariableCreator 2019-09-26 15:07:51 -05:00
Rick Carlino d124c58251 TODO: De-Curry newVariableCreator 2019-09-26 13:45:54 -05:00
Rick Carlino 0785ee979a Render `name` of selected PointGroup 2019-09-26 11:34:22 -05:00
Rick Carlino ba0503ef00 Fixed WIP errors. NEXT: Format selected pointGroup 2019-09-26 10:23:23 -05:00
Rick Carlino 34c632cad3 Fix convertDDItoVariable NPEs 2019-09-26 09:24:26 -05:00
AscendFB 58aa3d8606 Merge branch 'staging' of https://github.com/AscendFB/Farmbot-Web-App into staging 2019-09-26 12:46:44 +02:00
AscendFB 3d83f01f5b Tooltips and helpbuttons updates no.3 2019-09-26 12:44:51 +02:00
AscendFB dcb12a89c9
Merge pull request #7 from FarmBot/staging 
Merging changes
 2019-09-26 12:29:04 +02:00
Rick Carlino 82b7f4cf16 Add groups to dropdown list; prevent runtime error in move_abs 2019-09-25 13:40:37 -05:00
Rick Carlino 7b046af751 Upgrades and any removals 2019-09-25 10:25:18 -05:00
Rick Carlino 52ab40b189
Merge pull request #1456 from gabrielburnworth/staging 
Add new device info
 2019-09-25 08:06:02 -05:00
gabrielburnworth a8cf0b455b add new fbos details 2019-09-24 14:50:55 -07:00
Rick Carlino 4e999e68da
Merge pull request #1455 from FarmBot/groups_v 
Add `every_point`, `point_group` nodes, tests, cleanup, dep upgrades.
 2019-09-24 14:47:48 -05:00