Commit Graph

9696 Commits (jebba)

Author SHA1 Message Date
rick carlino 8223a2f07b Poking around skynet- minor issues 2014-06-01 10:35:06 -07:00
Rick Carlino 3ef7b8bc37 Merge pull request #51 from rickcarlino/master
May 31st
2014-05-31 10:39:27 -07:00
rick carlino 9e4e5dc213 More Skynet integration 2014-05-31 10:34:02 -07:00
Rick Carlino e612df8132 Merge pull request #50 from rickcarlino/master
Starting axial movement feature
2014-05-30 06:57:39 -07:00
rick carlino 2a22553364 Starting skynet configs 2014-05-30 06:55:02 -07:00
rick carlino 7ba5e517bb Starting axial movement feature 2014-05-29 07:04:08 -07:00
Rick Carlino 312615afa9 Merge pull request #49 from rickcarlino/master
May 24th
2014-05-24 11:11:59 -07:00
rick carlino 789fe19389 SkyNet fiddling 2014-05-24 11:06:21 -07:00
Rick Carlino 301a7ca0be Merge pull request #48 from rickcarlino/master
May 22nd
2014-05-23 07:01:06 -07:00
rick carlino fdc6a71e19 Light cleanup, fixed failing spec 2014-05-23 06:59:57 -07:00
rick carlino 66e437fcda change secret key 2014-05-22 06:55:56 -07:00
rick carlino 62b7cd6540 change secret key 2014-05-22 06:50:57 -07:00
rick carlino 74a6bb207f Updating mongoid.yml 2014-05-22 06:42:45 -07:00
rick carlino 8e77cc3bcf Updating mongoid.yml 2014-05-22 06:40:31 -07:00
rick carlino fc4eb70635 Updating mongoid.yml 2014-05-22 06:40:14 -07:00
rick carlino 15c3af6651 Hmmm... 2014-05-22 06:27:26 -07:00
rick carlino 9306486e5f Hmmm... 2014-05-22 06:25:38 -07:00
rick carlino f263892e57 Now this 2014-05-22 06:24:04 -07:00
rick carlino 0251dc6b65 Testing something out on staging box 2014-05-22 06:13:50 -07:00
Rick Carlino 19dbc0c7b3 Merge pull request #47 from rickcarlino/master
May 21st
2014-05-21 07:09:09 -07:00
rick carlino 2502f3d268 Ironed out some final details with the device settings page. Began work on device overview page 2014-05-21 07:03:33 -07:00
Rick Carlino b143c6eed5 Merge pull request #46 from rickcarlino/master
May 21st
2014-05-20 07:03:28 -07:00
rick carlino 7cd0cd3163 Done with device page 2014-05-20 06:59:12 -07:00
Rick Carlino 235873ad22 Merge pull request #45 from rickcarlino/master
May 19th
2014-05-19 06:59:38 -07:00
rick carlino 3a10634863 Finished device creation and device controlller 2014-05-19 06:56:41 -07:00
Rick Carlino 63c36dc016 Merge pull request #44 from rickcarlino/master
May 18th
2014-05-18 10:16:03 -07:00
rick carlino 3feb95db9a stray pry statement 2014-05-18 10:14:21 -07:00
rick carlino 156dcd13b0 Added rails CSRF gem 2014-05-18 10:14:06 -07:00
rick carlino 89dec3f5a2 Merging upstream 2014-05-18 09:45:03 -07:00
rick carlino 100d3ba0c7 Added Device service 2014-05-17 07:09:17 -07:00
Rick Carlino b9fbb80264 Merge pull request #43 from rickcarlino/master
May 16th
2014-05-16 07:10:12 -07:00
rick carlino f72f1f2ee9 Git ignore changes 2014-05-16 07:07:32 -07:00
rick carlino 116f640c35 Secret Tokens, Device destroy action 2014-05-16 07:05:20 -07:00
Rick Carlino 290f5df5d3 Merge pull request #42 from rickcarlino/master
May 15th
2014-05-15 07:10:27 -07:00
rick carlino 14d7d3e16b Building out base of SPA 2014-05-15 07:04:09 -07:00
Rick Carlino 395dc0272f Merge pull request #41 from rickcarlino/master
May 14
2014-05-14 07:03:33 -07:00
rick carlino 9c32a94d05 Added LoDash and Restangular 2014-05-14 06:55:07 -07:00
Rick Carlino a9d58c8d9b Merge pull request #40 from rickcarlino/master
May 12th
2014-05-13 06:58:28 -07:00
rick carlino 8261b4ccf0 Code touch ups 2014-05-13 06:55:38 -07:00
rick carlino c7c013a565 Saving progress for a redeployment 2014-05-13 06:10:36 -07:00
rick carlino fc21f8d5e3 Merge branch 'master' of github.com:FarmBot/farmbot-web-backend 2014-05-13 05:56:00 -07:00
rick carlino fa7286ebc1 Renamed device model, scaffolded Angular stuff, added Device API list action 2014-05-12 07:23:35 -07:00
Rick Carlino 6a9c003882 Merge pull request #39 from rickcarlino/master
May 11th
2014-05-11 15:59:03 -07:00
rick carlino 62c00d1607 Pushing up for review 2014-05-11 15:58:33 -07:00
rick carlino d38656883f Opps, stray controller spec 2014-05-11 15:28:37 -07:00
rick carlino d919cdb012 Drafting a device management mockup in /pages/device_panel 2014-05-11 15:27:40 -07:00
rick carlino e4dc8c8d60 Minor Code Pruning 2014-05-10 20:00:13 -07:00
Rick Carlino 5dc145396f Merge pull request #38 from rickcarlino/master
May 8th
2014-05-09 06:48:51 -07:00
rick carlino 99f6755eda Scaffolded FarmbotDevice class. Wrote specs 2014-05-09 06:48:18 -07:00
rick carlino f35c61edaf Removed schedule directory 2014-05-09 06:11:27 -07:00