smilerz
30a357e27f
added CORS middleware
2021-05-01 16:30:21 -05:00
smilerz
7bc3292301
added bookmarklet model and api
2021-05-01 16:30:21 -05:00
smilerz
7fb440a855
bookmarklet passing data to form
2021-05-01 16:30:21 -05:00
smilerz
0a38049ce4
Squashed commit of the following:
...
commit 81a8734facabcef54f67bb3c#499 from sebimarkgraf/fix/432-ios-webclip-support
Add iOS webclip icon support
commit abcef54e72e15c92c7527646#498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1
Bump recipe-scrapers from 12.2.0 to 12.2.1
commit e15c92cda558fc26945dba6f#501 from smilerz/main_fork
fix json direct import when wrapped in @graph
commit 45dba6fad2f67bb3cb9853b584da567527646319https://github.com/hhursev/recipe-scrapers ) from 12.2.0 to 12.2.1.
- [Release notes](https://github.com/hhursev/recipe-scrapers/releases )
- [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-01 16:30:21 -05:00
smilerz
788e253749
added image import
2021-05-01 16:30:21 -05:00
smilerz
9cc6a1dc79
combined json import and source import
2021-05-01 16:30:20 -05:00
smilerz
6a13619bbd
more fix from super ugly merge
2021-05-01 16:30:20 -05:00
smilerz
58e33ef31a
more cleanup from ugly merge
2021-05-01 16:30:20 -05:00
smilerz
71e02c0916
manually parse json
2021-05-01 16:30:20 -05:00
smilerz
34ff484830
commit merge from Patralos/recipes
2021-05-01 16:30:20 -05:00
smilerz
55ba568f3c
import raw json/html
2021-05-01 16:30:20 -05:00
Patrick Pirker
7414033495
Allow recipes to be imported from json directly
2021-05-01 16:30:20 -05:00
vabene1111
3daebc4170
Merge branch 'develop' into json_import
2021-05-01 22:39:20 +02:00
vabene1111
dc27f39393
added recently viewed to new search
2021-04-26 17:21:14 +02:00
vabene1111
a376c3a5b6
meal plan random fix
2021-04-18 17:55:48 +02:00
vabene1111
4ad5d6ef2f
fixed test + added api doc for new search
2021-04-18 15:01:39 +02:00
vabene1111
e676b4bac3
added api pagination for recipes
2021-04-18 14:05:19 +02:00
vabene1111
880db58d38
v2 search filtering
2021-04-17 21:28:29 +02:00
smilerz
5869a8ad1b
fixes to pass tests
2021-04-17 13:43:34 -05:00
smilerz
7cc515bcdf
fix manual url import
2021-04-16 17:08:25 -05:00
smilerz
724748d38a
corrected api import workflow
2021-04-16 14:09:10 -05:00
smilerz
b2c1c6e301
restored missing manual url scrape
2021-04-16 11:26:26 -05:00
smilerz
987be4b04d
Fix after rebase
2021-04-16 09:02:27 -05:00
smilerz
d814d13d54
custom scraper fails safe
2021-04-16 09:02:03 -05:00
smilerz
2fe6788ce5
bug fix url import
2021-04-16 09:02:03 -05:00
smilerz
efe4c4043d
simplified url import
2021-04-16 09:02:03 -05:00
smilerz
c8a4861df8
redirect to import url for processing
2021-04-16 09:02:02 -05:00
smilerz
a341fd8ebe
added CORS middleware
2021-04-16 09:02:02 -05:00
smilerz
9a62b6e4e7
added bookmarklet model and api
2021-04-16 09:02:02 -05:00
smilerz
f80c44bca3
bookmarklet passing data to form
2021-04-16 09:02:02 -05:00
smilerz
4d5a9e446f
Squashed commit of the following:
...
commit 81a8734facabcef54f67bb3c#499 from sebimarkgraf/fix/432-ios-webclip-support
Add iOS webclip icon support
commit abcef54e72e15c92c7527646#498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1
Bump recipe-scrapers from 12.2.0 to 12.2.1
commit e15c92cda558fc26945dba6f#501 from smilerz/main_fork
fix json direct import when wrapped in @graph
commit 45dba6fad2f67bb3cb9853b584da567527646319https://github.com/hhursev/recipe-scrapers ) from 12.2.0 to 12.2.1.
- [Release notes](https://github.com/hhursev/recipe-scrapers/releases )
- [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-04-16 09:02:02 -05:00
smilerz
cb708e7e47
added image import
2021-04-16 09:02:02 -05:00
smilerz
40a2f7ff90
combined json import and source import
2021-04-16 09:02:01 -05:00
smilerz
4015517c0a
more fix from super ugly merge
2021-04-16 09:02:01 -05:00
smilerz
7c8d41753c
more cleanup from ugly merge
2021-04-16 09:02:01 -05:00
smilerz
647c1678f1
added drag and drop to ingredients
2021-04-16 09:02:01 -05:00
smilerz
44dee16e0a
manually parse json
2021-04-16 09:02:01 -05:00
smilerz
3a48d0e580
commit merge from Patralos/recipes
2021-04-16 09:02:01 -05:00
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
