Rory Aronson
|
adb03ca4bd
|
Merge pull request #216 from FarmBot/roryaronson-cla
Create CONTRIBUTING.md
|
2015-09-18 22:59:45 -07:00 |
|
Rory Aronson
|
eaf9ae0989
|
Create CONTRIBUTING.md
And add CLA (contributor license agreement)
|
2015-09-18 22:48:44 -07:00 |
|
Rory Aronson
|
0580bbc6b6
|
Update readme with .io URLs
|
2015-09-18 22:32:54 -07:00 |
|
Rick Carlino
|
65985cac5f
|
Merge branch 'master' of github.com:rickcarlino/farmbot-web-app
|
2015-09-18 20:48:45 -05:00 |
|
Rick Carlino
|
980b1f3772
|
Merge branch 'master' of github.com:FarmBot/farmbot-web-app
|
2015-09-18 20:48:30 -05:00 |
|
Rick Carlino
|
493c2ea0c7
|
👏 Stopping point for Friday.
|
2015-09-18 15:20:43 -05:00 |
|
Rick Carlino
|
44a8725672
|
👏 Got redux and NPM working with asset pipeline
|
2015-09-18 15:13:33 -05:00 |
|
Rick Carlino
|
72a0f61ccf
|
[UNSTABLE] React and Redux work. Need to fix Angular now
|
2015-09-18 13:42:37 -05:00 |
|
Rick Carlino
|
0e8b7000ae
|
[UNSTABLE] Going to try to browserify-rails to end this madness
|
2015-09-18 13:23:18 -05:00 |
|
Rick Carlino
|
d1aad3c94b
|
Added groups and zones panels. Probably need to add URL router at this point
|
2015-09-17 16:01:48 -05:00 |
|
Rick Carlino
|
da4c64ec3a
|
Done combining DOM nodes on side menus
|
2015-09-17 14:59:54 -05:00 |
|
Rick Carlino
|
e5c1982340
|
WIP Merged crop info components
|
2015-09-17 14:46:47 -05:00 |
|
Rick Carlino
|
53508d95a5
|
Unify PlantCatalog DOM elements
|
2015-09-17 14:29:50 -05:00 |
|
Rick Carlino
|
59f0215925
|
WIP: Combine crop catalog
|
2015-09-17 14:27:17 -05:00 |
|
Rick Carlino
|
bf387d22c9
|
Remove missing key warnings from React list components
|
2015-09-17 14:21:19 -05:00 |
|
Rick Carlino
|
cba24a07ac
|
Still refactoring out the 2-DOM-containers-per-side layout
|
2015-09-17 14:16:10 -05:00 |
|
Rick Carlino
|
638704622b
|
Fix back button on scheduler
|
2015-09-17 11:19:36 -05:00 |
|
Rick Carlino
|
86fbeb764c
|
Right side merged into one
|
2015-09-17 10:50:53 -05:00 |
|
Rick Carlino
|
41c0a36230
|
Finished tab menu on left side; Want to 4 reduce menu / content DOM areas into 2
|
2015-09-17 10:37:38 -05:00 |
|
Rick Carlino
|
6c62f33adf
|
Merge pull request #212 from RickCarlino/master
Starting "groups" / "zones" tabs
|
2015-09-16 15:21:34 -05:00 |
|
Rick Carlino
|
fee1986f2a
|
Interim progress on tab navigation bar
|
2015-09-16 15:19:43 -05:00 |
|
Rick Carlino
|
e0733ab7a7
|
Remove duplicate logic (Fb = {})
|
2015-09-16 13:38:39 -05:00 |
|
Rick Carlino
|
e8e1e0ea3c
|
Tweaks to plant catalog
|
2015-09-16 10:21:18 -05:00 |
|
Rick Carlino
|
2a236656be
|
Merge pull request #211 from RickCarlino/master
Add schedule maker mockup to designer
|
2015-09-15 19:25:29 -05:00 |
|
Rick Carlino
|
dbbf21222b
|
Classier Inventory
|
2015-09-15 16:34:29 -05:00 |
|
Rick Carlino
|
36a92d3a38
|
Flexbox-y schedule creation
|
2015-09-15 16:28:06 -05:00 |
|
Rick Carlino
|
0f3bd9d31f
|
Creation of schedules
|
2015-09-15 15:16:16 -05:00 |
|
Rick Carlino
|
2e3c2aab90
|
Prevent superfluous loading of farmdesigner
|
2015-09-15 13:15:24 -05:00 |
|
Rick Carlino
|
2068d9504e
|
Asset issues
|
2015-09-14 14:15:08 -05:00 |
|
Rick Carlino
|
20e5069573
|
Asset issues
|
2015-09-14 14:09:53 -05:00 |
|
Rick Carlino
|
bc19a3818c
|
Asset issues
|
2015-09-14 14:01:14 -05:00 |
|
Rick Carlino
|
8d468d6ae5
|
Asset issues
|
2015-09-14 13:59:24 -05:00 |
|
Rick Carlino
|
9c173ef6ca
|
Add calendar mockup
|
2015-09-14 13:44:49 -05:00 |
|
Rick Carlino
|
1fa79ba111
|
Merge pull request #210 from RickCarlino/master
Farm Design UI dev, Part III
|
2015-09-11 13:22:49 -05:00 |
|
Rick Carlino
|
02927e583a
|
change default left side menu
|
2015-09-11 13:18:45 -05:00 |
|
Rick Carlino
|
4c48ad6510
|
Ability to drop multiple pins onto the map
|
2015-09-11 13:13:19 -05:00 |
|
Rick Carlino
|
878a936941
|
Ability to drop multiple pins onto the map
|
2015-09-11 12:58:56 -05:00 |
|
Rick Carlino
|
0ea1ada6ee
|
Pin drop functionality
|
2015-09-11 12:13:55 -05:00 |
|
Rick Carlino
|
0297550619
|
Almost done with last menu on left pane of farm designer. Need to add dragability now
|
2015-09-11 11:28:35 -05:00 |
|
Rick Carlino
|
489e41a871
|
Scaffolding for the third menu, which will be named `crop_info`
|
2015-09-10 15:35:48 -05:00 |
|
Rick Carlino
|
e450fa99f9
|
Add `plant_catalog` to left side menu
|
2015-09-10 15:14:56 -05:00 |
|
Rick Carlino
|
bba5fdea87
|
Functional mockup for `add a crop` menu on left bar
|
2015-09-10 12:35:35 -05:00 |
|
Rick Carlino
|
f4c6bd4fee
|
JSX-ified menus
|
2015-09-10 11:38:09 -05:00 |
|
Rick Carlino
|
7f87594306
|
Switch things over to flexbox :-D
|
2015-09-09 14:49:40 -05:00 |
|
Rick Carlino
|
8671d3a067
|
Remove drop shadow from calendar widget
|
2015-09-09 08:15:08 -05:00 |
|
Rick Carlino
|
55c77d05c1
|
Merge pull request #209 from RickCarlino/master
Starting work on farm designer
|
2015-09-08 13:22:45 -05:00 |
|
Rick Carlino
|
f319cf5d70
|
Mostly finished with mockup. Calendar widget still needs some work
|
2015-09-08 13:19:51 -05:00 |
|
Rick Carlino
|
03eb15af91
|
Added tooltips
|
2015-09-08 12:13:20 -05:00 |
|
Rick Carlino
|
449c1b14b7
|
Styling for top left corner of farm designer
|
2015-09-08 11:02:33 -05:00 |
|
Rick Carlino
|
dbb66cad47
|
Last CSS cleanup for now. Adding blocks to designer layout
|
2015-09-05 19:50:11 -05:00 |