smilerz
d814d13d54
custom scraper fails safe
2021-04-16 09:02:03 -05:00
smilerz
d0cedaf7a1
added name parser
2021-04-16 09:02:03 -05:00
smilerz
01f504f7b1
updated tests to handle html decoding
2021-04-16 09:02:03 -05:00
smilerz
c716346f1f
flake
2021-04-16 09:02:03 -05:00
smilerz
fef5236931
decode url strings in text_parser
2021-04-16 09:02:03 -05:00
smilerz
b115c37eb8
catch error on scrape.image()
2021-04-16 09:02:03 -05:00
smilerz
1e17f3703a
trap error on scrape.title()
2021-04-16 09:02:03 -05:00
smilerz
468b986314
updated tests
2021-04-16 09:02:03 -05:00
smilerz
a531d135b5
remove html tags from description
2021-04-16 09:02:03 -05:00
smilerz
7524609cd0
retrieve bookmarklet ID from get
2021-04-16 09:02:03 -05:00
smilerz
a28f8e65d5
Revert "fixed broken tab"
...
This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6.
2021-04-16 09:02:03 -05:00
smilerz
d193637091
added missing bookmarklet
2021-04-16 09:02:03 -05:00
smilerz
0953af05fc
Revert "bug fix url import"
...
This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23.
2021-04-16 09:02:03 -05:00
smilerz
19e8e5cb5b
removed extra string normalization
2021-04-16 09:02:03 -05:00
smilerz
43c808380d
updated migration
2021-04-16 09:02:03 -05:00
smilerz
7ab8b84044
updated recipe targets in tests to reflect html decoding
2021-04-16 09:02:03 -05:00
smilerz
d739fe6752
fixes #527
2021-04-16 09:02:03 -05:00
smilerz
a84c41e29f
bug fix url import
2021-04-16 09:02:03 -05:00
smilerz
393aba1f31
url import bug fixes
2021-04-16 09:02:03 -05:00
smilerz
436a070730
bug fix tests
2021-04-16 09:02:03 -05:00
smilerz
2fe6788ce5
bug fix url import
2021-04-16 09:02:03 -05:00
smilerz
747d146389
recipe import tests
2021-04-16 09:02:03 -05:00
smilerz
efe4c4043d
simplified url import
2021-04-16 09:02:03 -05:00
smilerz
c6739ba8e0
add data for url_import test
2021-04-16 09:02:02 -05:00
smilerz
50140db668
added all ATK sites to custom scraper
2021-04-16 09:02:02 -05:00
smilerz
028b2dfb22
added cooksillustrated custom scraper
2021-04-16 09:02:02 -05:00
smilerz
ec6a10ca0a
ensure time is always a number
2021-04-16 09:02:02 -05:00
smilerz
3cf949bf8d
added ability to create custom scrapers
2021-04-16 09:02:02 -05:00
smilerz
0a62225797
removed old json importer
2021-04-16 09:02:02 -05:00
smilerz
a54f4e1367
updated import from source to use text scraper
2021-04-16 09:02:02 -05:00
smilerz
bf3c30a8fb
remove old html_import function
2021-04-16 09:02:02 -05:00
smilerz
f811f5996e
wrapper for recipe_scrapers to parse text input
2021-04-16 09:02:02 -05:00
smilerz
a3490240f4
fixed broken tab
2021-04-16 09:02:02 -05:00
smilerz
b26aea96f4
delete bookmarklet on import
2021-04-16 09:02:02 -05:00
smilerz
4d4af5fdf2
removed console message
2021-04-16 09:02:02 -05:00
smilerz
3da74505d6
fixed ingredient display on preview
2021-04-16 09:02:02 -05:00
smilerz
c8a4861df8
redirect to import url for processing
2021-04-16 09:02:02 -05:00
smilerz
5e27cd606e
added hack to fix scopes & CORS for bookmarklet
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
09d2e9f831
added bookmarklet that doesn't work yet
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
6a2c27749f
updated links to import recipes
2021-04-16 09:02:02 -05:00
smilerz
de60e12073
added collapsable cards
2021-04-16 09:02:02 -05:00
smilerz
1188ed9227
cosmetic cleanup
2021-04-16 09:02:02 -05:00
smilerz
cb708e7e47
added image import
2021-04-16 09:02:02 -05:00
smilerz
215eadb4a0
consolidated integration imports into url_import
2021-04-16 09:02:02 -05:00
smilerz
4ffc54f720
staged app import tabs
2021-04-16 09:02:02 -05:00
smilerz
21f6c7a21f
fixed missing space in keyword when adding recipe
2021-04-16 09:02:02 -05:00
smilerz
ce7c6939d2
removed unused templates
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
90670613c5
fixed 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
f8fedcac82
update urls.py
2021-04-16 09:02:01 -05:00
smilerz
3a48d0e580
commit merge from Patralos/recipes
2021-04-16 09:02:01 -05:00
smilerz
9930789aa8
updated URL import page with tab interface
2021-04-16 09:02:01 -05:00
smilerz
83fce6461a
import raw json/html
2021-04-16 09:02:01 -05:00
smilerz
f0d37244b6
refactored json parser to create functions for each sub parser
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
e38f50c352
v2 search basic display of recipes
2021-04-15 22:49:30 +02:00
vabene1111
c1abff8da0
v2 search basics
2021-04-15 22:12:31 +02:00
vabene1111
5521c29d43
Merge pull request #550 from comradekingu/patch-1
...
Spelling: Log out
2021-04-15 18:45:17 +02:00
vabene1111
dc3a530928
Merge pull request #555 from smilerz/deprecation-fixes
...
Deprecation fixes
2021-04-15 18:43:40 +02:00
vabene1111
48f63b4d9f
Merge pull request #552 from smilerz/main_fork
...
fixed tests to work in batch mode
2021-04-15 18:43:34 +02:00
vabene1111
a1502bffd1
translations doc
2021-04-15 18:43:02 +02:00
Olle Mineur
6bf72c4043
Translated using Weblate (Swedish)
...
Currently translated at 51.2% (190 of 371 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sv/
2021-04-12 20:22:10 +00:00
Jesse
7d82393789
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-04-12 20:22:08 +00:00
Hrachya Kocharyan
2254d6f072
Translated using Weblate (Armenian)
...
Currently translated at 100.0% (362 of 362 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/hy/
2021-04-12 20:22:08 +00:00
smilerz
8d02cad7d9
resolved deprecation warnings introduced in django 3.2
2021-04-12 14:12:04 -05:00
smilerz
b37fc4e24f
fixed tests to work in batch mode
2021-04-11 22:05:27 -05:00
vabene1111
ffc1c5a99c
Added translation using Weblate (Swedish)
2021-04-11 19:15:43 +00:00
vabene1111
fc2a60a4ba
fixed postgres search
2021-04-11 21:02:47 +02:00
vabene1111
fb0f424d82
migrated new vue component system to vue native translations
2021-04-11 18:08:29 +02:00
vabene1111
77ba482b79
possible fixed code ql
2021-04-11 17:34:02 +02:00
Allan Nordhøy
7bb23e8362
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 24.7% (92 of 371 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nb_NO/
2021-04-11 15:23:07 +00:00
Oliver Cervera
cbb659da41
Translated using Weblate (Italian)
...
Currently translated at 100.0% (371 of 371 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
2021-04-11 15:23:07 +00:00
vabene1111
52b0382243
Translated using Weblate (German)
...
Currently translated at 100.0% (371 of 371 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
2021-04-11 15:23:07 +00:00
vabene1111
cce373a522
started migrating frontend localization
2021-04-11 17:03:09 +02:00
Allan Nordhøy
b4b3e659de
Spelling: Log out
2021-04-11 16:27:16 +02:00
Allan Nordhøy
f81500ec99
Added translation using Weblate (Norwegian Bokmål)
2021-04-11 14:18:57 +00:00
vabene1111
52ba2be586
Translated using Weblate (German)
...
Currently translated at 99.4% (369 of 371 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
2021-04-11 13:40:05 +00:00
vabene1111
36129b29b4
made and compiled messages
2021-04-11 15:09:54 +02:00
vabene1111
c780f81dd8
Merge pull request #536 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_ca
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'ca' [manual sync]
2021-04-11 14:09:13 +02:00
vabene1111
e6d9ffbb9c
Merge pull request #538 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_nl
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'nl' [manual sync]
2021-04-11 14:09:04 +02:00
vabene1111
3b188c3c55
Merge pull request #539 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_fr
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'fr' [manual sync]
2021-04-11 14:09:00 +02:00
vabene1111
1f80df262b
Merge pull request #541 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_hu_HU
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'hu_HU' [manual sync]
2021-04-11 14:08:51 +02:00
vabene1111
3d925b29c2
Merge pull request #543 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_lv
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'lv' [manual sync]
2021-04-11 14:08:43 +02:00
vabene1111
4825317a58
Merge pull request #544 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_pl
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'pl' [manual sync]
2021-04-11 14:08:39 +02:00
vabene1111
9a5408e996
Merge pull request #545 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_pt
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'pt' [manual sync]
2021-04-11 14:08:34 +02:00
vabene1111
bc8aadbe4e
Merge pull request #547 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_tr
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'tr' [manual sync]
2021-04-11 14:08:27 +02:00
transifex-integration[bot]
46dce472db
Apply translations in vi
...
at least 1% translated for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'vi' language.
Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
2021-04-11 11:51:07 +00:00
transifex-integration[bot]
556ca1bcb1
Apply translations in tr
...
at least 1% translated for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'tr' language.
Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
2021-04-11 11:51:03 +00:00
transifex-integration[bot]
3e950602a7
Apply translations in pt
...
at least 1% translated for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'pt' language.
Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
2021-04-11 11:50:55 +00:00
transifex-integration[bot]
1fe0757f6c
Apply translations in pl
...
at least 1% translated for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'pl' language.
Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
2021-04-11 11:50:51 +00:00
transifex-integration[bot]
b6cf1cf5e6
Apply translations in lv
...
at least 1% translated for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'lv' language.
Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
2021-04-11 11:50:47 +00:00
transifex-integration[bot]
cb44136b2e
Apply translations in hu_HU
...
at least 1% translated for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'hu_HU' language.
Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
2021-04-11 11:50:38 +00:00
transifex-integration[bot]
82e7118757
Apply translations in fr
...
at least 1% translated for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'fr' language.
Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
2021-04-11 11:50:30 +00:00
transifex-integration[bot]
6d9817183e
Apply translations in nl
...
at least 1% translated for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
2021-04-11 11:50:25 +00:00
transifex-integration[bot]
da1d88314b
Apply translations in ca
...
at least 1% translated for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'ca' language.
Manual sync of partially translated files: untranslated content is included with an empty translation or source language content depending on file format
2021-04-11 11:50:13 +00:00
vabene1111
f21de5eddc
fixed public share links
2021-04-10 14:36:56 +02:00
smilerz
6eb14daf4d
fix backend detection
2021-04-09 13:13:10 -05:00
vabene1111
fad40dab6c
client api generation
2021-04-08 22:05:05 +02:00
vabene1111
015e01afb9
cheftap importer improvement
2021-04-08 21:01:07 +02:00
vabene1111
0862c0f0bc
add migration to automatically assign group to existing superusers
2021-04-06 18:10:22 +02:00
vabene1111
01a53ad8ec
paprika improvements and importer fixes
2021-04-05 17:55:06 +02:00
vabene1111
a5b92f5672
fixed template render issues
2021-04-04 11:16:48 +02:00
vabene1111
c5d509bf9e
added default space/group for o auth signup
2021-03-28 22:16:12 +02:00
vabene1111
8b0f9bc2e7
fixed broken asset link in base html
2021-03-28 22:00:51 +02:00
vabene1111
4db17874c4
added meal master import
2021-03-28 21:50:52 +02:00
vabene1111
f6c491a8e6
added rezkonv importer
2021-03-28 21:13:26 +02:00
vabene1111
e4a9f56352
update integration file split
2021-03-28 19:49:03 +02:00
vabene1111
c1287407a3
added export support for recipe sage
2021-03-28 19:29:09 +02:00
vabene1111
ba1e18410a
Merge pull request #510 from ModdedGamers/develop
...
Cheftap import tweak
2021-03-28 19:08:47 +02:00
vabene1111
7f8e29f1bc
added recipe sage and domestica imports
2021-03-28 18:58:37 +02:00
Modded Gamers
681c57201a
Cheftap import tweak
...
When I submitted my testing .zip, I didn't submit my normal export, because that has some personal data in the recipes. Instead, I made one by had, which was a mistake. The folder contained inside is also called cheftap_export.
2021-03-28 12:37:59 -04:00
vabene1111
738f0781b2
added import for pepperplate
2021-03-28 18:22:30 +02:00
vabene1111
6143e31e1a
tweaked chef tap import
2021-03-28 18:04:12 +02:00
vabene1111
d6e6ab24c2
Cheftap import
2021-03-28 17:56:53 +02:00
vabene1111
25717f6a79
space max
2021-03-24 00:06:34 +01:00
vabene1111
81a8734fac
Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support
...
Add iOS webclip icon support
2021-03-20 22:41:13 +01:00
smilerz
45dba6fad2
fix json direct import when wrapped in @graph
2021-03-19 13:23:55 -05:00
Sebastian Markgraf
f67bb3cb98
Add generated icons from icongenerator.
2021-03-19 15:49:12 +01:00
Sebastian Markgraf
53b584da56
Fix errors in favicon SVG.
2021-03-19 12:48:58 +01:00
vabene1111
58fc26904b
fixed url importer stuff
2021-03-19 10:05:17 +01:00
vabene1111
d3b1139a22
fixed migration
2021-03-19 00:33:06 +01:00
vabene1111
f04a51c1ad
fixed empty units/foods (again)
2021-03-19 00:19:29 +01:00
vabene1111
7fbff9f3b5
sligthly improved login redirects
2021-03-18 23:42:24 +01:00
vabene1111
bb0f3e1778
build recipe view
2021-03-18 23:25:25 +01:00
vabene1111
6ab8d6bd0d
Merge pull request #497 from smilerz/recipe_description
...
Recipe description
2021-03-18 23:23:35 +01:00
vabene1111
69a51e0640
fixed broken messages queing up
2021-03-18 23:20:31 +01:00
vabene1111
1425e795ff
telegram create list if not exists and remove debug code
2021-03-18 22:51:06 +01:00
vabene1111
afadc61d5d
telegram bot
2021-03-18 22:34:53 +01:00
smilerz
ce8524b247
added data validation on name and description length
2021-03-18 16:03:13 -05:00
smilerz
fd09ae1510
add description to recipe on submit
2021-03-18 15:55:11 -05:00
smilerz
9137fbfb97
Merge remote-tracking branch 'upstream/develop' into recipe_description
2021-03-18 15:33:50 -05: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
661f7ae789
fixed slice fix again
2021-03-18 20:34:37 +01:00
vabene1111
8bfbd96398
fixed slicing issue
2021-03-18 20:24:42 +01:00
vabene1111
8a051b531d
import response view
2021-03-18 20:00:13 +01:00
vabene1111
de9456e3d7
import log api
2021-03-18 18:48:29 +01:00
vabene1111
950315936e
import log working
2021-03-18 18:30:12 +01:00
vabene1111
af1bc19fd8
fixed importer threading stuff
2021-03-18 18:08:22 +01:00
vabene1111
906da25301
prevent duplicate imports
2021-03-18 17:02:02 +01:00
vabene1111
fe1ddf1237
improved paprika importer
2021-03-18 14:43:19 +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
e00b6b9293
fixed meal plan creation from recipe context menu
2021-03-18 11:56:47 +01:00
vabene1111
8c9ee37c46
updated external image viewer
2021-03-18 11:53:32 +01:00
vabene1111
45a0bda758
updated transaltion
2021-03-18 11:53:14 +01:00
vabene1111
e71417e77f
Merge pull request #480 from auanasgheps/patch-1
...
Update Italian Translation
2021-03-18 11:19:58 +01:00
vabene1111
29e6eda9cd
Merge pull request #463 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_nl
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'nl'
2021-03-18 11:19:18 +01:00
vabene1111
b68d2ba384
Merge pull request #485 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_es
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'es'
2021-03-18 11:18:28 +01:00
vabene1111
daf0be37fd
upgraded javascritp dependencies
2021-03-18 11:18:09 +01:00
vabene1111
6a25428b3c
fixed shopping list share permission
2021-03-18 11:04:55 +01:00
vabene1111
cb78f75f19
fixed shopping list auto sync flickering
2021-03-18 10:56:12 +01:00
vabene1111
2149f4034b
several shopping list improvements
2021-03-17 23:28:28 +01:00
vabene1111
76eeed1a77
all tests migrated and improved
2021-03-17 22:10:58 +01:00
vabene1111
ad0d802e41
more tests
2021-03-17 21:18:54 +01:00
vabene1111
e41464cb31
recipe api test
2021-03-17 20:53:12 +01:00
vabene1111
ab3f7bf671
step api test
2021-03-17 20:46:49 +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
c2addc1121
storage api test
2021-03-17 00:14:54 +01:00
vabene1111
a25109e16c
added sync api test
2021-03-17 00:03:36 +01:00
vabene1111
ae81b10dbd
added supermarket api test
2021-03-16 23:50:51 +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
3b0413c30e
add test for recipe book
2021-03-12 10:50:08 +01:00
vabene1111
d767743b64
user name api test
2021-03-12 10:16:51 +01:00
vabene1111
e8f7caebd1
test unit api
2021-03-12 09:52:46 +01:00
vabene1111
a7b7272bec
view log api test
2021-03-12 09:50:20 +01:00
vabene1111
d7402f60c5
meal plan api tests
2021-03-12 09:44:16 +01:00
vabene1111
d049cf6d3d
ingredient test finished
2021-03-11 21:50:54 +01:00
vabene1111
fdcdf6a026
added food test
2021-03-11 18:23:00 +01:00
vabene1111
7e38e946a5
fixed various space related bugs
2021-03-11 16:41:05 +01:00
vabene1111
b552badff7
fixed limit random recipe
2021-03-11 15:37:37 +01:00
transifex-integration[bot]
d10c84b66e
Apply translations in es
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'es' language.
2021-03-10 23:51:17 +00: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
vabene1111
b9b7a125f0
more tests working but scopes broken
2021-03-10 19:46:08 +01:00
vabene1111
4742056223
tests basically working
2021-03-10 18:18:19 +01:00
vabene1111
ba4c3b95e5
removed deprecated functions/packages
2021-03-10 18:17:31 +01:00
smilerz
1f5ddd9af7
limit description in search to 2 lines
2021-03-06 17:36:51 -06:00
smilerz
d3e6b34a63
added description to search and recipe view
2021-03-06 16:32:59 -06:00
Oliver Cervera
323f424630
Update Italian Translation
...
Italian translation updates.
Manual PR since Transifex doesn't do it.
2021-03-06 13:03:03 +01:00
smilerz
eed6e9d3a5
catch index error
2021-03-04 15:30:20 -06:00
smilerz
f4af7ffb0b
except do it right this time
2021-03-04 15:03:33 -06:00
smilerz
3b072d5dd9
check for scrape.schema before using it
2021-03-04 14:59:56 -06:00
smilerz
11240dcf48
Merge branch 'recipe_description' of github.com:smilerz/recipes into recipe_description
2021-03-04 09:30:27 -06:00
smilerz
0b5fc1a9f4
added description to url_import
2021-03-04 09:20:26 -06:00
smilerz
049449bda3
removed recipe description from url_import template
2021-03-04 09:19:25 -06:00
smilerz
e5a19302f0
added description to url_import
2021-03-04 08:38:01 -06:00
smilerz
e1fa939757
pulled description field from url_import template
2021-03-04 08:33:02 -06:00
smilerz
3da33e364e
fixed test
2021-03-03 21:15:12 -06:00
smilerz
bfaed434cc
refactored url_import to use recipe-scraper
2021-03-03 21:08:34 -06:00
vabene1111
5fd03e7cdc
basics of pytest
2021-02-25 22:36:20 +01:00
vabene1111
c99c944130
fixed normal django test running with scopes
2021-02-25 22:19:51 +01:00
transifex-integration[bot]
94c9185bcf
Apply translations in nl
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
2021-02-25 18:59:22 +00:00
vabene1111
74e731e334
inject space context into serializer writes
2021-02-25 16:45:47 +01: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
29ab6cfb2d
Merge branch 'develop' into feature/spaces
...
# Conflicts:
# cookbook/views/data.py
# cookbook/views/views.py
2021-02-25 15:59:32 +01:00
vabene1111
59b2da933d
fixed tests
2021-02-25 08:27:22 +01:00
vabene1111
24b5cdff85
Merge pull request #459 from smilerz/fix-456
...
Fix 456
2021-02-25 08:14:55 +01:00
smilerz
21740522bc
fixed URL import when ingredient is a string
2021-02-24 20:13:06 -06:00
smilerz
47090ce863
added tests for add keyword and add duplicate keyword
2021-02-24 18:52:43 -06:00
smilerz
3ac22c08ff
fixed duplicate keyword handling
2021-02-24 18:52:04 -06:00
smilerz
cc62b088fd
fix URL import when recipeYield is a list
2021-02-24 17:52:40 -06:00
vabene1111
205f76d128
fix that does not really fix anything
...
see #453/454
2021-02-23 21:43:14 +01:00
vabene1111
4147bc61c7
Merge pull request #390 from smilerz/develop
...
Add keywords during edit & url import
2021-02-23 21:12:45 +01:00
vabene1111
058723d583
compiled translations and added hy
2021-02-23 20:54:42 +01:00
vabene1111
db4abdd31d
Merge pull request #426 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_it
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'it'
2021-02-23 20:50:35 +01:00
vabene1111
727b0e9e61
Merge pull request #403 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_hy
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'hy'
2021-02-23 20:49:40 +01:00
vabene1111
aa41146735
Merge pull request #448 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_de
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'de'
2021-02-23 20:48:51 +01:00
vabene1111
59cc22a877
wip serializer permission
2021-02-23 20:44:13 +01:00
vabene1111
7f391c25a4
fixed test
2021-02-22 19:59:43 +01:00
transifex-integration[bot]
cc882082d2
Apply translations in de
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'de' language.
2021-02-22 15:41:54 +00:00
vabene1111
40387428e7
recipe filter
2021-02-21 16:49:34 +01:00
vabene1111
46fb02376e
recipe share basics
2021-02-21 16:37:04 +01:00
vabene1111
24e43e3e2e
updated migrations + setup process update
2021-02-21 15:34:35 +01:00
vabene1111
846c660811
usr signup and more
2021-02-21 15:08:43 +01:00
vabene1111
beb4aa634f
forms
2021-02-20 23:42:44 +01:00
vabene1111
58c6077925
basic test stuff
2021-02-20 22:56:29 +01:00
vabene1111
d7675d4b80
ingredients and helpers
2021-02-20 21:26:16 +01:00
vabene1111
e2b1115b3b
fixed servings blank
2021-02-20 18:50:28 +01:00
vabene1111
96c963795e
more spaces work
2021-02-20 18:47:14 +01:00
vabene1111
ad163509b4
updated edit and added space find methods
2021-02-19 18:09:42 +01:00
vabene1111
fb58d35029
space stuff partially working
2021-02-19 15:50:55 +01:00
transifex-integration[bot]
79f823cd62
Apply translations in it
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
2021-02-19 13:42:50 +00:00
vabene1111
c42266b82c
basic space stuff
2021-02-19 11:53:30 +01:00
smilerz
fc5455a0f2
Revert "added new keyword management page"
...
This reverts commit 6962b0e218
2021-02-18 07:27:43 -06:00
smilerz
28d8f62af7
Revert "add filter to new keywords page"
...
This reverts commit c6dd55df4e
2021-02-18 07:25:31 -06:00
vabene1111
b6b505c361
fixed nutrition scaling fractiosn
2021-02-18 11:11:07 +01:00
vabene1111
97cef449c9
fixed recipe template rendering scaling issue
2021-02-18 09:37:17 +01:00
vabene1111
fef6f695ce
chowdown import folder syntax support
2021-02-18 09:36:13 +01:00
vabene1111
e727cae020
fixed typo that broke fractions
2021-02-18 09:17:42 +01:00
smilerz
c6dd55df4e
add filter to new keywords page
2021-02-17 10:45:31 -06:00
smilerz
6962b0e218
added new keyword management page
2021-02-17 07:09:19 -06:00
vabene1111
894d2d2e6b
gracful recipes api error on wrong format of update_at
2021-02-16 22:14:40 +01:00
transifex-integration[bot]
8bf4a32dfd
Apply translations in hy
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'hy' language.
2021-02-16 19:31:09 +00:00
smilerz
505650518e
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
2021-02-16 07:45:22 -06:00
vabene1111
f2765c75c6
favicon path in markdown docs
2021-02-15 21:16:31 +01:00
vabene1111
150d4c7309
refactor assset and paths
2021-02-15 21:01:54 +01:00
vabene1111
ac9922ff61
manifest fixes
2021-02-15 16:08:18 +01:00
vabene1111
ff0cd6fa93
fixed import log
2021-02-15 15:30:19 +01:00
vabene1111
777f4518be
servings default to 1 on import
2021-02-15 15:16:15 +01:00
vabene1111
84591fd17a
fixed issue with shopping list saving
2021-02-15 15:13:59 +01:00
vabene1111
7536425e39
added czech locale
2021-02-15 15:13:40 +01:00
vabene1111
9d28ce48fe
Merge pull request #397 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_cs
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'cs'
2021-02-15 15:11:50 +01:00
Aaron
87d6ca0200
Fix ingredient parsing for fractions using '/'
...
Even though ingredients like '1 1/2 something' already worked fine and got converted to 1.5 something
I just came across a recipe using '1/2' as the whole amount without any whole number before that.
Apparently I overlooked that case before so I now also fixed that.
2021-02-14 18:43:38 +01:00
transifex-integration[bot]
bcda57a4fa
Apply translations in cs
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'cs' language.
2021-02-14 13:12:22 +00:00
vabene1111
3e55207a8d
fixed path
2021-02-13 18:19:38 +01:00
vabene1111
20e9d4a990
new style and icon
2021-02-13 18:04:33 +01:00
smilerz
e0a0eeeecc
add keyword during url import
2021-02-09 12:55:40 -06:00
smilerz
4a4dafd69c
add keyword during recipe edit
2021-02-09 11:17:31 -06:00
vabene1111
6781128c1b
added help to import/export
2021-02-09 18:02:45 +01:00
vabene1111
73b7f60222
translations
2021-02-09 18:01:32 +01:00
vabene1111
46a9d19374
safron import
2021-02-09 17:34:38 +01:00
vabene1111
6ba1ff4505
added chowdown importer
2021-02-09 17:15:47 +01:00
vabene1111
58c5b2c301
add paprika import image support
2021-02-09 16:10:28 +01:00
vabene1111
5d1d6d4248
added mealie importer
2021-02-08 21:19:46 +01:00
vabene1111
149c5b5f5e
nextcloud import working with images
2021-02-08 19:19:56 +01:00
vabene1111
7d051336d3
basic nextcloud import
2021-02-08 19:09:45 +01:00
vabene1111
79da8db889
added paprika import
2021-02-08 13:47:06 +01:00
vabene1111
086570ce90
using new import/export module
2021-02-08 11:38:38 +01:00
vabene1111
d2783429a1
added documentation to importer
2021-02-08 11:26:41 +01:00
vabene1111
de19a10cba
more abstract import/export interface
2021-02-08 11:18:13 +01:00
vabene1111
f312631676
import tag recipes and show results after import
2021-02-08 10:54:04 +01:00
vabene1111
e0acd1de83
importing with image files working
2021-02-07 14:50:43 +01:00
vabene1111
585c31490a
export recipe without wrting files
2021-02-07 14:01:37 +01:00
vabene1111
3e7f96c0b8
basic export to zip working
2021-02-07 13:43:24 +01:00
vabene1111
d45adc1688
wip on new import/export system
2021-02-07 13:27:15 +01:00
vabene1111
b0fe98c091
fixed shopping url
2021-02-03 23:50:33 +01:00
vabene1111
103878e107
shopping list shortcut link
2021-02-03 23:05:42 +01:00
vabene1111
175fca2b39
Merge pull request #386 from cesarblancg/develop
...
Solving Apple web app issue
2021-02-03 20:35:32 +01:00
vabene1111
4600aab13a
fixed unit merge bug
2021-02-03 20:28:36 +01:00
vabene1111
966a107414
fixed merge of uncreated food entries
2021-02-03 20:15:42 +01:00
vabene1111
69674e2648
allow entry mode toggle
2021-02-03 19:51:43 +01:00
vabene1111
bcd2e44493
added simple entry mode to shopping
2021-02-03 19:38:09 +01:00
cesarblancg
e745e4be0c
Solving ipad pro issue
2021-02-03 18:49:48 +01:00
transifex-integration[bot]
e50d3233fd
Apply translations in nl
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
2021-01-29 18:41:14 +00:00
vabene1111
cc980b2e8a
fixed broken test for good and improved file api
2021-01-28 16:21:19 +01:00
vabene1111
93e965697a
updated test to reflect new permission
2021-01-28 16:17:29 +01:00
vabene1111
8d65d20d1f
account linking and docs update
2021-01-28 16:10:26 +01:00
vabene1111
148324b37f
fixed nutrition value database duplication
2021-01-28 14:44:23 +01:00
vabene1111
c30ce471c2
api permissions + shopping list on mobile
2021-01-28 14:41:00 +01:00
vabene1111
63cfa14a21
allauth working and integrated
2021-01-28 13:40:07 +01:00
vabene1111
53c715b6f6
Merge branch 'develop' into feature/allauth
...
# Conflicts:
# requirements.txt
2021-01-28 12:07:30 +01:00
vabene1111
96146a388a
added recipes to shopping list
2021-01-28 11:20:51 +01:00
vabene1111
e8d9cc6ad9
shopping list null entry
2021-01-27 17:48:08 +01:00
vabene1111
a0ebc47ade
api permission fixes + shopping list default view mode
2021-01-26 22:15:09 +01:00
vabene1111
b698fad83a
fixed no_amount ingredients showing units in ingredient list
2021-01-26 22:00:46 +01:00
vabene1111
5e53c66eaa
added ingredient headers again
2021-01-26 21:55:36 +01:00
vabene1111
37008ef290
added unaccent filter for recipe search
2021-01-26 21:14:33 +01:00
vabene1111
35ee5847ca
shopping list and docs
2021-01-26 20:58:19 +01:00
vabene1111
935dee853e
added ordering of supermarket categories
2021-01-26 19:19:42 +01:00
vabene1111
7b75e279b0
shopping list ui somewhat bearable
2021-01-26 18:21:45 +01:00
vabene1111
15c758b24a
update food after changing category
2021-01-26 18:08:41 +01:00
vabene1111
26ec1724a5
updating food working
2021-01-26 17:56:43 +01:00
vabene1111
96c4823664
supermarket shopping list relation
2021-01-26 16:53:05 +01:00
vabene1111
5ab19b7958
supermarket category api working
2021-01-26 16:16:45 +01:00
vabene1111
09716f2b00
wip supermarket categories
2021-01-25 21:58:24 +01:00
vabene1111
138a29770a
added supermarket categories to shopping
2021-01-25 21:20:40 +01:00
vabene1111
36584346cb
fixed merging and added shopping ignored ingredients
2021-01-25 20:46:19 +01:00
vabene1111
c7dd5dd8bb
wip shopping list stuff
2021-01-25 18:21:55 +01:00
vabene1111
a16ad2c887
added ingredient merging to shopping list
2021-01-25 17:24:03 +01:00
vabene1111
ca728b45ca
made it possible to disable signup
2021-01-24 16:41:25 +01:00
vabene1111
9fd87dbf23
fixed misaligned check buttons
2021-01-24 16:14:56 +01:00
vabene1111
477236009c
disable settings in demo
2021-01-22 22:38:16 +01:00
vabene1111
d9feb61e85
updated documentation
2021-01-22 21:58:39 +01:00
vabene1111
00875c0d8e
added help page linking
2021-01-22 21:32:29 +01:00
vabene1111
f1b7ed7d7a
added option to choose webdav path
2021-01-22 20:29:29 +01:00
vabene1111
fce293e722
fixed tests
2021-01-21 20:58:20 +01:00
vabene1111
09062cb12c
fixed recipe book api error
2021-01-21 20:57:26 +01:00
vabene1111
098f88e0b8
super basic working example
2021-01-21 20:54:55 +01:00
vabene1111
6992bf83aa
added customizable Servings text
2021-01-21 20:05:46 +01:00
vabene1111
32044907bf
template hint
2021-01-21 19:58:18 +01:00
vabene1111
3fcd613ca8
fixed side buttons in recipe edit moving under sticky nav
2021-01-21 19:45:12 +01:00
vabene1111
5b8a22762b
fixed print for new recipe view
2021-01-21 19:40:47 +01:00
vabene1111
c41c319d25
added servings to url import
2021-01-21 19:39:06 +01:00
vabene1111
6690c3b206
fixed service worker caching problem
2021-01-21 19:08:36 +01:00
vabene1111
56bcd4f887
very basic offline page working
2021-01-21 18:39:24 +01:00
vabene1111
47c690526e
service worker stuff work in progress
2021-01-21 16:16:49 +01:00
vabene1111
ec14338159
fixed share link with pre defined username
2021-01-21 14:42:49 +01:00
vabene1111
e5b7cf5f30
further improvised import/export feature
2021-01-19 21:41:52 +01:00
vabene1111
b563447674
ingredient linking fixed + tests fixed
2021-01-19 21:26:20 +01:00
vabene1111
523a2b41d1
fixed keyboard import edit
2021-01-19 21:11:02 +01:00
vabene1111
a0741f6ad3
added warning message to meal plan if no type is given
2021-01-19 20:55:51 +01:00
vabene1111
b52c3d6bd4
testing with the offline page
2021-01-17 21:26:56 +01:00
vabene1111
803369a7a6
basic offline page working
2021-01-17 21:11:03 +01:00
vabene1111
2e3e629406
actually decent service worker wip
2021-01-17 18:33:12 +01:00
vabene1111
d7894e07e9
service worker stuff
2021-01-17 16:58:50 +01:00
vabene1111
63dbdfa4a6
removed service worker stuff
2021-01-17 14:47:13 +01:00
vabene1111
961b3f07b5
added demo setting
2021-01-17 14:37:34 +01:00
vabene1111
f18980a9e2
workbox expirments
2021-01-14 13:31:56 +01:00
vabene1111
08733751aa
add to book reimplemented
2021-01-14 01:21:15 +01:00
vabene1111
b271f81af2
updated hook + compiled again
2021-01-14 00:05:42 +01:00
vabene1111
d99e523608
added pre commit hooks and some other workflow stuff
2021-01-14 00:00:26 +01:00
vabene1111
50829dce47
fixed access for shared recipes
2021-01-13 22:59:19 +01:00
vabene1111
910dc29f06
updated javascript files
2021-01-13 22:48:50 +01:00
vabene1111
642015b368
testing docker stuff
2021-01-13 22:17:40 +01:00
vabene1111
99f06955dc
corrected servings factor
2021-01-13 21:35:39 +01:00
vabene1111
9e5a7b2cc0
added loading spinner and made new view the main recipe view
2021-01-13 20:59:31 +01:00
vabene1111
23bd0a7d90
fixed recipe context menu
2021-01-13 15:51:13 +01:00
vabene1111
f9059f636c
update docs + removed old import
2021-01-13 15:25:34 +01:00
