Commit Graph

44 Commits

Author SHA1 Message Date
ffed63e0b3 fixed
Some checks failed
parsley/pipeline/head There was a failure building this commit
2018-09-12 14:17:18 -05:00
128bfcd535 bumped versions 2018-09-12 11:15:04 -05:00
2fd83a5d3d front end work 2018-09-11 22:56:26 -05:00
47014118c8 work 2018-09-11 17:13:22 -05:00
56fe5aae35 recipe as ingredient work 2018-09-11 10:38:07 -05:00
eb34393407 merged from master 2018-09-10 10:24:56 -05:00
b1e5c22101 task lists 2018-09-07 21:56:13 -05:00
8992a4a082 backend 2018-08-27 17:46:33 -05:00
021c066cf4 rai 2018-08-27 16:44:45 -05:00
cd802f0d97 adding temp logo and fixing specs 2018-07-13 15:42:08 -05:00
1c4fbe15de start vue conversion 2018-03-29 01:57:00 -05:00
2a5301f5d5 finished markdown transition 2017-04-14 16:40:38 -05:00
2ea20048d4 Added spec 2016-10-21 10:54:17 -05:00
cc398bd9d8 Added tag editing 2016-10-20 15:48:33 -05:00
45b0a9c7b1 added tags schema and model 2016-10-14 12:47:24 -05:00
e758af25b2 added notes 2016-10-14 12:19:00 -05:00
36cbf92df0 Added sorting columns to recipe index 2016-09-28 17:08:43 -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
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
d368ef4a6f Better yield use 2016-04-03 18:03:51 -05: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
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
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
Dan Elbert
d909347a7e Enhanced unit conversion 2016-01-20 18:37:28 -06:00
Dan Elbert
1150af5143 Better fractinoal display 2016-01-20 15:07:37 -06:00
Dan Elbert
170098046e Added authentication; cleaned up some UI 2016-01-19 16:50:39 -06:00
b3b1f1745c Added docker configs 2016-01-18 20:50:19 -06:00
595a67b1e0 Style; recipe editor 2016-01-18 12:58:54 -06:00
517bf35705 Unit conversion 2016-01-15 16:15:50 -06:00
5f955564fb Unit conversion 2016-01-15 16:09:34 -06:00
Dan Elbert
faf1d20f17 Unit parsing 2016-01-15 13:50:51 -06:00
Dan Elbert
433eecbc69 Unit conversion and parsing 2016-01-15 13:49:08 -06:00
Dan Elbert
3b4134f684 units 2016-01-14 15:22:15 -06:00
Dan Elbert
1cf08781b4 initial commit 2016-01-12 18:43:00 -06:00