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,228 Commits 21 Branches 170 Tags
0501dd9a0a21559c092ac13201da61f99f991288
Commit Graph

2228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kaibu
0501dd9a0a layout progress 2021-09-12 22:47:31 +02:00
Kaibu
9bdcf09f60 started reworking books 2021-09-08 16:15:33 +02:00
vabene1111
68b64ba8e2 Merge branch 'pr/865' into develop 2021-09-08 09:42:16 +02:00
vabene1111
bb8476a25a Merge pull request #867 from vabene1111/dependabot/pip/boto3-1.18.37 
Bump boto3 from 1.18.36 to 1.18.37
 2021-09-08 09:36:25 +02:00
vabene1111
b3477332e7 Merge pull request #866 from smilerz/log_pagination 
implemented pagination on Log apis
 2021-09-08 09:32:51 +02:00
vabene1111
8edc01db26 Merge pull request #861 from smilerz/food_tree_patch 
post food_tree bug fixing
 2021-09-08 09:11:00 +02:00
dependabot[bot]
43cb726674 Bump boto3 from 1.18.36 to 1.18.37 
Bumps [boto3](https://github.com/boto/boto3) from 1.18.36 to 1.18.37.
- [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.18.36...1.18.37)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-08 00:03:20 +00:00
smilerz
8420995aa8 updated RecipeSearch API 2021-09-07 13:52:14 -05:00
Oliver Cervera
5c4bf20c6f Translated using Weblate (Italian) 
Currently translated at 83.1% (99 of 119 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-07 16:06:03 +00:00
Afaren
e32813281a Translated using Weblate (French) 
Currently translated at 100.0% (119 of 119 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2021-09-07 16:06:03 +00:00
Afaren
f2497b0a52 Translated using Weblate (French) 
Currently translated at 100.0% (481 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2021-09-07 16:06:03 +00:00
smilerz
4d27a80cd5 implemented pagination on Log apis 2021-09-07 07:35:17 -05:00
smilerz
c9d1a9b551 finished unit page 2021-09-06 14:00:32 -05:00
smilerz
84744560e0 infinite loader bug fixing 2021-09-06 12:28:14 -05:00
smilerz
7053a857c2 reworked MergeMixin to handle non-trees 2021-09-06 10:45:16 -05:00
smilerz
f12558951a moved keyword Vue to generic components 2021-09-05 16:26:01 -05:00
smilerz
638dd96812 finished making FoodList completely generic 2021-09-05 14:15:58 -05:00
smilerz
d33a49538e Squashed commit of the following: 2021-09-05 11:18:57 -05:00
smilerz
d1556f69c2 WIP 2021-09-05 11:17:28 -05:00
smilerz
ab316236f9 allow deleting of Food part of Ingredient, but not recipe 2021-09-05 10:10:42 -05:00
smilerz
cd0259ad26 remove console messages 2021-09-04 16:47:12 -05:00
smilerz
b147c975b8 post food_tree bug fixing 2021-09-04 16:41:57 -05:00
vabene1111
16d125a243 fixed search facets and sub recipe 2021-09-04 19:26:42 +02:00
vabene1111
738387ccf0 Merge pull request #832 from smilerz/keyword_todo 
fixes keyword filter on OR search
 2021-09-04 18:30:54 +02:00
vabene1111
b129753d4e Merge branch 'develop' into keyword_todo 2021-09-04 18:30:49 +02:00
vabene1111
de8ceba3bc compiled and updated javascript resources 2021-09-04 18:17:07 +02:00
vabene1111
9d3246d5db Merge pull request #859 from vabene1111/dependabot/pip/django-webpack-loader-1.3.0 
Bump django-webpack-loader from 1.1.0 to 1.3.0
 2021-09-04 18:14:11 +02:00
vabene1111
d70f1f9fc7 several small fixes to new components 2021-09-04 18:11:50 +02:00
dependabot[bot]
d9c9bcf3a5 Bump django-webpack-loader from 1.1.0 to 1.3.0 
Bumps [django-webpack-loader](https://github.com/django-webpack/django-webpack-loader) from 1.1.0 to 1.3.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/compare/1.1.0...1.3.0)

---
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-09-04 16:11:11 +00:00
vabene1111
cb8dc98de4 Merge pull request #858 from vabene1111/dependabot/pip/boto3-1.18.36 
Bump boto3 from 1.18.35 to 1.18.36
 2021-09-04 18:10:33 +02:00
vabene1111
62ae461811 Merge pull request #855 from vabene1111/dependabot/pip/django-3.2.7 
Bump django from 3.2.6 to 3.2.7
 2021-09-04 18:10:29 +02:00
vabene1111
d6e0faf7f4 Merge pull request #846 from smilerz/food_tree 
Food tree
 2021-09-04 17:47:10 +02:00
dependabot[bot]
bbee9fc294 Bump django from 3.2.6 to 3.2.7 
Bumps [django](https://github.com/django/django) from 3.2.6 to 3.2.7.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.6...3.2.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-04 15:28:54 +00:00
dependabot[bot]
442d68379e Bump boto3 from 1.18.35 to 1.18.36 
Bumps [boto3](https://github.com/boto/boto3) from 1.18.35 to 1.18.36.
- [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.18.35...1.18.36)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-04 15:28:53 +00:00
vabene1111
a9ee504f06 Merge pull request #857 from vabene1111/dependabot/pip/pillow-8.3.2 
Bump pillow from 8.3.1 to 8.3.2
 2021-09-04 17:28:33 +02:00
vabene1111
917ba4687c Merge pull request #856 from vabene1111/dependabot/pip/pytest-6.2.5 
Bump pytest from 6.2.4 to 6.2.5
 2021-09-04 17:28:29 +02:00
dependabot[bot]
ca1a98d662 Bump pillow from 8.3.1 to 8.3.2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.1 to 8.3.2.
- [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.1...8.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-04 15:20:52 +00:00
dependabot[bot]
6fb0f94a78 Bump pytest from 6.2.4 to 6.2.5 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.4 to 6.2.5.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.4...6.2.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-04 15:20:48 +00:00
vabene1111
e15647b1b8 Merge pull request #829 from vabene1111/dependabot/pip/cryptography-3.4.8 
Bump cryptography from 3.4.7 to 3.4.8
 2021-09-04 17:20:39 +02:00
vabene1111
f77e4fe063 Merge pull request #831 from vabene1111/dependabot/pip/simplejson-3.17.5 
Bump simplejson from 3.17.3 to 3.17.5
 2021-09-04 17:20:35 +02:00
vabene1111
027e58667e Merge pull request #836 from vabene1111/dependabot/pip/recipe-scrapers-13.4.0 
Bump recipe-scrapers from 13.3.5 to 13.4.0
 2021-09-04 17:20:30 +02:00
vabene1111
b7351f7102 Merge pull request #838 from vabene1111/dependabot/pip/bleach-4.1.0 
Bump bleach from 4.0.0 to 4.1.0
 2021-09-04 17:20:25 +02:00
vabene1111
d86255f471 Merge pull request #853 from vabene1111/dependabot/pip/boto3-1.18.35 
Bump boto3 from 1.18.25 to 1.18.35
 2021-09-04 17:20:21 +02:00
Oliver Cervera
a4707c09f9 Translated using Weblate (Italian) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-04 08:06:02 +00:00
dependabot[bot]
ed562860c6 Bump boto3 from 1.18.25 to 1.18.35 
Bumps [boto3](https://github.com/boto/boto3) from 1.18.25 to 1.18.35.
- [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.18.25...1.18.35)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-03 00:03:01 +00:00
Oliver Cervera
4360289b56 Translated using Weblate (Italian) 
Currently translated at 95.9% (94 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-02 11:06:01 +00:00
Oliver Cervera
27aae26f16 Translated using Weblate (Italian) 
Currently translated at 100.0% (481 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-09-02 11:06:01 +00:00
smilerz
ac08ede464 refactored genericAPI as ApiMixin 2021-09-01 12:28:33 -05:00
Oliver Cervera
47946332f4 Translated using Weblate (Italian) 
Currently translated at 73.4% (72 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-08-31 23:32:11 +00:00
Oliver Cervera
32da9e006b Translated using Weblate (Italian) 
Currently translated at 90.8% (437 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-08-31 23:31:40 +00:00