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,345 Commits 21 Branches 170 Tags
2012ef9e46c8c30ece6df25520ec7d523b700179
Commit Graph

2345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
vabene1111
82c83f4b8d Merge pull request #727 from vabene1111/dependabot/pip/django-webpack-loader-1.1.0 
Bump django-webpack-loader from 1.0.0 to 1.1.0
 2021-06-28 16:18:59 +02:00
vabene1111
42885cefc9 Merge pull request #739 from vabene1111/dependabot/pip/boto3-1.17.101 
Bump boto3 from 1.17.97 to 1.17.101
 2021-06-28 16:18:53 +02:00
dependabot[bot]
54a5009f98 Bump boto3 from 1.17.97 to 1.17.101 
Bumps [boto3](https://github.com/boto/boto3) from 1.17.97 to 1.17.101.
- [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.97...1.17.101)

---
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-28 00:20:10 +00:00
Hrachya Kocharyan
7c49164387 Added translation using Weblate (Armenian) 2021-06-26 08:52:51 +00:00
Maximilian J
1b8d4e4494 Translated using Weblate (German) 
Currently translated at 98.6% (73 of 74 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2021-06-24 15:49:37 +00:00
Maximilian J
932211e7f6 Translated using Weblate (German) 
Currently translated at 94.4% (445 of 471 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-06-24 15:49:37 +00:00
vabene1111
9658993163 admin filter options and timestamp fields 2021-06-22 18:21:14 +02:00
vabene1111
13e3c98fac actually implemented setting 2021-06-22 17:55:18 +02:00
Jesse
9a9644dc6c Translated using Weblate (Dutch) 
Currently translated at 92.3% (435 of 471 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-06-22 09:12:37 +00:00
Kaibu
cc43b2a9b0 minor ui fixes 2021-06-22 01:03:26 +02:00
Kaibu
91c0dbd8d2 demo url will login filled 2021-06-22 00:10:27 +02:00
vabene1111
3271ec6867 fixed cookie name env 2021-06-21 17:29:00 +02:00
dependabot[bot]
d39b779db9 Bump django-webpack-loader from 1.0.0 to 1.1.0 
Bumps [django-webpack-loader](https://github.com/django-webpack/django-webpack-loader) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/django-webpack/django-webpack-loader/releases)
- [Changelog](https://github.com/django-webpack/django-webpack-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/django-webpack/django-webpack-loader/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-21 13:31:03 +00:00
vabene1111
536b0bad20 Merge pull request #728 from vabene1111/dependabot/npm_and_yarn/vue/postcss-7.0.36 
Bump postcss from 7.0.35 to 7.0.36 in /vue
 2021-06-21 15:30:28 +02:00
vabene1111
5c2020b8dd Merge pull request #725 from vabene1111/dependabot/pip/python-dotenv-0.18.0 
Bump python-dotenv from 0.17.1 to 0.18.0
 2021-06-21 15:30:08 +02:00
vabene1111
5851d061a2 Merge pull request #726 from vabene1111/dependabot/pip/recipe-scrapers-13.3.0 
Bump recipe-scrapers from 13.2.8 to 13.3.0
 2021-06-21 15:30:01 +02:00
dependabot[bot]
a8bcc1457d Bump python-dotenv from 0.17.1 to 0.18.0 
Bumps [python-dotenv](https://github.com/theskumar/python-dotenv) from 0.17.1 to 0.18.0.
- [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.17.1...v0.18.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-21 13:29:47 +00:00
dependabot[bot]
6ba9cb8b55 Bump postcss from 7.0.35 to 7.0.36 in /vue 
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.35...7.0.36)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-21 13:29:45 +00:00