Commit Graph

2029 Commits

Author SHA1 Message Date
41885f7d05 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-06-15 09:04:10 +02:00
2b7769e92f fixed report abuse button showing even if not shared 2021-06-15 09:04:05 +02:00
6a47d56da4 fixed latest shopping list view 2021-06-14 20:50:02 +02:00
d456d4ae64 disable email verification for social accounts 2021-06-14 19:06:01 +02:00
7b55bcb045 indicate adv. settings set by button color search view 2021-06-14 19:03:53 +02:00
bee1d717c5 added support for multiple image types 2021-06-14 18:53:51 +02:00
c91fc096b3 Merge pull request #673 from MaxJa4/develop
Create image_processing.py
2021-06-14 17:48:00 +02:00
2297210a3f Merge pull request #696 from vabene1111/dependabot/pip/django-crispy-forms-1.12.0
Bump django-crispy-forms from 1.11.2 to 1.12.0
2021-06-14 17:35:15 +02:00
d59f14001c Merge pull request #697 from vabene1111/dependabot/pip/recipe-scrapers-13.2.8
Bump recipe-scrapers from 13.2.7 to 13.2.8
2021-06-14 17:35:09 +02:00
5e5941397b Merge pull request #698 from vabene1111/dependabot/pip/boto3-1.17.93
Bump boto3 from 1.17.90 to 1.17.93
2021-06-14 17:35:04 +02:00
3ca71c6847 Bump boto3 from 1.17.90 to 1.17.93
Bumps [boto3](https://github.com/boto/boto3) from 1.17.90 to 1.17.93.
- [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.90...1.17.93)

---
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-14 06:47:21 +00:00
2c381eb870 Bump recipe-scrapers from 13.2.7 to 13.2.8
Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 13.2.7 to 13.2.8.
- [Release notes](https://github.com/hhursev/recipe-scrapers/releases)
- [Commits](https://github.com/hhursev/recipe-scrapers/compare/13.2.7...13.2.8)

---
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-06-14 06:47:10 +00:00
230a368d38 Bump django-crispy-forms from 1.11.2 to 1.12.0
Bumps [django-crispy-forms](https://github.com/django-crispy-forms/django-crispy-forms) from 1.11.2 to 1.12.0.
- [Release notes](https://github.com/django-crispy-forms/django-crispy-forms/releases)
- [Changelog](https://github.com/django-crispy-forms/django-crispy-forms/blob/main/CHANGELOG.md)
- [Commits](https://github.com/django-crispy-forms/django-crispy-forms/compare/1.11.2...1.12.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-14 06:46:56 +00:00
5db7267a7d actual meal plan fixes 2021-06-13 18:11:31 +02:00
528da111f9 Revert "meal plan fixes"
This reverts commit 926097a699.
2021-06-13 18:11:22 +02:00
926097a699 meal plan fixes 2021-06-13 18:11:05 +02:00
0b3e86f6fd imprioved recipe print view 2021-06-13 17:04:52 +02:00
24e4ea354d catch all exception image import 2021-06-13 16:55:27 +02:00
08bc87960b added abuse prevention for share links 2021-06-12 21:15:23 +02:00
9751821f76 updated base language files 2021-06-12 20:30:41 +02:00
fa12d02a3d fixed tests 2021-06-12 20:22:30 +02:00
9856857c51 updated openeats importer 2021-06-11 15:28:11 +02:00
c52cd359a1 mockup updated 2021-06-09 19:04:14 +02:00
5e9ce955bc minor fixes 2021-06-09 18:53:20 +02:00
f7d85bb4b8 improvements to recipekeeper importer 2021-06-09 17:23:14 +02:00
46db6d4186 Merge pull request #591 from itsmegb/importer-reciepekeeper
New Importer - Reciepe Keeper
2021-06-09 16:42:49 +02:00
6724328b51 Merge branch 'develop' into importer-reciepekeeper 2021-06-09 16:42:28 +02:00
0da39f2e1f Merge pull request #674 from smilerz/fix_666
fix url import
2021-06-09 15:54:36 +02:00
99fbc5e97c added openeats importer 2021-06-09 15:52:36 +02:00
a0b6261275 importer openeats basics 2021-06-09 15:12:12 +02:00
061aefd233 new file system updates 2021-06-09 14:02:33 +02:00
d4e332456b Merge pull request #675 from vabene1111/dependabot/pip/boto3-1.17.90
Bump boto3 from 1.17.89 to 1.17.90
2021-06-09 12:39:23 +02:00
500bb3af72 Merge pull request #655 from vabene1111/dependabot/npm_and_yarn/vue/ws-6.2.2
Bump ws from 6.2.1 to 6.2.2 in /vue
2021-06-09 12:39:19 +02:00
888106bb6f Bump boto3 from 1.17.89 to 1.17.90
Bumps [boto3](https://github.com/boto/boto3) from 1.17.89 to 1.17.90.
- [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.89...1.17.90)

---
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-09 05:26:57 +00:00
8daa0ada9b removed if statement checking if ingredient name exists from ingredient_from_text parser 2021-06-08 15:48:02 -05:00
98711619ff Create image_processing.py
Added central function to rescale and compress images for recipes (or in general).
Switched from previously used PNG format to 75% JPEG format for a 5-10x file size reduction with hardly any quality loss.
2021-06-08 22:39:45 +02:00
9eb17df575 added basic support for files 2021-06-08 20:17:48 +02:00
c71a7dad24 updated javascript dependencies 2021-06-08 17:26:39 +02:00
b92e51c0c7 login form style fixes 2021-06-08 14:55:18 +02:00
87e8268a43 build sources 2021-06-08 13:12:40 +02:00
5b79db0725 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
# Conflicts:
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	vue/webpack-stats.json
2021-06-08 13:12:22 +02:00
3aade540c1 file view 2021-06-08 13:12:04 +02:00
74f155b6f5 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-06-08 12:22:16 +02:00
2539d19ff4 minor theme fixes 2021-06-08 12:22:08 +02:00
166f4c5f6b Translated using Weblate (Dutch)
Currently translated at 100.0% (55 of 55 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
2021-06-08 10:19:35 +00:00
ed313cbf9a temporary fix to merge ingredients without recipes 2021-06-07 18:28:16 +02:00
b1db591e9f fixed importer description overflow 2021-06-07 17:17:34 +02:00
94c51f90cd fixed recipe book entry remove 2021-06-07 17:12:00 +02:00
3074d916dc many signup and space management fixes 2021-06-07 16:46:28 +02:00
bf467b1ec0 manage link for hosted version 2021-06-07 16:09:26 +02:00