cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,937 Commits 2 Branches 0 Tags
5378b4c5771021b1f7a53c8ea5ca45793d98becd
Commit Graph

1937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
3270f56744 Bump six from 1.15.0 to 1.16.0 
Bumps [six](https://github.com/benjaminp/six) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/benjaminp/six/releases)
- [Changelog](https://github.com/benjaminp/six/blob/master/CHANGES)
- [Commits](https://github.com/benjaminp/six/compare/1.15.0...1.16.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-06 05:53:28 +00:00
Sebastian Markgraf
36df86c26c Change minimum of input field to be 0. 2021-05-05 18:11:30 +02:00
Sebastian Markgraf
532d6e2867 Fix rtl input field. 2021-05-05 17:09:31 +02:00
vabene1111
7c6d32456a Merge pull request #603 from vabene1111/dependabot/pip/pytest-6.2.4 
Bump pytest from 6.2.3 to 6.2.4
 2021-05-05 11:55:24 +02:00
vabene1111
6b8aa99b24 Merge pull request #602 from vabene1111/dependabot/pip/django-3.2.1 
Bump django from 3.2 to 3.2.1
 2021-05-05 11:55:14 +02:00
dependabot[bot]
65a6c08015 Bump pytest from 6.2.3 to 6.2.4 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.3 to 6.2.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.3...6.2.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-05 05:52:46 +00:00
dependabot[bot]
22f4612d12 Bump django from 3.2 to 3.2.1 
Bumps [django](https://github.com/django/django) from 3.2 to 3.2.1.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2...3.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-05 05:52:39 +00:00
Jesse
f65a5a9ad7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (50 of 50 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
 2021-05-04 09:02:55 +00:00
Jesse
02b2d953ce Translated using Weblate (Dutch) 
Currently translated at 100.0% (371 of 371 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-05-04 09:02:54 +00:00
vabene1111
19cdf3a919 Merge pull request #600 from smilerz/develop 
minor bug fix in bookmarklet
 2021-05-03 19:00:03 +02:00
smilerz
6dfe737ec5 minor bug fix in bookmarklet 2021-05-03 08:40:09 -05:00
vabene1111
6110c75f59 Merge pull request #598 from smilerz/develop 
updated to handle new behavior of recipe_scrapers
 2021-05-03 07:49:37 +02:00
smilerz
984d5aae11 misc cleanup 2021-05-02 20:06:53 -05:00
smilerz
e345d2eb39 updated to handle new behavior of recipe_scrapers 2021-05-02 15:44:27 -05:00
vabene1111
90e1e69dac Merge pull request #515 from smilerz/bookmarklet 
Bookmarklet
 2021-05-02 17:41:46 +02: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
vabene1111
373df5d99f updated python in ci 2021-05-02 13:44:59 +02:00
vabene1111
d36274066a some fixed for the new importer + bumped python to 3.9 2021-05-02 13:42:14 +02:00
smilerz
59c33798b8 Fix after rebase 2021-05-01 16:30:33 -05:00
smilerz
d7afbc5745 truncate query params on url 2021-05-01 16:30:23 -05:00
smilerz
c62a88d032 include script name prefix in bookmarklet 2021-05-01 16:30:23 -05:00
smilerz
ed76f020c5 fix loading bookmarklet 2021-05-01 16:30:23 -05:00
smilerz
8b61d8c504 no_perm 2021-05-01 16:30:23 -05:00
smilerz
82abdd0144 removed unnecessary console message 2021-05-01 16:30:23 -05:00
smilerz
04d131f534 removed commented out settings 2021-05-01 16:30:22 -05:00
smilerz
8cc74f3dcd removed unused cors_headers 2021-05-01 16:30:22 -05:00
smilerz
bd46962b71 removed line breaks 2021-05-01 16:30:22 -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
a69fb4922d updated model 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
254267c2a7 update tests to handle url decoding 2021-05-01 16:30:22 -05:00
smilerz
a701437548 bring parser inline with json_import branch 2021-05-01 16:30:22 -05:00
smilerz
25f6adba1f unescape html document 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
2b16f966a2 Revert "bug fix url import" 
This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23.
 2021-05-01 16:30:22 -05:00
smilerz
c2931137bb removed extra string normalization 2021-05-01 16:30:22 -05:00
smilerz
461d53671c updated migration 2021-05-01 16:30:22 -05:00
smilerz
3e4e55e9c5 updated recipe targets in tests to reflect html decoding 2021-05-01 16:30:22 -05:00
smilerz
11fa23f3da fixes #527 2021-05-01 16:30:22 -05:00
smilerz
6de128757f bug fix url import 2021-05-01 16:30:22 -05:00
smilerz
7c682ebab3 url import bug fixes 2021-05-01 16:30:22 -05:00
smilerz
ee165ef0f1 bug fix tests 2021-05-01 16:30:22 -05:00
smilerz
4bc4ce0d7c bug fix url import 2021-05-01 16:30:22 -05:00
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