Commit Graph

3365 Commits

Author SHA1 Message Date
vabene1111
d45e3b8e60 some tweaks for new exporter 2022-02-03 18:00:02 +01:00
vabene1111
a3fa01d8d3 Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress 2022-02-03 15:59:18 +01:00
vabene1111
9a746b5397 Merge branch 'develop' into feature/export-progress 2022-02-03 15:59:11 +01:00
vabene1111
ba3c0b933c update vue cli 2022-02-03 15:59:02 +01:00
vabene1111
87164e894a
Merge pull request #1281 from TiagoRascazzi/develop
PDF export improvement
2022-02-03 15:58:06 +01:00
vabene1111
d01cb26c4a length filter for add to old shopping list 2022-02-03 15:46:59 +01:00
vabene1111
3501bcadb1 removed old cook log modal 2022-02-03 15:44:57 +01:00
vabene1111
1cf4f9cb4d
Merge pull request #1475 from TandoorRecipes/dependabot/pip/django-cleanup-6.0.0
Bump django-cleanup from 5.2.0 to 6.0.0
2022-02-03 15:22:45 +01:00
dependabot[bot]
be24ee7922
Bump django-cleanup from 5.2.0 to 6.0.0
Bumps [django-cleanup](https://github.com/un1t/django-cleanup) from 5.2.0 to 6.0.0.
- [Release notes](https://github.com/un1t/django-cleanup/releases)
- [Changelog](https://github.com/un1t/django-cleanup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/un1t/django-cleanup/compare/5.2.0...6.0.0)

---
updated-dependencies:
- dependency-name: django-cleanup
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-03 14:22:23 +00:00
vabene1111
5e2c3d6ad2
Merge pull request #1477 from TandoorRecipes/dependabot/pip/pillow-9.0.1
Bump pillow from 9.0.0 to 9.0.1
2022-02-03 15:22:17 +01:00
vabene1111
129bf16e8c
Merge pull request #1479 from TandoorRecipes/dependabot/pip/microdata-0.8.0
Bump microdata from 0.7.2 to 0.8.0
2022-02-03 15:22:13 +01:00
vabene1111
ec97b1edae
Merge pull request #1480 from TandoorRecipes/dependabot/pip/recipe-scrapers-13.12.1
Bump recipe-scrapers from 13.10.1 to 13.12.1
2022-02-03 15:22:08 +01:00
dependabot[bot]
16a0ea07c7
Bump pillow from 9.0.0 to 9.0.1
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.0.0...9.0.1)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-03 14:21:50 +00:00
dependabot[bot]
3ba70683d9
Bump recipe-scrapers from 13.10.1 to 13.12.1
Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 13.10.1 to 13.12.1.
- [Release notes](https://github.com/hhursev/recipe-scrapers/releases)
- [Commits](https://github.com/hhursev/recipe-scrapers/compare/13.10.1...13.12.1)

---
updated-dependencies:
- dependency-name: recipe-scrapers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-03 14:21:37 +00:00
dependabot[bot]
f07f3e183d
Bump microdata from 0.7.2 to 0.8.0
Bumps [microdata](https://github.com/edsu/microdata) from 0.7.2 to 0.8.0.
- [Release notes](https://github.com/edsu/microdata/releases)
- [Commits](https://github.com/edsu/microdata/compare/v0.7.2...v0.8.0)

---
updated-dependencies:
- dependency-name: microdata
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-03 14:21:28 +00:00
vabene1111
5d75220312
Merge pull request #1478 from TandoorRecipes/dependabot/pip/requests-2.27.1
Bump requests from 2.27.0 to 2.27.1
2022-02-03 15:21:09 +01:00
vabene1111
c136319719
Merge pull request #1474 from TandoorRecipes/dependabot/pip/boto3-1.20.47
Bump boto3 from 1.20.27 to 1.20.47
2022-02-03 15:21:01 +01:00
dependabot[bot]
c75b666b17
Bump boto3 from 1.20.27 to 1.20.47
Bumps [boto3](https://github.com/boto/boto3) from 1.20.27 to 1.20.47.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](https://github.com/boto/boto3/compare/1.20.27...1.20.47)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-03 13:42:36 +00:00
dependabot[bot]
fdc0dfaa15
Bump requests from 2.27.0 to 2.27.1
Bumps [requests](https://github.com/psf/requests) from 2.27.0 to 2.27.1.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.27.0...v2.27.1)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-03 13:42:07 +00:00
vabene1111
7f84186b5b
Merge pull request #1456 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/compiler-sfc-3.2.29
Bump @vue/compiler-sfc from 3.2.26 to 3.2.29 in /vue
2022-02-03 14:41:52 +01:00
vabene1111
bc72086912
Merge pull request #1455 from TandoorRecipes/dependabot/npm_and_yarn/vue/typescript-4.5.5
Bump typescript from 4.5.4 to 4.5.5 in /vue
2022-02-03 14:41:47 +01:00
vabene1111
a41e5b362a
Merge pull request #1454 from TandoorRecipes/dependabot/npm_and_yarn/vue/core-js-3.20.3
Bump core-js from 3.20.2 to 3.20.3 in /vue
2022-02-03 14:41:42 +01:00
vabene1111
d4ebbc0b63
Merge pull request #1452 from TandoorRecipes/dependabot/pip/boto3-1.20.46
Bump boto3 from 1.20.27 to 1.20.46
2022-02-03 14:41:37 +01:00
vabene1111
fccb2650f5
Merge pull request #1451 from TandoorRecipes/dependabot/pip/django-hcaptcha-0.2.0
Bump django-hcaptcha from 0.1.0 to 0.2.0
2022-02-03 14:41:32 +01:00
vabene1111
e4f74af9c0
Merge pull request #1450 from TandoorRecipes/dependabot/pip/django-crispy-forms-1.14.0
Bump django-crispy-forms from 1.13.0 to 1.14.0
2022-02-03 14:41:29 +01:00
vabene1111
982cde5623
Merge pull request #1449 from TandoorRecipes/dependabot/pip/pyppeteer-1.0.2
Bump pyppeteer from 0.2.6 to 1.0.2
2022-02-03 14:41:23 +01:00
vabene1111
66949356ea
Merge pull request #1448 from TandoorRecipes/dependabot/pip/django-cors-headers-3.11.0
Bump django-cors-headers from 3.10.1 to 3.11.0
2022-02-03 14:41:19 +01:00
vabene1111
ed99da2d1e
Merge pull request #1472 from smilerz/updated_dockerignore
updated .dockerignore
2022-02-03 14:33:18 +01:00
vabene1111
ed852b3246
Merge pull request #1437 from MaxJa4/improvement/wait_for_db
[Docker] Web_recipes waits for db_recipes to be ready
2022-02-03 14:32:37 +01:00
vabene1111
eec0a49cd6
Merge pull request #1435 from MaxJa4/docs/headers
[Docs] Added example configs and header information
2022-02-03 14:30:20 +01:00
vabene1111
382c08dc0c
Merge pull request #1445 from thumm/feature/ldap_cacertfile
Add new env parameter to set ldap ca cert file
2022-02-03 14:28:29 +01:00
Mario Dvorsek
231d1695ff Translated using Weblate (Slovenian)
Currently translated at 15.3% (78 of 509 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sl/
2022-02-02 15:31:32 +00:00
Sven
97febe9aa1 Translated using Weblate (German)
Currently translated at 96.1% (546 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
2022-02-02 15:31:32 +00:00
Chris Scoggins
c5a435905b
remove vue source 2022-02-02 07:50:27 -06:00
vabene1111
86e34593d5
Merge pull request #1464 from StephenBrown2/make_header
Fix Make_Header/Make_Ingredient text and reference
2022-02-01 17:40:47 +01:00
Stephen Brown II
3961c684f9 Fix Make_Header/Make_Ingredient text and reference 2022-02-01 09:17:30 -06:00
vabene1111
b2a415b333
Merge pull request #1447 from smilerz/mealplan_shopping_useability
Mealplan shopping useability
2022-02-01 08:28:59 +01:00
dependabot[bot]
1e417fee97
Bump @vue/compiler-sfc from 3.2.26 to 3.2.29 in /vue
Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.26 to 3.2.29.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.29/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:10:38 +00:00
dependabot[bot]
47d7c846a3
Bump typescript from 4.5.4 to 4.5.5 in /vue
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.5.4 to 4.5.5.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.5.4...v4.5.5)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:10:13 +00:00
dependabot[bot]
3b236ea04e
Bump core-js from 3.20.2 to 3.20.3 in /vue
Bumps [core-js](https://github.com/zloirock/core-js) from 3.20.2 to 3.20.3.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.20.2...v3.20.3)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:09:45 +00:00
dependabot[bot]
2ec8bcce8b
Bump boto3 from 1.20.27 to 1.20.46
Bumps [boto3](https://github.com/boto/boto3) from 1.20.27 to 1.20.46.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](https://github.com/boto/boto3/compare/1.20.27...1.20.46)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:03:44 +00:00
dependabot[bot]
966cda2371
Bump django-hcaptcha from 0.1.0 to 0.2.0
Bumps [django-hcaptcha](https://github.com/AndrejZbin) from 0.1.0 to 0.2.0.

---
updated-dependencies:
- dependency-name: django-hcaptcha
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:03:35 +00:00
dependabot[bot]
fcb1de4b93
Bump django-crispy-forms from 1.13.0 to 1.14.0
Bumps [django-crispy-forms](https://github.com/django-crispy-forms/django-crispy-forms) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/django-crispy-forms/django-crispy-forms/releases)
- [Changelog](https://github.com/django-crispy-forms/django-crispy-forms/blob/main/CHANGELOG.md)
- [Commits](https://github.com/django-crispy-forms/django-crispy-forms/compare/1.13.0...1.14.0)

---
updated-dependencies:
- dependency-name: django-crispy-forms
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:03:31 +00:00
dependabot[bot]
ca61764d2d
Bump pyppeteer from 0.2.6 to 1.0.2
Bumps [pyppeteer](https://github.com/pyppeteer/pyppeteer) from 0.2.6 to 1.0.2.
- [Release notes](https://github.com/pyppeteer/pyppeteer/releases)
- [Changelog](https://github.com/pyppeteer/pyppeteer/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/pyppeteer/pyppeteer/compare/0.2.6...1.0.2)

---
updated-dependencies:
- dependency-name: pyppeteer
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:03:26 +00:00
dependabot[bot]
a5946b49f8
Bump django-cors-headers from 3.10.1 to 3.11.0
Bumps [django-cors-headers](https://github.com/adamchainz/django-cors-headers) from 3.10.1 to 3.11.0.
- [Release notes](https://github.com/adamchainz/django-cors-headers/releases)
- [Changelog](https://github.com/adamchainz/django-cors-headers/blob/main/HISTORY.rst)
- [Commits](https://github.com/adamchainz/django-cors-headers/compare/3.10.1...3.11.0)

---
updated-dependencies:
- dependency-name: django-cors-headers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:03:23 +00:00
Chris Scoggins
13d144345e
adjust height of viewport in mobile shopping view 2022-01-31 16:30:54 -06:00
Chris Scoggins
b633be9c13
fix display issues 2022-01-31 16:24:40 -06:00
Chris Scoggins
f45e09a5a5
add units to search fields 2022-01-31 14:41:18 -06:00
Chris Scoggins
5b3a0a6e29
refactor IngredientComponent, move shopping logic to card 2022-01-31 14:05:01 -06:00
Thomas Schumm
505bac514f Add new env parameter to set ldap ca cert file 2022-01-31 19:34:32 +01:00