mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 12:18:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,015 Commits 21 Branches 170 Tags
884dd6b8f8abc2ee05c77916f6ed66988e8112fd
Commit Graph

3015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
884dd6b8f8 Bump pillow from 8.4.0 to 9.0.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.4.0 to 9.0.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.4.0...9.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 15:18:05 +00:00
vabene1111
d2bf0359c0 Merge pull request #1214 from TandoorRecipes/dependabot/pip/boto3-1.20.27 
Bump boto3 from 1.20.19 to 1.20.27
 2022-01-04 16:17:25 +01:00
vabene1111
f418d74639 Merge pull request #1218 from TandoorRecipes/dependabot/npm_and_yarn/vue/core-js-3.20.2 
Bump core-js from 3.19.3 to 3.20.2 in /vue
 2022-01-04 16:17:19 +01:00
vabene1111
68260a2929 Merge pull request #1219 from TandoorRecipes/dependabot/pip/lxml-4.7.1 
Bump lxml from 4.6.5 to 4.7.1
 2022-01-04 16:17:15 +01:00
vabene1111
0f5feac067 Merge pull request #1221 from TandoorRecipes/dependabot/pip/psycopg2-binary-2.9.3 
Bump psycopg2-binary from 2.9.2 to 2.9.3
 2022-01-04 16:17:05 +01:00
dependabot[bot]
fde892dd78 Bump boto3 from 1.20.19 to 1.20.27 
Bumps [boto3](https://github.com/boto/boto3) from 1.20.19 to 1.20.27.
- [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.19...1.20.27)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 07:29:59 +00:00
dependabot[bot]
e54d477b12 Bump psycopg2-binary from 2.9.2 to 2.9.3 
Bumps [psycopg2-binary](https://github.com/psycopg/psycopg2) from 2.9.2 to 2.9.3.
- [Release notes](https://github.com/psycopg/psycopg2/releases)
- [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS)
- [Commits](https://github.com/psycopg/psycopg2/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 07:29:58 +00:00
dependabot[bot]
29411b5a74 Bump lxml from 4.6.5 to 4.7.1 
Bumps [lxml](https://github.com/lxml/lxml) from 4.6.5 to 4.7.1.
- [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.5...lxml-4.7.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 07:29:50 +00:00
vabene1111
02fcf70ab2 Merge pull request #1215 from TandoorRecipes/dependabot/pip/django-prometheus-2.2.0 
Bump django-prometheus from 2.1.0 to 2.2.0
 2022-01-04 08:29:33 +01:00
vabene1111
b661ee2a23 Merge pull request #1216 from TandoorRecipes/dependabot/pip/django-auth-ldap-4.0.0 
Bump django-auth-ldap from 3.0.0 to 4.0.0
 2022-01-04 08:29:29 +01:00
vabene1111
b71c115194 Merge pull request #1217 from TandoorRecipes/dependabot/pip/django-allauth-0.47.0 
Bump django-allauth from 0.46.0 to 0.47.0
 2022-01-04 08:29:23 +01:00
dependabot[bot]
fc0f92eecc Bump core-js from 3.19.3 to 3.20.2 in /vue 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.19.3 to 3.20.2.
- [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.19.3...v3.20.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 07:02:59 +00:00
dependabot[bot]
555451f64e Bump django-prometheus from 2.1.0 to 2.2.0 
Bumps [django-prometheus](https://github.com/korfuri/django-prometheus) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/korfuri/django-prometheus/releases)
- [Changelog](https://github.com/korfuri/django-prometheus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/korfuri/django-prometheus/compare/2.1.0...v2.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 07:00:08 +00:00
dependabot[bot]
557c8ce3b9 Bump django-auth-ldap from 3.0.0 to 4.0.0 
Bumps [django-auth-ldap](https://github.com/django-auth-ldap/django-auth-ldap) from 3.0.0 to 4.0.0.
- [Release notes](https://github.com/django-auth-ldap/django-auth-ldap/releases)
- [Changelog](https://github.com/django-auth-ldap/django-auth-ldap/blob/master/CHANGES)
- [Commits](https://github.com/django-auth-ldap/django-auth-ldap/compare/3.0.0...4.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 07:00:08 +00:00
vabene1111
b19190e9e2 Merge pull request #1199 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue-i18n-8.26.8 
Bump vue-i18n from 8.26.7 to 8.26.8 in /vue
 2022-01-04 07:59:39 +01:00
dependabot[bot]
c9a01a001e Bump django-allauth from 0.46.0 to 0.47.0 
Bumps [django-allauth](https://github.com/pennersr/django-allauth) from 0.46.0 to 0.47.0.
- [Release notes](https://github.com/pennersr/django-allauth/releases)
- [Changelog](https://github.com/pennersr/django-allauth/blob/master/ChangeLog.rst)
- [Commits](https://github.com/pennersr/django-allauth/compare/0.46.0...0.47.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 06:59:33 +00:00
vabene1111
0a085bfafa Merge pull request #1193 from TandoorRecipes/dependabot/pip/cryptography-36.0.1 
Bump cryptography from 36.0.0 to 36.0.1
 2022-01-04 07:59:30 +01:00
vabene1111
84cd4671a2 Merge pull request #1195 from TandoorRecipes/dependabot/pip/djangorestframework-3.13.1 
Bump djangorestframework from 3.12.4 to 3.13.1
 2022-01-04 07:59:25 +01:00
vabene1111
c05e44fdce Merge pull request #1196 from TandoorRecipes/dependabot/pip/pytest-django-4.5.2 
Bump pytest-django from 4.5.1 to 4.5.2
 2022-01-04 07:59:21 +01:00
vabene1111
6478bb3bb8 Merge pull request #1192 from TandoorRecipes/dependabot/pip/boto3-1.20.26 
Bump boto3 from 1.20.19 to 1.20.26
 2022-01-04 07:59:16 +01:00
vabene1111
e99c3af5d6 Merge pull request #1145 from TandoorRecipes/feature/shopping_list_v2 
Feature/shopping list v2
 2022-01-04 07:58:43 +01:00
vabene1111
4047febec9 Merge branch 'develop' into feature/shopping_list_v2 2022-01-04 07:58:36 +01:00
dependabot[bot]
a5638ea8a1 Bump vue-i18n from 8.26.7 to 8.26.8 in /vue 
Bumps [vue-i18n](https://github.com/kazupon/vue-i18n) from 8.26.7 to 8.26.8.
- [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.26.7...v8.26.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-01 00:06:18 +00:00
dependabot[bot]
e7acecb16b Bump pytest-django from 4.5.1 to 4.5.2 
Bumps [pytest-django](https://github.com/pytest-dev/pytest-django) from 4.5.1 to 4.5.2.
- [Release notes](https://github.com/pytest-dev/pytest-django/releases)
- [Changelog](https://github.com/pytest-dev/pytest-django/blob/master/docs/changelog.rst)
- [Commits](https://github.com/pytest-dev/pytest-django/compare/v4.5.1...v4.5.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-01 00:03:42 +00:00
dependabot[bot]
58a0d96fbd Bump djangorestframework from 3.12.4 to 3.13.1 
Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.12.4 to 3.13.1.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](https://github.com/encode/django-rest-framework/compare/3.12.4...3.13.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-01 00:03:40 +00:00
dependabot[bot]
30b9ea7e9f Bump cryptography from 36.0.0 to 36.0.1 
Bumps [cryptography](https://github.com/pyca/cryptography) from 36.0.0 to 36.0.1.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/36.0.0...36.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-01 00:03:32 +00:00
dependabot[bot]
d26a1b5698 Bump boto3 from 1.20.19 to 1.20.26 
Bumps [boto3](https://github.com/boto/boto3) from 1.20.19 to 1.20.26.
- [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.19...1.20.26)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-01 00:03:24 +00:00
smilerz
b282c46c1a Fix after rebase 2021-12-30 13:58:34 -06:00
smilerz
582e145a9f Fix after rebase 2021-12-30 13:55:38 -06:00
smilerz
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
vabene1111
c50a89c651 disabled tree fix at startup for now 2021-12-30 18:08:29 +01:00
vabene1111
f21587605a fixed sub recipe rendering 2021-12-30 18:03:08 +01:00
vabene1111
2e69a00fce improved recipe edit input validation 2021-12-30 17:57:04 +01:00
vabene1111
bddaa77f71 fixed space not honourd in invite link 2021-12-30 17:37:10 +01:00
vabene1111
3743a08996 marked required env fields 2021-12-30 09:47:36 +01:00
smilerz
3fafd43e58 merge ignore shopping with onhand 2021-12-29 16:32:19 -06:00
smilerz
2787b64a96 Merge branch 'feature/shopping_list_v2' of https://github.com/TandoorRecipes/recipes into feature/shopping_list_v2 2021-12-29 09:37:38 -06:00
smilerz
52d1069353 fix reactivity of detailed items 2021-12-29 09:36:18 -06:00
vabene1111
c961909342 fixed import 2021-12-29 15:54:20 +01:00
vabene1111
ccd0966d92 Merge branch 'feature/shopping_list_v2' of https://github.com/vabene1111/recipes into feature/shopping_list_v2 
# Conflicts:
#	cookbook/static/django_js_reverse/reverse.js
#	cookbook/tests/api/test_api_shopping_recipe.py
#	vue/src/apps/ShoppingListView/ShoppingListView.vue
 2021-12-29 15:26:22 +01:00
smilerz
a4f2c994a0 fix responsive view of add-to-shopping form 2021-12-28 16:32:26 -06:00
smilerz
c43b8e91da Fix after rebase 2021-12-28 12:05:14 -06:00
smilerz
58d025f1a5 change default status of shopping in recipe view 2021-12-28 12:03:36 -06:00
smilerz
c20e036d90 add path to generic cards for food/keywords 2021-12-28 12:03:36 -06:00
smilerz
2d0a7330f3 reset new list item after create 2021-12-28 12:03:36 -06:00
smilerz
279faadf46 pytest create recipe with ingredient as header 2021-12-28 12:03:36 -06:00
smilerz
5b287ad484 fix responsive display of detail shopping list 2021-12-28 12:03:35 -06:00
smilerz
e257a8d29b fix responsive display of shopping list 2021-12-28 12:03:35 -06:00
smilerz
889fa7b8ea update console messages 2021-12-28 12:03:35 -06:00
smilerz
a3008a6091 WIP 2021-12-28 12:03:35 -06:00