Commit Graph

1219 Commits

Author SHA1 Message Date
smilerz
c50bd039ef recipe import tests 2021-05-01 16:30:22 -05:00
smilerz
5fff5b97da simplified url import 2021-05-01 16:30:21 -05:00
smilerz
2c27e06bfb add data for url_import test 2021-05-01 16:30:21 -05:00
smilerz
e4044016c3 added all ATK sites to custom scraper 2021-05-01 16:30:21 -05:00
smilerz
52df886372 added cooksillustrated custom scraper 2021-05-01 16:30:21 -05:00
smilerz
c7949edb18 ensure time is always a number 2021-05-01 16:30:21 -05:00
smilerz
342a261017 added ability to create custom scrapers 2021-05-01 16:30:21 -05:00
smilerz
e5984abd97 removed old json importer 2021-05-01 16:30:21 -05:00
smilerz
2ea3e4f8f3 updated import from source to use text scraper 2021-05-01 16:30:21 -05:00
smilerz
98b3b002f9 remove old html_import function 2021-05-01 16:30:21 -05:00
smilerz
d2a1a0ac32 wrapper for recipe_scrapers to parse text input 2021-05-01 16:30:21 -05:00
smilerz
2ceefdd9b0 fixed broken tab 2021-05-01 16:30:21 -05:00
smilerz
b22392726f delete bookmarklet on import 2021-05-01 16:30:21 -05:00
smilerz
b89fedd07f removed console message 2021-05-01 16:30:21 -05:00
smilerz
a263771383 fixed ingredient display on preview 2021-05-01 16:30:21 -05:00
smilerz
7cc757ac33 redirect to import url for processing 2021-05-01 16:30:21 -05:00
smilerz
6acbd6d308 added hack to fix scopes & CORS for bookmarklet 2021-05-01 16:30:21 -05:00
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
0e27ddab74 added bookmarklet that doesn't work yet 2021-05-01 16:30:21 -05:00
smilerz
0a38049ce4 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-05-01 16:30:21 -05:00
smilerz
4aaecb4ada updated links to import recipes 2021-05-01 16:30:21 -05:00
smilerz
3f5e64fc4a added collapsable cards 2021-05-01 16:30:21 -05:00
smilerz
154527ef1b cosmetic cleanup 2021-05-01 16:30:21 -05:00
smilerz
788e253749 added image import 2021-05-01 16:30:21 -05:00
smilerz
7c8b489857 consolidated integration imports into url_import 2021-05-01 16:30:21 -05:00
smilerz
cdc25b480d staged app import tabs 2021-05-01 16:30:21 -05:00
smilerz
1568d86143 fixed missing space in keyword when adding recipe 2021-05-01 16:30:21 -05:00
smilerz
adeb360837 removed unused templates 2021-05-01 16:30:20 -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
36841d74af fixed ugly merge 2021-05-01 16:30:20 -05:00
smilerz
8094c7d53a added drag and drop to ingredients 2021-05-01 16:30:20 -05:00
smilerz
71e02c0916 manually parse json 2021-05-01 16:30:20 -05:00
smilerz
25fb41baed update urls.py 2021-05-01 16:30:20 -05:00
smilerz
34ff484830 commit merge from Patralos/recipes 2021-05-01 16:30:20 -05:00
smilerz
91e36eb222 updated URL import page with tab interface 2021-05-01 16:30:20 -05:00
smilerz
55ba568f3c import raw json/html 2021-05-01 16:30:20 -05:00
smilerz
8f3f1c230c refactored json parser to create functions for each sub parser 2021-05-01 16:30:20 -05:00
Patrick Pirker
1690abaf47 replace common fractions with their concrete value (else parsing is not possible) 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
d1b9d15816 recipe_scrapers deprectation fix 2021-05-01 22:56:00 +02:00
vabene1111
3daebc4170
Merge branch 'develop' into json_import 2021-05-01 22:39:20 +02:00
vabene1111
67485c0ea3
Merge pull request #585 from TimPansino/develop
Fix crash on missing photos in paprika
2021-05-01 22:18:27 +02:00
vabene1111
aafbc497cc search view fixes/updates 2021-05-01 22:16:29 +02:00
vabene1111
7bc4ae9870 fixed paprika importer 2021-05-01 19:19:48 +02:00
Marcel Paluch
7a017899ee Translated using Weblate (German)
Currently translated at 99.7% (370 of 371 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
2021-05-01 13:01:55 +00:00
vabene1111
239ba5f861 fixed meal plan notes and recipe links 2021-04-29 17:15:06 +02:00