cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,411 Commits 2 Branches 0 Tags 57 MiB
ba1e18410a
Commit Graph

1411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6334bee608
Update import_export.md 2021-03-28 12:38:56 -04: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
0492182803
Merge pull request #503 from vabene1111/dependabot/pip/lxml-4.6.3 
Bump lxml from 4.6.2 to 4.6.3
 2021-03-28 17:10:36 +02:00
vabene1111
22713d884e
Merge pull request #504 from vabene1111/dependabot/pip/django-crispy-forms-1.11.2 
Bump django-crispy-forms from 1.11.1 to 1.11.2
 2021-03-28 17:10:30 +02:00
vabene1111
bd14b77f62
Merge pull request #507 from vabene1111/dependabot/pip/djangorestframework-3.12.3 
Bump djangorestframework from 3.12.2 to 3.12.3
 2021-03-28 17:10:27 +02:00
dependabot[bot]
6a89ed1bb6
Bump djangorestframework from 3.12.2 to 3.12.3 
Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.12.2 to 3.12.3.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](https://github.com/encode/django-rest-framework/compare/3.12.2...3.12.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-26 05:58:54 +00:00
vabene1111
25717f6a79 space max 2021-03-24 00:06:34 +01:00
dependabot[bot]
d3ecd52fd2
Bump django-crispy-forms from 1.11.1 to 1.11.2 
Bumps [django-crispy-forms](https://github.com/django-crispy-forms/django-crispy-forms) from 1.11.1 to 1.11.2.
- [Release notes](https://github.com/django-crispy-forms/django-crispy-forms/releases)
- [Changelog](https://github.com/django-crispy-forms/django-crispy-forms/blob/master/CHANGELOG.md)
- [Commits](https://github.com/django-crispy-forms/django-crispy-forms/compare/1.11.1...1.11.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-22 07:16:11 +00:00
dependabot[bot]
1830eb4edc
Bump lxml from 4.6.2 to 4.6.3 
Bumps [lxml](https://github.com/lxml/lxml) from 4.6.2 to 4.6.3.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.6.2...lxml-4.6.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-22 07:16:06 +00: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
vabene1111
abcef54e72
Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1 
Bump recipe-scrapers from 12.2.0 to 12.2.1
 2021-03-20 22:30:43 +01:00
vabene1111
e15c92cda5
Merge pull request #501 from smilerz/main_fork 
fix json direct import when wrapped in @graph
 2021-03-20 22:26:06 +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
dependabot[bot]
7527646319
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-03-19 05:51:22 +00: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
f0ac55c20e
Merge pull request #388 from cesarblancg/develop 
Optimized dockerfile
 2021-03-18 20:53:14 +01:00
vabene1111
249663bd91
Merge branch 'develop' into develop 2021-03-18 20:53:08 +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
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
3c1b6a5f3a updated unraid docs image 2021-03-18 12:08:12 +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