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

827 Commits (fef676b1c517d1ae22a91e9890f32a2e63f44d1d)

Author SHA1 Message Date
Rick Carlino fef676b1c5 Cruft removal, part I 2015-10-20 13:03:42 -05:00
Rick Carlino a39f032ef9 Merge pull request #232 from RickCarlino/master 
Styling Updates
 2015-10-09 09:55:11 -05:00
Rick Carlino d892926bb0 Touchup gulpfile 2015-10-09 09:09:43 -05:00
Rick Carlino 1116c47ca5 Swap around navbar after CSS updates 2015-10-09 09:07:57 -05:00
Rick Carlino faa64c3b0f Merge pull request #231 from FarmBot/remove-foundation 
Replace Foundation with Bootstrap
 2015-10-09 08:57:54 -05:00
Rick Carlino 2a4d5229e3 Downgrade to React 0.13 :( 2015-10-09 08:54:45 -05:00
Rory Aronson 88aa43dcbb Merge branch 'master' into remove-foundation 
Conflicts:
	app/assets/stylesheets/farmbot.css.scss
	app/views/dashboard/ng-partials/widgets/_build_sequence.html.haml
	app/views/dashboard/ng-partials/widgets/_saved_sequences.html.haml
	app/views/layouts/application.html.haml
 2015-10-09 01:56:20 -07:00
Rory Aronson 55969747cd fix movement arrows 2015-10-09 01:46:31 -07:00
Rory Aronson 907870b75d Bootstrapify the sequence blocks 2015-10-09 01:42:51 -07:00
Rory Aronson 8785e6cc0e messin' around with the sequences again 2015-10-09 01:37:00 -07:00
Rory Aronson cb55837ffd Sync message styling 2015-10-09 01:00:05 -07:00
Rory Aronson abe3bc6e12 I don't even know. 2015-10-09 00:07:21 -07:00
Rory Aronson 5bca846ad3 Fixed the columns 2015-10-08 23:48:34 -07:00
Rory Aronson 0e99e3eb55 Working on the navbar 2015-10-08 15:52:09 -07:00
Rory Aronson 85b9aeb3f9 I don't even know 2015-10-08 15:14:11 -07:00
Rory Aronson a5b86c41b6 added jquery and played with the menu 2015-10-08 13:55:08 -07:00
Rory Aronson 68b511e2a7 replace all foundation column stuff with bootstrap columning 2015-10-08 11:33:23 -07:00
Rick Carlino f01ceeb682 [UNSTABLE] Upgrade to react 0.14 2015-10-08 13:03:07 -05:00
Rick Carlino 51b7347b3e [UNSTABLE] Move navbar into React component 2015-10-08 11:58:10 -05:00
Rick Carlino 604eecd803 De-Angularization part II: Schedule builder 2015-10-08 10:15:26 -05:00
Rory Aronson 07d0d0dae8 Replace Foundation with Bootstrap 2015-10-07 18:46:49 -07:00
Rick Carlino 73ec4f0c84 TODO: Fix regressions in sequence page 2015-10-07 16:52:31 -05:00
Rick Carlino ed2317db23 Add gulp_rails to simplify build process 2015-10-07 13:21:52 -05:00
Rick Carlino fb41fc87da Merge branch 'master' of github.com:FarmBot/farmbot-web-app 2015-10-07 11:47:21 -05:00
Rick Carlino 5f9b4c2fdb Merge pull request #230 from FarmBot/sequence-styles 
style updates for the sequence builder
 2015-10-07 11:37:13 -05:00
Rory Aronson ace44eae53 style updates for the sequence builder 2015-10-05 23:20:51 -07:00
Rick Carlino 14b22cf73a Legit grid coordinate translation 2015-10-05 16:35:25 -05:00
Rick Carlino f79cd861d6 [UNSTABLE] Adding screen <-> garden coordinate translation. Will try SVG circles now 2015-10-05 13:38:16 -05:00
Rick Carlino 3fe09ebcdb Add Planting area to back + front + SVG starter for visualization 2015-10-05 08:38:26 -05:00
Rick Carlino ff7af26da1 Merge pull request #227 from FarmBot/october-styles 
Close #206
 2015-10-04 12:49:44 -05:00
Rory Aronson 507ff56957 Hounding 2015-10-03 12:05:52 -07:00
Rory Aronson 4cf233e08d Stylin' 2015-10-03 00:41:42 -07:00
Rory Aronson abf95431a3 drop shadows on inputs 2015-10-02 23:49:00 -07:00
Rory Aronson 09db0afe4d Adjusting the movement arrows to be mobile friendly 2015-10-02 22:20:35 -07:00
Rory Aronson 33047f9f5e Close #206 2015-10-02 20:45:25 -07:00
Rory Aronson 6911196942 Moar styling. Nuff for today for me :) 2015-10-02 17:48:13 -07:00
Rory Aronson a60eaa5c96 Stylin' 2015-10-02 14:52:54 -07:00
Rory Aronson d39b54815f Fixed the .row issue 2015-10-02 12:57:01 -07:00
Rory Aronson 33eda409b1 Partialed out stuff, reworked hardware (calibration) widget 2015-10-02 03:57:12 -07:00
Rory Aronson b091aeed72 Restyling some stuff 2015-10-02 02:13:24 -07:00
Rick Carlino d903bbae6b Merge pull request #226 from RickCarlino/master 
Change "Crop" to "Plant"
 2015-10-01 18:55:31 -05:00
Rick Carlino c953a665c8 Add redux-thunk to package.json 2015-10-01 14:45:44 -05:00
Rick Carlino eacfaf6e99 [STABLE] a more "real" version of crop inventory 2015-10-01 14:03:40 -05:00
Rick Carlino 2b161003d6 [STABLE?] Fix crop removal bug 2015-10-01 13:29:28 -05:00
Rick Carlino 1faa71b234 [UNSTABLE] Cruft removal 2015-10-01 11:35:46 -05:00
Rick Carlino c9154e90f3 [UNSTBLE] Fixed optimistic crop creation bug 2015-10-01 11:25:56 -05:00
Rick Carlino a1a61ae197 Change CropInventory to PlantInventory 2015-09-30 14:51:40 -05:00
Rick Carlino 2ffe6a7e49 Change `crops` to `plants` 2015-09-30 14:24:15 -05:00
Rick Carlino 7e01cc15c1 Merge pull request #225 from RickCarlino/master 
Ability to persistantly add crops to garden
 2015-09-30 12:58:48 -05:00
Rick Carlino d8874d6074 Ability to remove crops, too! 2015-09-30 11:45:13 -05:00