mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,845 Commits 21 Branches 170 Tags
281149e24746adee3a1f61a3bc674d943f976bd2
Commit Graph

650 Commits

Author SHA1 Message Date
smilerz
281149e247 search form and help doc 2021-06-06 14:25:05 -05:00
smilerz
591591e3dc search preference settings 2021-06-06 14:25:05 -05:00
smilerz
e170ae983b WIP 2021-06-06 14:25:05 -05:00
Kaibu
3d60379ed0 style fixes 2021-06-05 18:10:10 +02:00
vabene1111
fd7e20a46b signup captcha support + privacy/terms support 2021-06-05 16:40:28 +02:00
vabene1111
6fc0c02674 started work on supermarket edit view 2021-05-31 18:40:59 +02:00
Kaibu
ad24a44588 new tandoor theme added, minor ux fixes 2021-05-31 00:47:59 +02:00
vabene1111
4f09970130 fixed frontend localization 2021-05-30 17:12:59 +02:00
vabene1111
3c778927e2 email settings 2021-05-30 15:53:16 +02:00
vabene1111
46a8a9f60d disable password reset if no mail is set 2021-05-28 18:41:30 +02:00
vabene1111
71fdfe6acb ugly space management hack - will be improved later 2021-05-28 18:19:53 +02:00
vabene1111
c8054349b2 reworked invite system 2021-05-28 16:49:03 +02:00
vabene1111
a14e33973c signup, reset and other account stuff 2021-05-26 22:36:53 +02:00
vabene1111
be225d2b8c added ignore duplication option in import again 2021-05-20 17:03:47 +02:00
vabene1111
d67bb9de25 fixed mealplan update non recipe entries 2021-05-19 13:12:12 +02:00
vabene1111
4b7896f7d1 auto open/close shopping list when checked 2021-05-19 12:58:34 +02:00
vabene1111
f0ba8eb788 recettetek importer 2021-05-18 18:47:53 +02:00
vabene1111
149020f930 fixed shopping list escaping issue 2021-05-18 18:20:41 +02:00
smilerz
984d5aae11 misc cleanup 2021-05-02 20:06:53 -05:00
vabene1111
c4880bf5b0 Merge branch 'develop' into bookmarklet 2021-05-02 17:41:38 +02:00
vabene1111
3baa03396c tweaks to the importer 2021-05-02 17:33:52 +02:00
smilerz
ed76f020c5 fix loading bookmarklet 2021-05-01 16:30:23 -05:00
smilerz
82abdd0144 removed unnecessary console message 2021-05-01 16:30:23 -05:00
smilerz
059987fd9f removed console.log() 2021-05-01 16:30:22 -05:00
smilerz
2ecc0ab680 Fix after rebase 2021-05-01 16:30:22 -05:00
smilerz
358ba5120d convert servings to number on import 2021-05-01 16:30:22 -05:00
smilerz
018fa0a62f updated bookmarklet to work with updated import process 2021-05-01 16:30:22 -05:00
smilerz
faf458e8ef Squashed commit of the following: 
commit 707d862e01a7497a1f22879d314b865a35e0e85b
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 10:35:00 2021 -0500

    works now

commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 10:25:24 2021 -0500

    updated serializer and api

commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 10:20:19 2021 -0500

    fixed bookmarklet

commit 9779104902d3be0258c95cd2eeebcba0d5d48892
Merge: bb8262c 0cb3928
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 09:56:27 2021 -0500

    Merge branch 'bookmarklet' into json_import

commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 09:42:53 2021 -0500

    retrieve bookmarklet ID from get

commit e89e0218de684d40b2e2bfb6ba833891206c828e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Apr 14 09:29:33 2021 -0500

    Revert "fixed broken tab"

    This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6.

commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79
Merge: b1e73aa 35a7f62
Author: smilerz <smilerz@gmail.com>
Date:   Sun Apr 11 20:35:57 2021 -0500

    Merge branch 'main_fork' into json_import
 2021-05-01 16:30:22 -05:00
smilerz
2c5348fcb4 added missing bookmarklet 2021-05-01 16:30:22 -05:00
smilerz
5fff5b97da simplified url import 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
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
30a357e27f added CORS middleware 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
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
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
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
91e36eb222 updated URL import page with tab interface 2021-05-01 16:30:20 -05:00