mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,244 Commits 21 Branches 170 Tags
cd137f9da38a14c1bb07299e2b02a08f09e3fa5a
Commit Graph

2244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smilerz
cd137f9da3 yarn build 2021-09-09 19:07:16 -05:00
smilerz
aae3b679aa filter by recipe 2021-09-09 18:55:47 -05:00
smilerz
249557f8ef filter by rating 2021-09-09 15:23:46 -05:00
vabene1111
14974c55cf Update dependabot.yml 2021-09-09 06:01:54 +02:00
vabene1111
4ba7bc133c Update dependabot.yml 2021-09-09 06:01:01 +02:00
vabene1111
7615d3b498 Update dependabot.yml 2021-09-09 06:00:28 +02:00
vabene1111
023d25064a Update dependabot.yml 2021-09-09 05:58:21 +02:00
vabene1111
8899ec5f0e update dependabot settings 2021-09-09 05:53:52 +02:00
vabene1111
83de6bb9f3 Merge pull request #870 from smilerz/create_inputList 
add new from ListInput
 2021-09-09 05:44:47 +02:00
vabene1111
51dd137d96 Merge branch 'develop' into create_inputList 2021-09-09 05:44:43 +02:00
smilerz
7b3dee4595 fix food facets 2021-09-08 17:07:00 -05:00
smilerz
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
vabene1111
6936710093 Merge pull request #869 from smilerz/fixes 
Move/Merge updated to handle object vs id
 2021-09-08 18:29:24 +02:00
smilerz
5f37af5710 Move/Merge updated to handle object vs id 2021-09-08 09:16:58 -05:00
vabene1111
2df8ed8e80 filter distinct on some queries with shared models 2021-09-08 15:58:27 +02:00
vabene1111
04c047bd31 fixed keyword url parameter type in search view 2021-09-08 15:44:36 +02:00
vabene1111
19d152461c various fixes food serializer 2021-09-08 15:05:54 +02:00
vabene1111
76b1ab9e85 fixed food serializer supermarket 2021-09-08 11:40:20 +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