cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,824 Commits 2 Branches 0 Tags
4377505b14a8ff57eddc45e68af43bb7c2bcb13c
Commit Graph

2824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kaibu
2215e06506 translation fixes 2021-11-03 21:34:18 +01:00
Kaibu
a40c8c3f83 added password reset from key templates 2021-11-03 20:44:36 +01:00
vabene1111
c2c51d5e1a Merge pull request #1012 from krial057/patch-2 
prepTime and workTime of CookbookApp not imported correctly
 2021-11-02 13:09:45 +01:00
krial057
c40f6986f1 prepTime and workTime of CookbookApp not imported correctly 2021-11-01 18:01:05 +01:00
vabene1111
4f1f1239c8 Merge branch 'develop' 2021-11-01 16:54:09 +01:00
vabene1111
486e2fca3e release trigger update 2021-11-01 16:53:59 +01:00
vabene1111
5aaf0fb237 Merge branch 'master' of https://github.com/vabene1111/recipes 2021-11-01 15:46:18 +01:00
vabene1111
a12b2ffb21 updated actions repo for organization 2021-11-01 14:58:04 +01:00
vabene1111
2bda4c85b7 Merge pull request #1004 from TandoorRecipes/dependabot/pip/django-3.2.9 
Bump django from 3.2.8 to 3.2.9
 2021-11-01 14:57:09 +01:00
vabene1111
70774bdb32 Merge pull request #1005 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/cli-plugin-eslint-4.5.15 
Bump @vue/cli-plugin-eslint from 4.5.13 to 4.5.15 in /vue
 2021-11-01 14:57:04 +01:00
vabene1111
7e8a3c2b43 Merge pull request #1006 from TandoorRecipes/dependabot/npm_and_yarn/vue/core-js-3.19.0 
Bump core-js from 3.18.1 to 3.19.0 in /vue
 2021-11-01 14:56:58 +01:00
vabene1111
8450cddc1e Merge pull request #1007 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/cli-plugin-typescript-4.5.15 
Bump @vue/cli-plugin-typescript from 4.5.13 to 4.5.15 in /vue
 2021-11-01 14:56:54 +01:00
vabene1111
a036f2d323 Merge pull request #1008 from TandoorRecipes/dependabot/npm_and_yarn/vue/babel/eslint-parser-7.16.0 
Bump @babel/eslint-parser from 7.14.4 to 7.16.0 in /vue
 2021-11-01 14:56:49 +01:00
vabene1111
4af5e9d18a Merge pull request #1009 from TandoorRecipes/dependabot/npm_and_yarn/vue/typescript-eslint/eslint-plugin-4.33.0 
Bump @typescript-eslint/eslint-plugin from 4.26.1 to 4.33.0 in /vue
 2021-11-01 14:56:43 +01:00
dependabot[bot]
6bb2b04986 Bump @typescript-eslint/eslint-plugin from 4.26.1 to 4.33.0 in /vue 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.26.1 to 4.33.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.33.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-01 13:52:11 +00:00
dependabot[bot]
c0bc0bd6c3 Bump @babel/eslint-parser from 7.14.4 to 7.16.0 in /vue 
Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.14.4 to 7.16.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.0/eslint/babel-eslint-parser)

---
updated-dependencies:
- dependency-name: "@babel/eslint-parser"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-01 13:51:26 +00:00
dependabot[bot]
262238c96c Bump @vue/cli-plugin-typescript from 4.5.13 to 4.5.15 in /vue 
Bumps [@vue/cli-plugin-typescript](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-typescript) from 4.5.13 to 4.5.15.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.15/packages/@vue/cli-plugin-typescript)

---
updated-dependencies:
- dependency-name: "@vue/cli-plugin-typescript"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-01 13:51:07 +00:00
dependabot[bot]
3d41065f3b Bump core-js from 3.18.1 to 3.19.0 in /vue 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.18.1 to 3.19.0.
- [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.18.1...v3.19.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-01 13:50:52 +00:00
dependabot[bot]
ff764cbbec Bump @vue/cli-plugin-eslint from 4.5.13 to 4.5.15 in /vue 
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 4.5.13 to 4.5.15.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.15/packages/@vue/cli-plugin-eslint)

---
updated-dependencies:
- dependency-name: "@vue/cli-plugin-eslint"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-01 13:50:37 +00:00
dependabot[bot]
7d3c7dce75 Bump django from 3.2.8 to 3.2.9 
Bumps [django](https://github.com/django/django) from 3.2.8 to 3.2.9.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.8...3.2.9)

---
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 13:50:19 +00:00
vabene1111
f66bf13ec5 Create FUNDING.yml 2021-11-01 12:51:14 +01:00
vabene1111
3e8bc0a42b another try at fixing the discord release bot 2021-11-01 12:25:53 +01:00
vabene1111
0e55fe162c renamed components to match recommended naming 2021-11-01 11:39:10 +01:00
vabene1111
355f2d30a6 -a 2021-11-01 11:37:55 +01:00
vabene1111
4efed9a1d2 improved html importer instruction line break behavior 2021-11-01 11:27:19 +01:00
vabene1111
e4924f9d27 improved recipe card time pill 2021-11-01 11:24:28 +01:00
vabene1111
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
vabene1111
9a10f866e1 Merge remote-tracking branch 'origin/develop' into develop 2021-11-01 11:10:45 +01:00
vabene1111
66794d619f improved cookbook app importer 2021-11-01 11:10:35 +01:00
krial057
1a814aa9d1 Also show working/waiting time if only one of both is set 2021-11-01 10:40:03 +01:00
Oliver Cervera
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
Jesse
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
Kaibu
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
Kaibu
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
vabene1111
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
vabene1111
c9bd3ccae8 Merge branch 'develop' into feature/kilojoules 2021-11-01 09:46:04 +01:00
vabene1111
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
vabene1111
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
vabene1111
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
vabene1111
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
vabene1111
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
dependabot[bot]
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
dependabot[bot]
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
vabene1111
0bd6ddae71 Merge remote-tracking branch 'origin/develop' into develop 2021-11-01 08:43:50 +01:00
dependabot[bot]
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
dependabot[bot]
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
dependabot[bot]
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
vabene1111
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
vabene1111
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
vabene1111
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