Commit Graph

9696 Commits (jebba)

Author SHA1 Message Date
Rick Carlino f2bb75129c Merge pull request #92 from rickcarlino/master
Initial Workings of Control Star
2014-07-07 07:01:38 -07:00
Rick Carlino ea33cd3596 Initial commit of control star 2014-07-07 06:55:06 -07:00
Rick Carlino a7c9c7c1a7 Working on menu still 2014-07-06 22:06:00 -07:00
Rick Carlino ee52f631c0 Merge pull request #91 from rickcarlino/master
README updates, Macaw designs, Javascript test suite updates
2014-07-04 15:49:13 -07:00
Rick Carlino 9cca242964 Merge branch 'master' of github.com:rickcarlino/farmbot-dss 2014-07-04 15:40:06 -07:00
Rick Carlino 5b0f04da34 Cleaned up readme, added a /designs/ directory 2014-07-04 15:39:42 -07:00
Rick Carlino ad406354d8 Need to add $httpBackend 2014-07-02 07:04:39 -07:00
Rick Carlino 70e7142a5c Merge pull request #89 from rickcarlino/master
July 1
2014-07-01 07:42:28 -07:00
Rick Carlino 3ebf54f73c Renamed overview to movement 2014-07-01 07:38:09 -07:00
Rick Carlino 2f0e4f8b63 Not sure if device offline, or regression 2014-07-01 06:31:35 -07:00
Rick Carlino ecb3641f73 Merge pull request #88 from rickcarlino/master
Dependency Fixes
2014-06-30 07:05:50 -07:00
Rick Carlino 88cf08a6d2 Syntax correction for devise token 2014-06-30 06:59:41 -07:00
Rick Carlino 930f396c7c Devise tokens 2014-06-30 06:58:37 -07:00
Rick Carlino 36e76cc0b3 Staging server 2014-06-30 06:40:26 -07:00
Rick Carlino ff90fb466f Escape from dependancy hell. 2014-06-30 06:19:59 -07:00
Rick Carlino de3acc7d5f Merge pull request #87 from rickcarlino/master
Fixed Jasmine tests
2014-06-26 07:16:11 -07:00
rick carlino 56b6930e4f Fixed Jasmine tests 2014-06-26 07:10:26 -07:00
Rick Carlino 1115489782 Merge pull request #86 from rickcarlino/deviceService
Device service
2014-06-25 07:25:44 -07:00
rick carlino 3f4082232c Reverting controller changes until jasmine issue is resolved 2014-06-25 07:22:04 -07:00
rick carlino b6624ffa99 Still configuring 2014-06-25 07:07:09 -07:00
rick carlino 7fa7dba12c Jasmine test runner config 2014-06-24 07:12:14 -07:00
rick carlino a6f8b65565 pulling things out into factories 2014-06-23 07:00:21 -07:00
Rick Carlino 3fb4e4da1f Merge pull request #85 from rickcarlino/master
Test Coverage Update
2014-06-20 19:41:29 -07:00
rick carlino daef15642e Test coverage back to 100% 2014-06-20 18:54:45 -07:00
rick carlino ddea8d4d4a Dokku troubleshooting 2014-06-19 06:34:00 -07:00
rick carlino 344727be12 Devise issues again. 2014-06-13 06:45:09 -07:00
Rick Carlino 005e285e70 Merge pull request #59 from rickcarlino/master
ITS WORKING!!!! ITS WORKING!!!!
2014-06-13 06:41:20 -07:00
rick carlino 4a03361792 ITS WORKING!!!! ITS WORKING!!!! 2014-06-13 06:39:39 -07:00
Rick Carlino 0dd9dbf017 Merge pull request #58 from FarmBot/manual-control-interface
Added html and css for manual control page
2014-06-13 05:53:33 -07:00
Rory Aronson 2aba3a1e5c Added html and css for manual control page 2014-06-13 00:32:31 -07:00
rick carlino 945e81151a ... 2014-06-12 18:17:21 -07:00
rick carlino d2fa5c7b53 hmm.; 2014-06-12 18:05:29 -07:00
rick carlino c2cff84bf4 code climate issues 2014-06-12 18:03:25 -07:00
Rick Carlino 7c0c277e17 Merge pull request #56 from rickcarlino/master
Cleanup
2014-06-12 06:47:46 -07:00
rick carlino e0fbde1117 Cleaned up debugger, README, waffle / code climate badges 2014-06-12 06:43:30 -07:00
rick carlino 7a106926e3 test pruning 2014-06-11 06:52:43 -07:00
Rick Carlino ff5c555c07 Merge pull request #54 from rickcarlino/master
June 10th
2014-06-10 07:02:42 -07:00
rick carlino ac3f5c103b merging with master 2014-06-10 06:57:40 -07:00
rick carlino 0464fdc2be tidying up 2014-06-10 06:57:16 -07:00
rick carlino 191b5e615b secrets.yml 2014-06-10 06:55:55 -07:00
rick carlino f931328f4e Secrets via figaro gem 2014-06-10 06:37:28 -07:00
rick carlino 35a3f8ad03 ENV vars 2014-06-10 06:17:24 -07:00
rick carlino 4c1e952c43 Change "message" to "payload" again 2014-06-06 07:00:01 -07:00
Rick Carlino a0d67f2783 Merge pull request #53 from rickcarlino/master
6 June
2014-06-06 06:08:46 -07:00
rick carlino 9f896ce5df Changing Token / UUID to hardcoded value (for now) 2014-06-06 06:05:51 -07:00
rick carlino c71c03c3c6 Simple debugger for Tim to work with 2014-06-04 07:01:44 -07:00
rick carlino fb3f7bfe44 Deploy for Tim 2014-06-04 06:26:20 -07:00
Rick Carlino 3849e90e30 Merge pull request #52 from rickcarlino/master
Webcam Device Streams, Device Messaging
2014-06-03 06:43:20 -07:00
rick carlino faf8965876 Forgot to remove skynet service from controller 2014-06-03 06:37:56 -07:00
rick carlino 3d86878f1a Cam stream and move-to-home work :-D 2014-06-03 06:31:07 -07:00