Commit Graph

9696 Commits (jebba)

Author SHA1 Message Date
rick carlino a4ab2ad052 Stubbed out dashboard and data pages 2014-05-08 07:02:51 -07:00
Rick Carlino 8b27fe4693 Merge pull request #37 from rickcarlino/master
April 7th
2014-05-07 07:09:11 -07:00
rick carlino 65c6bf6913 Fix merge conflicts 2014-05-07 07:02:04 -07:00
rick carlino fec9c7aa0e Started adding factoryGirl, specs. Fixed up some layouts and views 2014-05-07 06:57:54 -07:00
rick carlino e4f4f50d33 Font issues on production 2014-05-07 06:16:47 -07:00
Rick Carlino f3343624fe Merge pull request #36 from rickcarlino/master
May 6th
2014-05-06 07:05:07 -07:00
rick carlino 23d994893b Solidifying user sessions and registrations 2014-05-06 06:57:28 -07:00
rick carlino 8644ab6677 Solidifying user sessions and registrations 2014-05-06 06:57:28 -07:00
rick carlino c07bee00be Switching production to run on supervisor 2014-05-04 11:41:22 -07:00
rick carlino deea331725 Switching production to run on supervisor 2014-05-04 11:41:22 -07:00
rick carlino f5e192bf15 More Dokku mangling. 2014-05-04 11:02:55 -07:00
rick carlino 6b190d16bf More Dokku mangling. 2014-05-04 11:02:55 -07:00
rick carlino e1a064446d Assets misbehaving- will fix this post deploy 2014-05-04 10:48:54 -07:00
rick carlino b4e57e7105 Assets misbehaving- will fix this post deploy 2014-05-04 10:48:54 -07:00
rick carlino 35e3a08851 Assets misbehaving- will fix this post deploy 2014-05-04 10:47:35 -07:00
rick carlino 0eefcbb936 Assets misbehaving- will fix this post deploy 2014-05-04 10:47:35 -07:00
rick carlino 462b5341ea Reinstalling foundationrails and changing mongodb creds 2014-05-04 10:40:04 -07:00
rick carlino 13d4adb99a Reinstalling foundationrails and changing mongodb creds 2014-05-04 10:40:04 -07:00
rick carlino 7c4a7e85d2 MongoDB settings for Dokku 2014-05-04 10:30:37 -07:00
rick carlino b461014681 MongoDB settings for Dokku 2014-05-04 10:30:37 -07:00
Rick Carlino 7a234af5e9 Merge pull request #35 from rickcarlino/master
May 2nd
2014-05-02 07:03:51 -07:00
rick carlino 4e5725fdd5 Finished User Registration 2014-05-02 06:58:11 -07:00
rick carlino dd2bccc72b Finished User Registration 2014-05-02 06:58:11 -07:00
rick carlino 535424ee0c Migrating to HAML 2014-05-01 06:58:42 -07:00
rick carlino 66f7266782 Migrating to HAML 2014-05-01 06:58:42 -07:00
Rick Carlino fe99dc0141 Merge pull request #34 from rickcarlino/master
April 30th
2014-04-30 07:21:24 -07:00
rick carlino 6c5ac4290f Opps. Assets again. 2014-04-30 07:10:28 -07:00
rick carlino 4aad6d64ee Opps. Assets again. 2014-04-30 07:10:28 -07:00
rick carlino fdf00c036e Added Capybara 2014-04-30 06:19:43 -07:00
rick carlino 662bbc98f7 Added Capybara 2014-04-30 06:19:43 -07:00
rick carlino ee0a6f33d9 even MORE dokku goofiness 2014-04-28 21:41:22 -07:00
rick carlino f6a5914b76 even MORE dokku goofiness 2014-04-28 21:41:22 -07:00
rick carlino 2bbb076e21 dokku goofiness 2014-04-28 21:40:33 -07:00
rick carlino 67cfb34f42 dokku goofiness 2014-04-28 21:40:33 -07:00
rick carlino c6f94b9b5b Oops assets 2014-04-28 21:13:38 -07:00
rick carlino e12057bc2c Oops assets 2014-04-28 21:13:38 -07:00
Rick Carlino 30331bde01 Merge pull request #33 from rickcarlino/master
April 28 Routine Updates
2014-04-28 21:11:05 -07:00
rick carlino e0a96129e0 Style updates, test suite stuff and layouts 2014-04-28 21:06:40 -07:00
rick carlino 21c2429dd6 Style updates, test suite stuff and layouts 2014-04-28 21:06:40 -07:00
rick carlino 1dbf75c217 Merge branch 'master' of github.com:FarmBot/farmbot-web-backend 2014-04-28 19:47:18 -07:00
rick carlino 38e8e40b26 Merge branch 'master' of github.com:FarmBot/farmbot-web-backend 2014-04-28 19:47:18 -07:00
rick carlino f0d625c2f0 Doing the dokku 2014-04-27 12:01:01 -07:00
rick carlino 43414bba83 Doing the dokku 2014-04-27 12:01:01 -07:00
rick carlino 8ad4eb5764 Doing the dokku 2014-04-26 20:22:49 -07:00
rick carlino d6cc4586e3 Doing the dokku 2014-04-26 20:22:49 -07:00
rick carlino 7f163b5a03 added 12 factor gem 2014-04-26 20:10:56 -07:00
rick carlino 40f5610d3b added 12 factor gem 2014-04-26 20:10:56 -07:00
rick carlino a9c2d099ea ficing ruby version 2014-04-26 20:07:05 -07:00
rick carlino 384ea1424f ficing ruby version 2014-04-26 20:07:05 -07:00
TimEvWw 4ccb62a73a sending schedule to controller 2014-04-17 13:26:12 -01:00