Commit Graph

2599 Commits

Author SHA1 Message Date
0e55fe162c renamed components to match recommended naming 2021-11-01 11:39:10 +01:00
355f2d30a6 -a 2021-11-01 11:37:55 +01:00
4efed9a1d2 improved html importer instruction line break behavior 2021-11-01 11:27:19 +01:00
e4924f9d27 improved recipe card time pill 2021-11-01 11:24:28 +01:00
77f0bf3628 Merge pull request #1003 from krial057/patch-1
Also show working/waiting time if only one of both is set
2021-11-01 11:21:20 +01:00
9a10f866e1 Merge remote-tracking branch 'origin/develop' into develop 2021-11-01 11:10:45 +01:00
66794d619f improved cookbook app importer 2021-11-01 11:10:35 +01:00
1a814aa9d1 Also show working/waiting time if only one of both is set 2021-11-01 10:40:03 +01:00
6b4200acc3 Translated using Weblate (Italian)
Currently translated at 99.5% (201 of 202 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2021-11-01 08:47:19 +00:00
7749ad1441 Translated using Weblate (Dutch)
Currently translated at 100.0% (202 of 202 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
2021-11-01 08:47:19 +00:00
3d6d998774 Translated using Weblate (German)
Currently translated at 100.0% (202 of 202 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2021-11-01 08:47:19 +00:00
bcbd5c1103 Translated using Weblate (German)
Currently translated at 95.9% (476 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
2021-11-01 08:47:19 +00:00
2d9b21b0d7 Merge pull request #974 from xeals/feature/kilojoules
Add user preference to display/edit using kilojoules
2021-11-01 09:47:14 +01:00
c9bd3ccae8 Merge branch 'develop' into feature/kilojoules 2021-11-01 09:46:04 +01:00
08aa5cc36e Merge pull request #998 from vabene1111/dependabot/pip/django-cors-headers-3.10.0
Bump django-cors-headers from 3.9.0 to 3.10.0
2021-11-01 08:54:53 +01:00
c3cbc2799b Merge pull request #999 from vabene1111/dependabot/pip/icalendar-4.0.9
Bump icalendar from 4.0.7 to 4.0.9
2021-11-01 08:54:48 +01:00
e0af020210 Merge pull request #1000 from vabene1111/dependabot/pip/boto3-1.19.7
Bump boto3 from 1.18.52 to 1.19.7
2021-11-01 08:54:42 +01:00
97c9b304f3 Merge pull request #1001 from vabene1111/dependabot/pip/uritemplate-4.1.1
Bump uritemplate from 3.0.1 to 4.1.1
2021-11-01 08:54:37 +01:00
2aa1df1c92 Merge pull request #1002 from vabene1111/dependabot/pip/pillow-8.4.0
Bump pillow from 8.3.2 to 8.4.0
2021-11-01 08:54:32 +01:00
490e86a346 Bump boto3 from 1.18.52 to 1.19.7
Bumps [boto3](https://github.com/boto/boto3) from 1.18.52 to 1.19.7.
- [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.18.52...1.19.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 07:44:39 +00:00
a495b853ea Bump uritemplate from 3.0.1 to 4.1.1
Bumps [uritemplate](https://github.com/python-hyper/uritemplate) from 3.0.1 to 4.1.1.
- [Release notes](https://github.com/python-hyper/uritemplate/releases)
- [Changelog](https://github.com/python-hyper/uritemplate/blob/main/HISTORY.rst)
- [Commits](https://github.com/python-hyper/uritemplate/compare/3.0.1...4.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 07:44:38 +00:00
0bd6ddae71 Merge remote-tracking branch 'origin/develop' into develop 2021-11-01 08:43:50 +01:00
ef44ab1562 Bump icalendar from 4.0.7 to 4.0.9
Bumps [icalendar](https://github.com/collective/icalendar) from 4.0.7 to 4.0.9.
- [Release notes](https://github.com/collective/icalendar/releases)
- [Changelog](https://github.com/collective/icalendar/blob/master/CHANGES.rst)
- [Commits](https://github.com/collective/icalendar/compare/4.0.7...4.0.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 07:42:51 +00:00
acd6a7fa76 Bump django-cors-headers from 3.9.0 to 3.10.0
Bumps [django-cors-headers](https://github.com/adamchainz/django-cors-headers) from 3.9.0 to 3.10.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.9.0...3.10.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>
2021-11-01 07:42:35 +00:00
e92c4d7b80 Bump pillow from 8.3.2 to 8.4.0
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 8.4.0.
- [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/8.3.2...8.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 07:42:33 +00:00
1ca50c5932 Merge pull request #990 from vabene1111/dependabot/pip/django-storages-1.12.3
Bump django-storages from 1.11.1 to 1.12.3
2021-11-01 08:42:16 +01:00
61bb8abe0e Merge pull request #996 from vabene1111/dependabot/pip/pyyaml-6.0
Bump pyyaml from 5.4.1 to 6.0
2021-11-01 08:42:02 +01:00
7c4ecc7048 Merge pull request #986 from vabene1111/dependabot/pip/python-dotenv-0.19.1
Bump python-dotenv from 0.19.0 to 0.19.1
2021-11-01 08:29:57 +01:00
8e09645f6c Bump pyyaml from 5.4.1 to 6.0
Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.4.1 to 6.0.
- [Release notes](https://github.com/yaml/pyyaml/releases)
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES)
- [Commits](https://github.com/yaml/pyyaml/compare/5.4.1...6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 07:29:53 +00:00
ebf99c0889 Merge pull request #987 from vabene1111/dependabot/pip/jinja2-3.0.2
Bump jinja2 from 3.0.1 to 3.0.2
2021-11-01 08:29:48 +01:00
eecf646bdd Merge pull request #988 from vabene1111/dependabot/pip/django-tables2-2.4.1
Bump django-tables2 from 2.4.0 to 2.4.1
2021-11-01 08:29:37 +01:00
cacb9dd447 Merge pull request #989 from vabene1111/dependabot/pip/django-3.2.8
Bump django from 3.2.7 to 3.2.8
2021-11-01 08:29:27 +01:00
28612e910a update recipe scrapers 2021-11-01 08:29:11 +01:00
9f5f689c45 Merge pull request #991 from vabene1111/dependabot/npm_and_yarn/vue/typescript-4.4.4
Bump typescript from 4.4.3 to 4.4.4 in /vue
2021-11-01 08:28:51 +01:00
2e046b1bcc Bump typescript from 4.4.3 to 4.4.4 in /vue
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.4.3 to 4.4.4.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.4.3...v4.4.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 07:26:43 +00:00
07785fae6b Merge pull request #992 from vabene1111/dependabot/npm_and_yarn/vue/eslint-plugin-vue-8.0.3
Bump eslint-plugin-vue from 7.10.0 to 8.0.3 in /vue
2021-11-01 08:26:14 +01:00
dc9cc95860 Merge pull request #993 from vabene1111/dependabot/npm_and_yarn/vue/workbox-webpack-plugin-6.3.0
Bump workbox-webpack-plugin from 6.1.5 to 6.3.0 in /vue
2021-11-01 08:26:03 +01:00
26bcfdda96 Merge pull request #994 from vabene1111/dependabot/npm_and_yarn/vue/vue/compiler-sfc-3.2.20
Bump @vue/compiler-sfc from 3.1.1 to 3.2.20 in /vue
2021-11-01 08:25:53 +01:00
f32a0a092c Merge pull request #995 from vabene1111/dependabot/npm_and_yarn/vue/vue-i18n-8.26.5
Bump vue-i18n from 8.24.4 to 8.26.5 in /vue
2021-11-01 08:25:42 +01:00
74935b22b7 Bump vue-i18n from 8.24.4 to 8.26.5 in /vue
Bumps [vue-i18n](https://github.com/kazupon/vue-i18n) from 8.24.4 to 8.26.5.
- [Release notes](https://github.com/kazupon/vue-i18n/releases)
- [Changelog](https://github.com/kazupon/vue-i18n/blob/v8.x/CHANGELOG.md)
- [Commits](https://github.com/kazupon/vue-i18n/compare/v8.24.4...v8.26.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 00:16:08 +00:00
e84a38a98e Bump @vue/compiler-sfc from 3.1.1 to 3.2.20 in /vue
Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.1.1 to 3.2.20.
- [Release notes](https://github.com/vuejs/vue-next/releases)
- [Changelog](https://github.com/vuejs/vue-next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-next/commits/v3.2.20/packages/compiler-sfc)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 00:15:46 +00:00
890def60d3 Bump workbox-webpack-plugin from 6.1.5 to 6.3.0 in /vue
Bumps [workbox-webpack-plugin](https://github.com/googlechrome/workbox) from 6.1.5 to 6.3.0.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.1.5...v6.3.0)

---
updated-dependencies:
- dependency-name: workbox-webpack-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 00:15:29 +00:00
0ef69ada91 Bump eslint-plugin-vue from 7.10.0 to 8.0.3 in /vue
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 7.10.0 to 8.0.3.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v7.10.0...v8.0.3)

---
updated-dependencies:
- dependency-name: eslint-plugin-vue
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 00:14:53 +00:00
4ea77882fc Bump django-storages from 1.11.1 to 1.12.3
Bumps [django-storages](https://github.com/jschneier/django-storages) from 1.11.1 to 1.12.3.
- [Release notes](https://github.com/jschneier/django-storages/releases)
- [Changelog](https://github.com/jschneier/django-storages/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/jschneier/django-storages/compare/1.11.1...1.12.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 00:03:42 +00:00
590e56f003 Bump django from 3.2.7 to 3.2.8
Bumps [django](https://github.com/django/django) from 3.2.7 to 3.2.8.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.7...3.2.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 00:03:37 +00:00
47135e929d Bump django-tables2 from 2.4.0 to 2.4.1
Bumps [django-tables2](https://github.com/jieter/django-tables2) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/jieter/django-tables2/releases)
- [Changelog](https://github.com/jieter/django-tables2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jieter/django-tables2/compare/v2.4.0...v2.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 00:03:32 +00:00
8d102727ff Bump jinja2 from 3.0.1 to 3.0.2
Bumps [jinja2](https://github.com/pallets/jinja) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/3.0.1...3.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 00:03:28 +00:00
4a85081d18 Bump python-dotenv from 0.19.0 to 0.19.1
Bumps [python-dotenv](https://github.com/theskumar/python-dotenv) from 0.19.0 to 0.19.1.
- [Release notes](https://github.com/theskumar/python-dotenv/releases)
- [Changelog](https://github.com/theskumar/python-dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/theskumar/python-dotenv/compare/v0.19.0...v0.19.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 00:03:23 +00:00
e7ce582959 readme update 2021-10-31 18:11:48 +01:00
31720927b1 deprecated old meal plan 2021-10-31 18:08:37 +01:00