Commit Graph

222 Commits

Author SHA1 Message Date
smilerz
83fce6461a import raw json/html 2021-04-16 09:02:01 -05:00
Patrick Pirker
386834f409 Allow recipes to be imported from json directly 2021-04-16 09:02:01 -05:00
vabene1111
f21de5eddc fixed public share links 2021-04-10 14:36:56 +02:00
vabene1111
fad40dab6c client api generation 2021-04-08 22:05:05 +02:00
smilerz
45dba6fad2 fix json direct import when wrapped in @graph 2021-03-19 13:23:55 -05:00
vabene1111
afadc61d5d telegram bot 2021-03-18 22:34:53 +01:00
vabene1111
55920501b8 small tweaks 2021-03-18 20:48:28 +01:00
vabene1111
cc3e00e75f Merge branch 'develop' into url_import_recipes
# Conflicts:
#	cookbook/helper/recipe_url_import.py
#	cookbook/tests/api/test_api_keyword.py
#	cookbook/tests/other/test_edits_recipe.py
#	cookbook/views/api.py
#	requirements.txt
2021-03-18 20:38:51 +01:00
vabene1111
de9456e3d7 import log api 2021-03-18 18:48:29 +01:00
vabene1111
48c90c483a merged PR 474 adding manual json import 2021-03-18 12:36:00 +01:00
vabene1111
780c929162 fixed url import space 2021-03-18 12:07:02 +01:00
vabene1111
6a25428b3c fixed shopping list share permission 2021-03-18 11:04:55 +01:00
vabene1111
76eeed1a77 all tests migrated and improved 2021-03-17 22:10:58 +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
b48708652f delete model check fixes + sync log 2021-03-17 00:27:53 +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
d767743b64 user name api test 2021-03-12 10:16:51 +01:00
vabene1111
a7b7272bec view log api test 2021-03-12 09:50:20 +01:00
vabene1111
b552badff7 fixed limit random recipe 2021-03-11 15:37:37 +01:00
vabene1111
e7f8d58a7d added test for cook log 2021-03-10 21:25:18 +01:00
vabene1111
528f329ebb new keyword api test working 2021-03-10 20:31:00 +01:00
smilerz
bfaed434cc refactored url_import to use recipe-scraper 2021-03-03 21:08:34 -06:00
vabene1111
d01f7409bf removed django-random-queryset
the looping strategy is not efficient when using spacing as ids for a single user might be spaced far apart. A single user also only has a few hundred recipes so using the order by ? method should be more efficient and also automatically be compatible with spaces
2021-02-25 16:44:42 +01:00
vabene1111
46fb02376e recipe share basics 2021-02-21 16:37:04 +01:00
vabene1111
58c6077925 basic test stuff 2021-02-20 22:56:29 +01:00
vabene1111
c42266b82c basic space stuff 2021-02-19 11:53:30 +01:00
vabene1111
894d2d2e6b gracful recipes api error on wrong format of update_at 2021-02-16 22:14:40 +01:00
vabene1111
bcd2e44493 added simple entry mode to shopping 2021-02-03 19:38:09 +01:00
vabene1111
cc980b2e8a fixed broken test for good and improved file api 2021-01-28 16:21:19 +01:00
vabene1111
c30ce471c2 api permissions + shopping list on mobile 2021-01-28 14:41:00 +01:00
vabene1111
a0ebc47ade api permission fixes + shopping list default view mode 2021-01-26 22:15:09 +01:00
vabene1111
09716f2b00 wip supermarket categories 2021-01-25 21:58:24 +01:00
vabene1111
d9feb61e85 updated documentation 2021-01-22 21:58:39 +01:00
vabene1111
f1b7ed7d7a added option to choose webdav path 2021-01-22 20:29:29 +01:00
vabene1111
09062cb12c fixed recipe book api error 2021-01-21 20:57:26 +01:00
vabene1111
961b3f07b5 added demo setting 2021-01-17 14:37:34 +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
Tobias Lindenberg
6af5f59c80 views/api 2021-01-10 12:06:49 +01:00
Tobias Lindenberg
4fa6919ca0 sort views imports 2021-01-10 11:55:21 +01:00
vabene1111
910b28fe2d meal plan date handling rewrite 2020-12-14 17:11:40 +01:00
Sebastian Markgraf
c4fbad614e
Include random in filtermixin 2020-11-14 20:20:30 +01:00
vabene1111
4c92a4b39c fixed shopping list recipe search 2020-11-14 11:20:43 +01:00
vabene1111
4dfda4439c re added standard filter to recipe api 2020-11-04 16:53:49 +01:00
vabene1111
591d185b9d improved random recipe queryset function 2020-11-04 15:09:35 +01:00
tourn
69a6edee99 Show random recipes in meal planner 2020-11-03 16:46:31 +01:00
vabene1111
cd46203d55 added permission classes for sharing + tests 2020-10-15 23:41:38 +02:00
vabene1111
678cfaca12 fixed several shopping list issues 2020-09-22 12:01:11 +02:00
vabene1111
70df7c5307 improved autosync data efficency 2020-09-22 00:20:44 +02:00
vabene1111
148ce2faef shopping list item checking 2020-09-21 22:55:52 +02:00
vabene1111
0ff65d35dc partial shopping list saving 2020-09-07 13:09:03 +02:00
vabene1111
be55e034bf first parts of shopping rework 2020-08-11 15:24:12 +02:00
vabene1111
a8b1ee9765 changed url import api call to post url 2020-08-09 20:13:05 +02:00
vabene1111
9510562576 backup basic fixture 2020-07-15 22:05:48 +02:00
vabene1111
1cea0350c9 added todo info 2020-07-14 00:23:35 +02:00
vabene1111
e0dac67b84 fixed recipe api permissions when using shared recipes 2020-07-14 00:22:39 +02:00
vabene1111
9b9fbd5cab added food api view tests 2020-07-09 22:19:24 +02:00
vabene1111
8c118dbd3e use appropriate serializer for unit 2020-07-09 22:16:52 +02:00
vabene1111
bfe9e794c5 added tests for unit api view 2020-07-09 22:13:33 +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
0aa37d176f api function queryset cleanup 2020-07-08 22:24:52 +02:00
vabene1111
27963fcaa6 image upload working 2020-06-29 15:39:58 +02:00
vabene1111
c178aea363 nested serializers and basic recipe editing working 2020-06-26 13:41:41 +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
2c5e44d73c improved recipe parser, added tests, cleaned up resources 2020-06-24 21:22:23 +02:00
vabene1111
98c278fe60 importing improvements 2020-06-23 11:04:49 +02:00
vabene1111
8594346488 basic importing working 2020-06-23 10:34:04 +02:00
vabene1111
dc91e1e8ed fixed url router and added recipe import test ressources 2020-06-22 23:35:18 +02:00
vabene1111
976dd13a31 basic importing working 2020-06-22 23:23:06 +02:00
vabene1111
f066b7097c microdata import 2020-06-22 22:47:33 +02:00
vabene1111
71b41a9ca2 refactor json ld code into helper 2020-06-22 21:35:56 +02:00
vabene1111
9e748552b2 recipe url import ld json 2020-06-22 21:16:31 +02:00
vabene1111
df8170fa55 improved permission handlin 2020-06-17 13:18:28 +02:00
vabene1111
18bfecb026 fixed DRF object permission 2020-06-17 12:12:42 +02:00
vabene1111
4ee5a4fd9f testing with user permission 2020-06-17 11:06:08 +02:00
vabene1111
bbaedfad33 documentation update api 2020-06-17 10:29:01 +02:00
vabene1111
d012385088 WIP api stuff 2020-06-16 20:32:41 +02:00
vabene1111
0a8270e7cf api documentation basics 2020-06-16 17:21:50 +02:00
vabene1111
d1bf4d4bbb added ical export support 2020-06-11 18:38:56 +02:00
vabene1111
5072859e57 re enabled basic sharing 2020-06-11 17:27:27 +02:00
vabene1111
d734cb813e plan type editing 2020-06-11 16:58:57 +02:00
vabene1111
8aa24d4771 per user meal types 2020-06-11 15:19:15 +02:00
vabene1111
729d573460 imrpoved detail view 2020-06-11 10:26:40 +02:00
vabene1111
f7e2aa9b83 week switching 2020-06-11 00:49:19 +02:00
vabene1111
60a533f9c8 Merge branch 'develop' into feature/meal-planning 2020-06-10 16:01:21 +02:00
vabene1111
ec8a879efa improved pdf viewer 2020-06-10 15:40:24 +02:00
vabene1111
8cb6ed2f60 adding items to plan 2020-06-09 13:11:01 +02:00
vabene1111
233f2a911f nothing working yet 2020-06-02 14:33:27 +02:00
vabene1111
989d8765d7 basic vue stuff working 2020-06-02 12:47:36 +02:00
vabene1111
2fcd207dc7 basic api 2020-06-02 12:04:14 +02:00
vabene1111
6a963c26b2 recipe rating 2020-05-02 17:31:35 +02:00
vabene1111
16963c17dc add default roles to existing users 2020-04-27 18:22:29 +02:00
vabene1111
1617fa7a3f fixed permissions comments, books 2020-04-27 16:50:05 +02:00
vabene1111
ad467fae28 added basic group permission system 2020-04-26 17:21:44 +02:00
vabene1111
7518d8c6b1 fixed several rewrite issues 2020-03-17 17:36:05 +01:00
vabene1111
0c1763b347 pdf display working 2020-02-19 18:13:11 +01:00
vabene1111
88dc713683 WIP pdf embedding 2020-02-19 16:55:13 +01:00
vabene1111
9d0a6e63f8 fixed not beeing able to open external recipes when internal exists 2019-12-25 19:47:11 +01:00
vabene1111
3428e75b86 nice checkboxes 2019-12-24 09:39:53 +01:00
vabene1111
2e313f6be4 nextcloud storage working 2019-11-14 17:38:31 +01:00
vabene1111
c8df93dd5f nextcloud links 90% working 2019-11-14 12:42:26 +01:00
vabene1111
2114ed037a refactored storage backend 2019-11-14 10:29:24 +01:00
vabene1111
16cf81ab4a view local recipes 2019-11-14 08:57:50 +01:00
vabene1111
be32b3f63e share link fixed 2018-06-07 00:29:00 +02:00
vabene1111
8b6f7bd7cb fixed link creation and updated model 2018-06-06 23:31:47 +02:00
vabene1111
4871b6194c storage backend reworked 2018-05-25 16:49:10 +02:00
vabene1111
8107e46b60 class filter tag 2018-05-07 00:38:37 +02:00
vabene1111
4be125353f import 2018-05-06 21:33:24 +02:00
vabene1111
b7fb7e8e9b basic import management page 2018-03-30 23:56:49 +02:00
vabene1111
e09b4d3074 sync working 2018-03-30 23:37:31 +02:00
vabene1111
37639ad4c7 generic views 2018-03-30 22:41:23 +02:00
vabene1111
59641e1af6 more nice things 2018-02-05 23:59:31 +01:00
vabene1111
ede7ddac0b modal + link caching 2018-02-05 23:18:57 +01:00
vabene1111
eea37b9af5 stuff working 2018-02-05 21:12:29 +01:00
vabene1111
35d8d50861 dropbox integration stuff 2018-02-05 19:57:32 +01:00