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,057 Commits 21 Branches 170 Tags
ab2098151b7d7b49ccd8fed9e633f58b7ce23944
Commit Graph

3057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
ab2098151b Bump mermaid from 8.13.5 to 8.13.8 in /vue 
Bumps [mermaid](https://github.com/knsv/mermaid) from 8.13.5 to 8.13.8.
- [Release notes](https://github.com/knsv/mermaid/releases)
- [Changelog](https://github.com/mermaid-js/mermaid/blob/develop/docs/CHANGELOG.md)
- [Commits](https://github.com/knsv/mermaid/compare/8.13.5...8.13.8)

---
updated-dependencies:
- dependency-name: mermaid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-06 19:48:16 +00:00
vabene1111
6053b1419c fixed undefined var 2022-01-06 16:57:17 +01:00
vabene1111
5c98f06208 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-06 16:34:53 +01:00
vabene1111
c141dc850f Merge pull request #1245 from TandoorRecipes/fix_scopes_subfolder 
added prefix to request.path.startswith() conditionals
 2022-01-06 16:30:27 +01:00
vabene1111
0283835a96 Merge pull request #1240 from TandoorRecipes/feature/shopping_list_v2 
Feature/shopping list v2
 2022-01-06 16:27:44 +01:00
vabene1111
724217f142 Merge branch 'develop' into feature/shopping_list_v2 2022-01-06 16:27:39 +01:00
vabene1111
0094fd28e2 Merge pull request #1247 from TandoorRecipes/feature/related_recipe_switcher 
Feature/related recipe switcher
 2022-01-06 16:22:54 +01:00
vabene1111
54b57a8bcb Merge branch 'develop' into feature/related_recipe_switcher 2022-01-06 16:22:44 +01:00
vabene1111
0778025a0c Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-06 16:08:17 +01:00
vabene1111
063a0dec24 Merge branch 'master' into develop 
# Conflicts:
#	requirements.txt
 2022-01-06 16:08:06 +01:00
smilerz
6a1fcabae0 added prefix to request.path.startswith() conditionals 2022-01-06 07:37:02 -06:00
smilerz
13115a1e53 fixes 1176 2022-01-05 17:49:38 -06:00
smilerz
f65b5d0733 clear unit after adding shopping list item 2022-01-05 16:41:26 -06:00
smilerz
922eb7402b fix tess 2022-01-05 15:20:10 -06:00
smilerz
2c76fb7b69 make food onhand when complete shopping entry 2022-01-05 15:20:10 -06:00
smilerz
7c89117e04 make on_hand multiuser 2022-01-05 15:20:10 -06:00
smilerz
b919fb4ae8 quick add shoppinglist 2022-01-05 15:20:10 -06:00
smilerz
29aa52aa3d fix saving old list 2022-01-05 15:20:10 -06:00
smilerz
214db80dac add category context menu 2022-01-05 15:20:10 -06:00
Hrachya Kocharyan
25c1689ca0 Translated using Weblate (Armenian) 
Currently translated at 39.4% (82 of 208 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/hy/
 2022-01-05 07:00:36 +00:00
vabene1111
8a99907a51 reverted some updates 2022-01-04 17:32:17 +01:00
vabene1111
636fa8f318 Merge pull request #1200 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue-simple-calendar-6.0.3 
Bump vue-simple-calendar from 5.0.1 to 6.0.3 in /vue
 2022-01-04 16:23:09 +01:00
vabene1111
7efbc9c42e Merge pull request #1197 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/eslint-config-typescript-10.0.0 
Bump @vue/eslint-config-typescript from 9.1.0 to 10.0.0 in /vue
 2022-01-04 16:23:03 +01:00
dependabot[bot]
b05639110a Bump vue-simple-calendar from 5.0.1 to 6.0.3 in /vue 
Bumps [vue-simple-calendar](https://github.com/richardtallent/vue-simple-calendar) from 5.0.1 to 6.0.3.
- [Release notes](https://github.com/richardtallent/vue-simple-calendar/releases)
- [Changelog](https://github.com/richardtallent/vue-simple-calendar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/richardtallent/vue-simple-calendar/commits/v6.0.3)

---
updated-dependencies:
- dependency-name: vue-simple-calendar
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 15:22:08 +00:00
vabene1111
1fe673ba1e Merge pull request #1230 from TandoorRecipes/dependabot/pip/django-cors-headers-3.10.1 
Bump django-cors-headers from 3.10.0 to 3.10.1
 2022-01-04 16:21:54 +01:00
vabene1111
0a89bf4a10 Merge pull request #1229 from TandoorRecipes/dependabot/pip/django-4.0.1 
Bump django from 3.2.10 to 4.0.1
 2022-01-04 16:21:49 +01:00
vabene1111
049d218f7b Merge pull request #1228 from TandoorRecipes/dependabot/pip/requests-2.27.0 
Bump requests from 2.26.0 to 2.27.0
 2022-01-04 16:21:45 +01:00
vabene1111
0030775e55 Merge pull request #1227 from TandoorRecipes/dependabot/pip/recipe-scrapers-13.10.1 
Bump recipe-scrapers from 13.7.0 to 13.10.1
 2022-01-04 16:21:40 +01:00
dependabot[bot]
cd49311cba Bump django from 3.2.10 to 4.0.1 
Bumps [django](https://github.com/django/django) from 3.2.10 to 4.0.1.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.10...4.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 15:21:11 +00:00
dependabot[bot]
f7af4b9cd2 Bump requests from 2.26.0 to 2.27.0 
Bumps [requests](https://github.com/psf/requests) from 2.26.0 to 2.27.0.
- [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.26.0...v2.27.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 15:21:03 +00:00
dependabot[bot]
6c205e2fc6 Bump django-cors-headers from 3.10.0 to 3.10.1 
Bumps [django-cors-headers](https://github.com/adamchainz/django-cors-headers) from 3.10.0 to 3.10.1.
- [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.0...3.10.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 15:21:01 +00:00
dependabot[bot]
938f5560fb Bump recipe-scrapers from 13.7.0 to 13.10.1 
Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 13.7.0 to 13.10.1.
- [Release notes](https://github.com/hhursev/recipe-scrapers/releases)
- [Commits](https://github.com/hhursev/recipe-scrapers/compare/13.7.0...13.10.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-01-04 15:20:53 +00:00
vabene1111
6791de94d7 Merge pull request #1220 from TandoorRecipes/dependabot/pip/pillow-9.0.0 
Bump pillow from 8.4.0 to 9.0.0
 2022-01-04 16:19:24 +01:00
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