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 81a8734fac
Merge: abcef54
f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Sat Mar 20 22:41:13 2021 +0100
Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support
Add iOS webclip icon support
commit abcef54e72
Merge: e15c92c
7527646
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Sat Mar 20 22:30:43 2021 +0100
Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1
Bump recipe-scrapers from 12.2.0 to 12.2.1
commit e15c92cda5
Merge: 58fc269
45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Sat Mar 20 22:26:06 2021 +0100
Merge pull request #501 from smilerz/main_fork
fix json direct import when wrapped in @graph
commit 45dba6fad2
Author: smilerz <smilerz@gmail.com>
Date: Fri Mar 19 13:23:55 2021 -0500
fix json direct import when wrapped in @graph
commit f67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de>
Date: Fri Mar 19 15:49:12 2021 +0100
Add generated icons from icongenerator.
commit 53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de>
Date: Fri Mar 19 12:48:58 2021 +0100
Fix errors in favicon SVG.
commit 7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri Mar 19 05:51:22 2021 +0000
Bump recipe-scrapers from 12.2.0 to 12.2.1
Bumps [recipe-scrapers](https://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