Commit Graph

133 Commits

Author SHA1 Message Date
72fffcfbca log work 2016-08-12 16:05:24 -05:00
d18d3a14b0 Fix ingredient NDBN selection 2016-07-29 11:06:10 -05:00
78932eb7ee updated base image 2016-07-28 12:02:41 -05:00
203ef90cf0 Rails 5 changed db migrate 2016-07-27 22:33:22 -05:00
9c569693b1 log work 2016-07-27 22:30:57 -05:00
cfa7d95afe Updates to support ruby 2.3, docker-compose v2, and docker development 2016-07-08 12:56:40 -05:00
b8e0835741 docker conversion to postgresql 2016-07-08 11:17:42 -05:00
4137c9fd7c Initial rails 5 conversion 2016-07-07 17:47:47 -05:00
37f150e1cc start work on logs 2016-07-06 21:00:35 -05:00
e42150f883 Fixed docker config: 2016-07-06 16:47:00 -05:00
8443220a79 Fixed db config 2016-07-06 16:36:04 -05:00
df35dfcf5e Move production to postgres 2016-07-06 16:25:17 -05:00
846c8aa294 Updated recipe decorator 2016-07-06 16:23:06 -05:00
c71e356195 Fixed yield parser; fixed N+1 query issue 2016-07-05 16:48:59 -05:00
16bc8b562b Added ingredient functionality 2016-07-05 16:31:36 -05:00
2ad4a22184 Updated ingredient editor 2016-07-05 13:07:20 -05:00
30726ec1b8 update ingredient list 2016-07-05 11:19:18 -05:00
c0d43171a4 fixed ingredient bug; added button 2016-06-29 19:14:17 -05:00
8811109351 enhanced nutrition data 2016-06-22 13:49:03 -05:00
72ac0aab3b Changed yields input to text_field 2016-05-10 14:39:26 -05:00
80c203b227 small ui changes 2016-04-04 14:28:23 -05:00
d368ef4a6f Better yield use 2016-04-03 18:03:51 -05:00
9994560807 Fixed small html error 2016-03-23 16:42:15 -05:00
5f20e04b79 Fixed bad column definition 2016-03-10 18:03:20 -06:00
238adc4b61 USDA density calculations now more powerful; added ability to parse cubic values 2016-03-10 16:06:39 -06:00
a9527c9626 Fixed usda parser; start updating density calculaitons 2016-03-09 20:12:38 -06:00
2f752eae61 Adding USDA weights; usda_importer refactor 2016-03-09 18:53:47 -06:00
068b01a7c8 Gem version bump 2016-03-09 11:51:27 -06:00
e6182bd6ff Removed .DS_store 2016-03-03 17:59:03 -06:00
Dan Elbert
7b8d065f20 Bug when user is anon 2016-03-03 13:30:34 -06:00
Dan Elbert
78dfa9120e Added admin; updated calculator; added owner to ingredients 2016-03-03 13:12:42 -06:00
b890665966 Added specs 2016-02-27 20:23:14 -06:00
dd493a09d5 Extra conversion options 2016-02-27 20:12:41 -06:00
a86c5afae2 display nutrition data in recipe view 2016-02-14 19:29:34 -06:00
48d296a7c9 removed unused specs 2016-02-02 16:04:21 -06:00
d5082f9c16 Major unit conversion refactor + lots more specs 2016-02-02 15:48:20 -06:00
ffb2c92f74 calculator 2016-01-31 00:00:32 -06:00
9cc9fb2c2f small display fixes 2016-01-30 21:51:32 -06:00
edfd6f12d6 more bulk editor work 2016-01-30 21:35:39 -06:00
3ca786281d Added about page; fixed bulk editing 2016-01-30 21:20:15 -06:00
422c77b131 Added ingredient prep to recipe_ingredient; update to bulk editing 2016-01-30 20:29:35 -06:00
0cc568344e UI updates 2016-01-30 17:02:19 -06:00
205a29ce77 Updated style; ingredient editor work 2016-01-30 15:49:17 -06:00
Dan Elbert
ff231ceee0 usda linking 2016-01-29 18:45:20 -06:00
Dan Elbert
2dca779294 Added long descirption to usda foods 2016-01-28 18:18:45 -06:00
Dan Elbert
70e7a8b415 Ingredient editor 2016-01-28 14:19:51 -06:00
7f7a81d49a ingredient linking 2016-01-24 19:06:26 -06:00
9f04a65e19 Added usda food data 2016-01-24 17:10:43 -06:00
Dan Elbert
f434900291 Added time zone info 2016-01-21 14:25:11 -06:00
Dan Elbert
e7ed441d7a Fixed recipe widths 2016-01-21 11:50:50 -06:00