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
2,363 Commits 21 Branches 170 Tags
b61512da772c5e8dfb4e9cc3d148a913ec44f0c4
Commit Graph

2363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
f8c1411e4d Merge pull request #755 from vabene1111/dependabot/pip/simplejson-3.17.3 
Bump simplejson from 3.17.2 to 3.17.3
 2021-07-13 10:27:29 +02:00
vabene1111
f1a194e166 Merge pull request #757 from vabene1111/dependabot/pip/recipe-scrapers-13.3.2 
Bump recipe-scrapers from 13.3.1 to 13.3.2
 2021-07-13 10:27:18 +02:00
dependabot[bot]
f374e0cb27 Bump recipe-scrapers from 13.3.1 to 13.3.2 
Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 13.3.1 to 13.3.2.
- [Release notes](https://github.com/hhursev/recipe-scrapers/releases)
- [Commits](https://github.com/hhursev/recipe-scrapers/compare/13.3.1...13.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-13 08:27:13 +00:00
vabene1111
6f7a41f3b8 Merge pull request #758 from vabene1111/dependabot/pip/boto3-1.17.110 
Bump boto3 from 1.17.108 to 1.17.110
 2021-07-13 10:27:10 +02:00
vabene1111
a562b571b5 Merge pull request #754 from vabene1111/dependabot/pip/django-allauth-0.45.0 
Bump django-allauth from 0.44.0 to 0.45.0
 2021-07-13 10:26:42 +02:00
dependabot[bot]
d71420484c Bump boto3 from 1.17.108 to 1.17.110 
Bumps [boto3](https://github.com/boto/boto3) from 1.17.108 to 1.17.110.
- [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.17.108...1.17.110)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-13 00:02:31 +00:00
dependabot[bot]
bc7758e233 Bump simplejson from 3.17.2 to 3.17.3 
Bumps [simplejson](https://github.com/simplejson/simplejson) from 3.17.2 to 3.17.3.
- [Release notes](https://github.com/simplejson/simplejson/releases)
- [Changelog](https://github.com/simplejson/simplejson/blob/master/CHANGES.txt)
- [Commits](https://github.com/simplejson/simplejson/compare/v3.17.2...v3.17.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-12 00:13:21 +00:00
dependabot[bot]
0f5185c677 Bump django-allauth from 0.44.0 to 0.45.0 
Bumps [django-allauth](https://github.com/pennersr/django-allauth) from 0.44.0 to 0.45.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.44.0...0.45.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>
 2021-07-12 00:13:14 +00:00
vabene1111
1e6096d5c8 Merge pull request #753 from vabene1111/dependabot/pip/boto3-1.17.108 
Bump boto3 from 1.17.106 to 1.17.108
 2021-07-09 08:08:20 +02:00
dependabot[bot]
bc2a092e79 Bump boto3 from 1.17.106 to 1.17.108 
Bumps [boto3](https://github.com/boto/boto3) from 1.17.106 to 1.17.108.
- [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.17.106...1.17.108)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-09 00:03:25 +00:00
vabene1111
9809f58c28 supermarket view done 2021-07-08 19:00:23 +02:00
tandy1000
589302a87d Add guidance on what to edit in .env 2021-07-07 19:23:00 +01:00
tandy1000
173eaf44a0 Add fix for no image on recipe page 
https://github.com/vabene1111/recipes/issues/470#issuecomment-787210414
 2021-07-07 19:10:19 +01:00
tandy1000
576c62b8a1 Update manual setup 
I just went through a manual install on DietPi / Debian Unstable, and found that the manual needed some improving, this method works, whereas following the original manual was not a success for me.

The only line I would say I am unsure about is this one:
"Give the user permissions: `chown -R recipes:www-data /var/www/recipes`"
As I am not sure whether these permissions are necessary for this to work.

Hope this is useful, let me know if I can make further improvements.
 2021-07-07 16:49:04 +01:00
vabene1111
da57e656eb several search related improvements 2021-07-07 17:45:05 +02:00
vabene1111
b42e6ac0f6 fixed cook log creation in old search 2021-07-07 17:21:14 +02:00
vabene1111
cebcf266fc Merge pull request #750 from vabene1111/dependabot/pip/pillow-8.3.1 
Bump pillow from 8.3.0 to 8.3.1
 2021-07-07 16:31:35 +02:00
vabene1111
d5ebb0047d Merge pull request #749 from vabene1111/dependabot/pip/boto3-1.17.106 
Bump boto3 from 1.17.104 to 1.17.106
 2021-07-07 16:31:31 +02:00
vabene1111
6d553035db Merge pull request #748 from vabene1111/dependabot/pip/recipe-scrapers-13.3.1 
Bump recipe-scrapers from 13.3.0 to 13.3.1
 2021-07-07 16:31:26 +02:00
dependabot[bot]
0f57dc9c8a Bump pillow from 8.3.0 to 8.3.1 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.0 to 8.3.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.3.0...8.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 00:02:44 +00:00
dependabot[bot]
31a4bc7747 Bump boto3 from 1.17.104 to 1.17.106 
Bumps [boto3](https://github.com/boto/boto3) from 1.17.104 to 1.17.106.
- [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.17.104...1.17.106)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 00:02:37 +00:00
vabene1111
b661cdcf3e minor fixes keyword tree system 2021-07-05 10:17:14 +02:00
dependabot[bot]
0eed67b5aa Bump recipe-scrapers from 13.3.0 to 13.3.1 
Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 13.3.0 to 13.3.1.
- [Release notes](https://github.com/hhursev/recipe-scrapers/releases)
- [Commits](https://github.com/hhursev/recipe-scrapers/compare/13.3.0...13.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 00:18:45 +00:00
vabene1111
168c6e3938 trying to fix things 2021-07-03 21:31:18 +02:00
vabene1111
3dbf40ff44 Merge pull request #746 from vabene1111/dependabot/pip/pillow-8.3.0 
Bump pillow from 8.2.0 to 8.3.0
 2021-07-03 10:31:32 +02:00
vabene1111
16459c1ec1 Merge pull request #745 from vabene1111/dependabot/pip/django-3.2.5 
Bump django from 3.2.4 to 3.2.5
 2021-07-03 10:31:20 +02:00
vabene1111
ba575ff79b Merge pull request #744 from vabene1111/dependabot/pip/boto3-1.17.104 
Bump boto3 from 1.17.102 to 1.17.104
 2021-07-03 10:31:02 +02:00
dependabot[bot]
2f9e407f49 Bump pillow from 8.2.0 to 8.3.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.2.0 to 8.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.2.0...8.3.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-07-02 00:02:44 +00:00
dependabot[bot]
1779c1ac14 Bump django from 3.2.4 to 3.2.5 
Bumps [django](https://github.com/django/django) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.4...3.2.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-02 00:02:32 +00:00
dependabot[bot]
ca1c353575 Bump boto3 from 1.17.102 to 1.17.104 
Bumps [boto3](https://github.com/boto/boto3) from 1.17.102 to 1.17.104.
- [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.17.102...1.17.104)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-02 00:02:24 +00:00
vabene1111
554c862e6b better debugging of importer fails 2021-07-01 19:49:39 +02:00
vabene1111
2fe2d9127b Merge branch 'develop' into feature/fulltext-search 2021-07-01 08:37:57 +02:00
vabene1111
a00055ac6e partially working 2021-06-30 16:17:46 +02:00
Kaibu
cac643266b Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-06-30 15:37:18 +02:00
Kaibu
5518199f64 search and car styling 2021-06-30 15:36:56 +02:00
vabene1111
e964d61691 fixed migration order and dependencies 2021-06-30 15:33:35 +02:00
vabene1111
33b840dbbf working on migrations 2021-06-30 15:14:37 +02:00
vabene1111
5c0bdce37d Merge branch 'feature/keywords-rework' into feature/fulltext-search 
# Conflicts:
#	cookbook/admin.py
#	cookbook/helper/recipe_search.py
#	cookbook/models.py
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/templates/sw.js
#	cookbook/views/api.py
#	cookbook/views/views.py
#	vue/src/locales/en.json
#	vue/webpack-stats.json
#	vue/yarn.lock
 2021-06-30 15:06:03 +02:00
vabene1111
a6d7105587 Merge pull request #658 from smilerz/full_text_search 
Full text search
 2021-06-30 15:00:00 +02:00
vabene1111
28b67a2ba5 Merge branch 'develop' into feature/keywords-rework 
# Conflicts:
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	cookbook/templates/sw.js
#	cookbook/views/views.py
#	vue/src/components/RecipeCard.vue
#	vue/src/locales/en.json
 2021-06-30 14:57:33 +02:00
vabene1111
b4e3f3b49b Merge pull request #685 from smilerz/new_keywords 
Keyword Management View
 2021-06-30 14:53:08 +02:00
vabene1111
a508fa81c0 Merge pull request #740 from vabene1111/dependabot/pip/boto3-1.17.102 
Bump boto3 from 1.17.101 to 1.17.102
 2021-06-30 14:48:16 +02:00
vabene1111
c5bec8b69e fixed rendering of recipe cards without descriptions 2021-06-30 14:42:48 +02:00
Kaibu
c4905d39c1 minor ui/ux improvements 2021-06-30 04:12:52 +02:00
dependabot[bot]
5275e5eba7 Bump boto3 from 1.17.101 to 1.17.102 
Bumps [boto3](https://github.com/boto/boto3) from 1.17.101 to 1.17.102.
- [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.17.101...1.17.102)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-29 00:02:39 +00:00
vabene1111
272341f1dc further improvements to search view 2021-06-28 18:35:20 +02:00
vabene1111
78885987f0 small recipe card tweaks 2021-06-28 16:41:45 +02:00
vabene1111
cdbcc971b1 fixed old search rating 2021-06-28 16:31:48 +02:00
vabene1111
5378b4c577 Merge pull request #720 from Forceu/develop 
Fixed Install URL in readme and documentation, added link to Docker Hub
 2021-06-28 16:24:09 +02:00
vabene1111
269593cd98 Merge branch 'develop' into develop 2021-06-28 16:24:04 +02:00