smilerz
|
9a62b6e4e7
|
added bookmarklet model and api
|
2021-04-16 09:02:02 -05:00 |
|
vabene1111
|
661f7ae789
|
fixed slice fix again
|
2021-03-18 20:34:37 +01:00 |
|
vabene1111
|
8bfbd96398
|
fixed slicing issue
|
2021-03-18 20:24:42 +01:00 |
|
vabene1111
|
de9456e3d7
|
import log api
|
2021-03-18 18:48:29 +01:00 |
|
vabene1111
|
e968a57c06
|
shopping list api tests and refactors
|
2021-03-17 20:42:17 +01:00 |
|
vabene1111
|
641feede74
|
space nested serializers
|
2021-03-17 19:55:34 +01:00 |
|
vabene1111
|
c2addc1121
|
storage api test
|
2021-03-17 00:14:54 +01:00 |
|
vabene1111
|
4d6d84bf5b
|
fixed some tests + added user pref tests
|
2021-03-16 23:46:54 +01:00 |
|
vabene1111
|
a8a132e2a1
|
fixed recipe book entry api and added test
|
2021-03-12 12:33:20 +01:00 |
|
vabene1111
|
3b0413c30e
|
add test for recipe book
|
2021-03-12 10:50:08 +01:00 |
|
vabene1111
|
d7402f60c5
|
meal plan api tests
|
2021-03-12 09:44:16 +01:00 |
|
vabene1111
|
e7f8d58a7d
|
added test for cook log
|
2021-03-10 21:25:18 +01:00 |
|
vabene1111
|
74e731e334
|
inject space context into serializer writes
|
2021-02-25 16:45:47 +01:00 |
|
vabene1111
|
59cc22a877
|
wip serializer permission
|
2021-02-23 20:44:13 +01:00 |
|
vabene1111
|
846c660811
|
usr signup and more
|
2021-02-21 15:08:43 +01:00 |
|
vabene1111
|
d45adc1688
|
wip on new import/export system
|
2021-02-07 13:27:15 +01:00 |
|
vabene1111
|
bcd2e44493
|
added simple entry mode to shopping
|
2021-02-03 19:38:09 +01:00 |
|
vabene1111
|
148324b37f
|
fixed nutrition value database duplication
|
2021-01-28 14:44:23 +01:00 |
|
vabene1111
|
935dee853e
|
added ordering of supermarket categories
|
2021-01-26 19:19:42 +01:00 |
|
vabene1111
|
7b75e279b0
|
shopping list ui somewhat bearable
|
2021-01-26 18:21:45 +01:00 |
|
vabene1111
|
15c758b24a
|
update food after changing category
|
2021-01-26 18:08:41 +01:00 |
|
vabene1111
|
26ec1724a5
|
updating food working
|
2021-01-26 17:56:43 +01:00 |
|
vabene1111
|
96c4823664
|
supermarket shopping list relation
|
2021-01-26 16:53:05 +01:00 |
|
vabene1111
|
5ab19b7958
|
supermarket category api working
|
2021-01-26 16:16:45 +01:00 |
|
vabene1111
|
09716f2b00
|
wip supermarket categories
|
2021-01-25 21:58:24 +01:00 |
|
vabene1111
|
36584346cb
|
fixed merging and added shopping ignored ingredients
|
2021-01-25 20:46:19 +01:00 |
|
vabene1111
|
c7dd5dd8bb
|
wip shopping list stuff
|
2021-01-25 18:21:55 +01:00 |
|
vabene1111
|
a16ad2c887
|
added ingredient merging to shopping list
|
2021-01-25 17:24:03 +01:00 |
|
vabene1111
|
6992bf83aa
|
added customizable Servings text
|
2021-01-21 20:05:46 +01:00 |
|
vabene1111
|
e5b7cf5f30
|
further improvised import/export feature
|
2021-01-19 21:41:52 +01:00 |
|
vabene1111
|
08733751aa
|
add to book reimplemented
|
2021-01-14 01:21:15 +01:00 |
|
vabene1111
|
95aff5c998
|
cook log
|
2021-01-13 15:21:51 +01:00 |
|
vabene1111
|
ddc484562b
|
recipe description
|
2021-01-13 13:26:48 +01:00 |
|
vabene1111
|
bb43ed203a
|
display of external recipes
|
2021-01-13 02:16:16 +01:00 |
|
vabene1111
|
1bb412e007
|
sanitize inputs of jinja so that output does not need to be
|
2021-01-13 01:34:21 +01:00 |
|
vabene1111
|
0eebd438ca
|
commit
|
2021-01-13 01:08:51 +01:00 |
|
vabene1111
|
ea2f493e01
|
fixed request context for recipe serializer on import
|
2021-01-12 21:40:14 +01:00 |
|
Tobias Lindenberg
|
ecf065db2b
|
serializer
|
2021-01-10 13:12:06 +01:00 |
|
vabene1111
|
6ef173d82d
|
fixed and cleand up a lot of servings related stuff
|
2020-12-31 12:44:19 +01:00 |
|
vabene1111
|
4ff1a6bc93
|
Merge pull request #297 from lipschultz/created-by
Assign authenticated user to created_by
|
2020-12-31 12:16:16 +01:00 |
|
Michael Lipschultz
|
f489043077
|
Assign authenticated user to created_by
|
2020-12-26 09:09:47 -05:00 |
|
tourn
|
113e9ef1e3
|
Merge remote-tracking branch 'upstream/develop' into recipe-serving-count
|
2020-12-24 11:17:56 +01:00 |
|
vabene1111
|
9863447bac
|
small nutrition fixes
|
2020-12-14 12:56:18 +01:00 |
|
vabene1111
|
53b00cc4c8
|
Merge pull request #199 from sebimarkgraf/feature/nutrition
Add nutritional values
|
2020-12-14 12:29:56 +01:00 |
|
tourn
|
1e800889e4
|
Merge remote-tracking branch 'upstream/master' into recipe-serving-count
|
2020-11-20 14:44:09 +01:00 |
|
Sebastian Markgraf
|
422113a745
|
Finish editing of nutritional information
|
2020-11-17 22:27:01 +01:00 |
|
Sebastian Markgraf
|
a754002f4e
|
Revert approach to fixed nutritional values.
|
2020-11-06 17:22:21 +01:00 |
|
vabene1111
|
72bea14c3a
|
added sharing
|
2020-10-16 00:01:14 +02:00 |
|
vabene1111
|
7bc09dfe89
|
finishes shopping lists
|
2020-09-29 14:15:18 +02:00 |
|
vabene1111
|
711dfbe55f
|
cleanup import
|
2020-09-29 13:19:06 +02:00 |
|
vabene1111
|
a9bad5e5f9
|
create shopping from mealplan
|
2020-09-29 12:41:59 +02:00 |
|
vabene1111
|
9f7106a325
|
shopping list fixes
|
2020-09-29 11:41:10 +02:00 |
|
vabene1111
|
678cfaca12
|
fixed several shopping list issues
|
2020-09-22 12:01:11 +02:00 |
|
vabene1111
|
30d766be77
|
fixed clearing amount in recipe edit would result in error
|
2020-09-22 09:09:52 +02:00 |
|
vabene1111
|
70df7c5307
|
improved autosync data efficency
|
2020-09-22 00:20:44 +02:00 |
|
vabene1111
|
f5117abcfb
|
fixed shopping list multipliers and recipe names
|
2020-09-21 11:56:39 +02:00 |
|
vabene1111
|
df79c8f889
|
basic shopping list load and save
|
2020-09-15 16:51:20 +02:00 |
|
vabene1111
|
0ff65d35dc
|
partial shopping list saving
|
2020-09-07 13:09:03 +02:00 |
|
tourn
|
652b4bf2af
|
Add serving count to recipe
|
2020-08-30 16:00:01 +02:00 |
|
vabene1111
|
3c73b084cf
|
super basic shopping list working
|
2020-08-26 21:11:20 +02:00 |
|
vabene1111
|
be55e034bf
|
first parts of shopping rework
|
2020-08-11 15:24:12 +02:00 |
|
vabene1111
|
782d276724
|
cleanup ids in import as well
|
2020-07-20 21:12:18 +02:00 |
|
vabene1111
|
3e16361322
|
added keyword api tests
|
2020-07-09 22:00:14 +02:00 |
|
vabene1111
|
69d5e628c5
|
sync admin view + tests
|
2020-07-08 23:40:53 +02:00 |
|
vabene1111
|
e65c8436ef
|
sync api view + tests
|
2020-07-08 23:28:28 +02:00 |
|
vabene1111
|
e83565b1f2
|
added api endpoints and tests
|
2020-07-08 23:19:39 +02:00 |
|
vabene1111
|
1619d4894c
|
step header rendering
|
2020-07-02 12:12:17 +02:00 |
|
vabene1111
|
6eb41fe33f
|
fixed keywords and food/unit loading
|
2020-06-29 22:41:54 +02:00 |
|
vabene1111
|
2c59302fe9
|
conditional header/no amount render
|
2020-06-29 22:01:42 +02:00 |
|
vabene1111
|
577af85d38
|
fixed import export
|
2020-06-29 19:09:15 +02:00 |
|
vabene1111
|
8cff44df7d
|
recipe steps tagging support
|
2020-06-29 17:56:50 +02:00 |
|
vabene1111
|
8f28e4766d
|
side nav in recipe edit
|
2020-06-29 16:12:24 +02:00 |
|
vabene1111
|
27963fcaa6
|
image upload working
|
2020-06-29 15:39:58 +02:00 |
|
vabene1111
|
8b9c7daaae
|
fixed commas + desktop flex design
|
2020-06-29 12:27:54 +02:00 |
|
vabene1111
|
c178aea363
|
nested serializers and basic recipe editing working
|
2020-06-26 13:41:41 +02:00 |
|
vabene1111
|
5e20833b7e
|
testing with serializers
|
2020-06-26 13:10:23 +02:00 |
|
vabene1111
|
381bc5ffb4
|
partially working steps edit view
|
2020-06-25 23:48:27 +02:00 |
|
vabene1111
|
4a6b32d9af
|
super basic edit view
|
2020-06-25 23:24:09 +02:00 |
|
vabene1111
|
df912b8865
|
renamed recipeingredient to ingredient
|
2020-06-25 21:37:18 +02:00 |
|
vabene1111
|
f685253645
|
renamed ingredient to food
|
2020-06-25 21:24:03 +02:00 |
|
vabene1111
|
18bfecb026
|
fixed DRF object permission
|
2020-06-17 12:12:42 +02:00 |
|
vabene1111
|
d012385088
|
WIP api stuff
|
2020-06-16 20:32:41 +02:00 |
|
vabene1111
|
fa2326949e
|
added back markdown support to meal plannin notes
|
2020-06-16 10:34:20 +02:00 |
|
vabene1111
|
729d573460
|
imrpoved detail view
|
2020-06-11 10:26:40 +02:00 |
|
vabene1111
|
2bda5bbbf7
|
note text saving
|
2020-06-09 20:27:31 +02:00 |
|
vabene1111
|
ffa7513f9e
|
recipes and notes basically working
|
2020-06-09 17:26:50 +02:00 |
|
vabene1111
|
8cb6ed2f60
|
adding items to plan
|
2020-06-09 13:11:01 +02:00 |
|
vabene1111
|
2e255aba0d
|
more plan basics working
|
2020-06-04 19:46:35 +02:00 |
|
vabene1111
|
233f2a911f
|
nothing working yet
|
2020-06-02 14:33:27 +02:00 |
|
vabene1111
|
2fcd207dc7
|
basic api
|
2020-06-02 12:04:14 +02:00 |
|