cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,210 Commits 2 Branches 0 Tags 57 MiB
7053a857c2
Commit Graph

2210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
smilerz
09e886958f restrict dev docker builds to vabene1111 2021-08-31 16:58:00 -05:00
smilerz
b51636ef64 update settings after testing 2021-08-31 16:16:43 -05:00
smilerz
93d261b529 fixed serializer for food 2021-08-31 15:29:16 -05:00
smilerz
70089998fe Fix after rebase 2021-08-31 14:59:00 -05:00
smilerz
65fbbabec5 finished food view 2021-08-31 14:58:41 -05:00
smilerz
52abba1f16 stubbed out all Food GenericModalForms 2021-08-31 14:58:41 -05:00
smilerz
a1d1cbac5d refactored Generic API 2021-08-31 14:58:40 -05:00
smilerz
caeb47aee9 bind data in dynamic fields to parent model 2021-08-31 14:58:40 -05:00
smilerz
23ecce7930 stubbed out generic form modal 2021-08-31 14:58:40 -05:00
smilerz
30b513cb58 Squashed commit of the following: 
commit 7e9a8d4d86
Author: smilerz <smilerz@gmail.com>
Date:   Thu Aug 26 21:56:59 2021 -0500

    test case to detect 833

commit 75e46b8023
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:27:31 2021 -0500

    fix #883

commit 2a1e1953ee
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:08:35 2021 -0500

    consolidated recently viewed into FTS queryset

commit aa2d0eafb1
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:43:52 2021 -0500

    fixed cookie reactivity

commit b74fdb3825
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:37:43 2021 -0500

    exact match appears first on keyword/food/unit searches

commit b00c189fd6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:36:14 2021 -0500

    add pagination reset on search query change
 2021-08-31 14:58:40 -05:00
smilerz
ba07e98cae Squashed commit of the following: 
commit 75e46b8023
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:27:31 2021 -0500

    fix #883

commit 2a1e1953ee
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:08:35 2021 -0500

    consolidated recently viewed into FTS queryset

commit aa2d0eafb1
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:43:52 2021 -0500

    fixed cookie reactivity

commit b74fdb3825
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:37:43 2021 -0500

    exact match appears first on keyword/food/unit searches

commit b00c189fd6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:36:14 2021 -0500

    add pagination reset on search query change
 2021-08-31 14:58:40 -05:00
smilerz
07a67684ab WIP 2021-08-31 14:58:40 -05:00
smilerz
4714162c0b WIP 2021-08-31 14:58:40 -05:00
smilerz
d7d552c5c5 fixed migrations 2021-08-31 14:58:40 -05:00
smilerz
bf3feef707 yarn build 2021-08-31 14:58:39 -05:00
smilerz
44aa05fe5c Fix after rebase 2021-08-31 14:58:39 -05:00
smilerz
35dc981713 generic api mixin 2021-08-31 14:58:39 -05:00
smilerz
f7b2af7f97 working WIP 2021-08-31 14:58:39 -05:00