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
3,245 Commits 21 Branches 170 Tags
075c88e5e836c89c88a4d18ac6c9c97ec72d3e31
Commit Graph

3245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
306f90aa98 recipe editor decimal fixes 2022-01-17 16:27:10 +01:00
vabene1111
a19ad706ce Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-17 16:22:18 +01:00
vabene1111
4af6de7425 Revert "Merge pull request #1280 from MarcusWolschon/feature1275_readable_export_file_names" 
This reverts commit c4f40b9639, reversing
changes made to 93b868bc69.
 2022-01-17 16:22:11 +01:00
vabene1111
8f3044dbee Merge pull request #1316 from tomtjes/docs-swag-example 
add swag config example
 2022-01-17 16:04:40 +01:00
vabene1111
7c5ffdaef4 Merge pull request #1347 from smilerz/fuzzy_search 
Fuzzy search
 2022-01-17 15:51:54 +01:00
vabene1111
30421d067e Merge branch 'develop' into fuzzy_search 2022-01-17 15:51:23 +01:00
vabene1111
d3b71e40c7 cleand up context menu code 2022-01-17 15:43:35 +01:00
vabene1111
1a84a8fe80 Merge pull request #1289 from MarcusWolschon/features/1093_recipe_link_in_plan 
#1093 Recipe link in plan
 2022-01-17 15:39:11 +01:00
vabene1111
16cb99f915 Merge pull request #1317 from mheiland/patch-1 
Example for third-party authentication
 2022-01-17 15:37:48 +01:00
vabene1111
a451f722a1 Merge pull request #1327 from tomtjes/docs-faq-amendments 
FAQ amendments
 2022-01-17 15:35:43 +01:00
smilerz
dde350c8af prettier cleanup 2022-01-17 08:35:19 -06:00
smilerz
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
vabene1111
f12196d1c6 Merge pull request #1343 from MatthiasLohr/feature/db-url-path 
Allow to specify an actual path using DATABASE_URL
 2022-01-17 15:20:45 +01:00
vabene1111
d4242a244d Merge branch 'master' into develop 
# Conflicts:
#	cookbook/forms.py
 2022-01-17 15:16:37 +01:00
vabene1111
8a7c4e11c9 fixed invite link counting 1.0.4.1 2022-01-17 15:16:13 +01:00
vabene1111
745bb58c7e fixed valid filter on invite link counter 2022-01-17 15:02:41 +01:00
Matthias Lohr
b3e971fe09 allow to specify an actual path using DATABASE_URL 2022-01-17 11:21:36 +01:00
Oliver Cervera
0c603e3665 Translated using Weblate (Italian) 
Currently translated at 84.1% (239 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2022-01-17 07:56:19 +00:00
Oliver Cervera
fed9cfeeb7 Translated using Weblate (Italian) 
Currently translated at 96.6% (492 of 509 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2022-01-17 07:56:19 +00:00
vabene1111
5a65fd2231 Merge pull request #1331 from TandoorRecipes/dependabot/npm_and_yarn/vue/follow-redirects-1.14.7 
Bump follow-redirects from 1.14.6 to 1.14.7 in /vue
 2022-01-16 17:29:35 +01:00
SMunos
c2a763fa4c Translated using Weblate (French) 
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2022-01-16 07:07:02 +00:00
Josselin du PLESSIS
528767a835 Translated using Weblate (French) 
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2022-01-16 07:07:02 +00:00
糖多
9b182f6076 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 32.0% (91 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
 2022-01-16 07:07:02 +00:00
糖多
968b710b49 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 28.6% (146 of 509 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/
 2022-01-16 07:07:02 +00:00
Josselin du PLESSIS
f11e07d347 Translated using Weblate (French) 
Currently translated at 100.0% (509 of 509 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2022-01-16 07:07:02 +00:00
dependabot[bot]
24e42496a7 Bump follow-redirects from 1.14.6 to 1.14.7 in /vue 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-16 01:02:54 +00:00
vabene1111
9da496cb6d Merge pull request #1323 from MaxJa4/patch-1 
Added Apache2 in the bug report template
 2022-01-15 21:46:04 +01:00
tomtjes
99b3ed8464 add FAQ for PWA 2022-01-15 13:58:40 -05:00
tomtjes
281535e756 phrase FAQ as questions 2022-01-15 13:57:20 -05:00
MaxJa4
9221533ae7 Added Apache2 in the bug report template 
Added Apache2 as selectable option in the bug report template
 2022-01-15 12:56:01 +01:00
mheiland
f07690d7e3 Example for third-party authentication 
Providing an example to integrate Keycloak as IAM for Tandoor. Hinting that both SOCIAL* variables are required.
 2022-01-15 00:24:56 +01:00
SMunos
8cebc98d3b Translated using Weblate (French) 
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2022-01-14 23:18:42 +00:00
FrenchAnon
965d2c05e7 Translated using Weblate (French) 
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2022-01-14 23:18:37 +00:00
Josselin du PLESSIS
17ad01ae8c Translated using Weblate (French) 
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2022-01-14 23:18:36 +00:00
tomtjes
51620a34d9 add swag config example 2022-01-14 15:10:22 -05:00
Tomasz Klimczak
91fcb1b822 Translated using Weblate (Polish) 
Currently translated at 80.9% (225 of 278 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
 2022-01-14 19:11:20 +00:00
Tiago Rascazzi
01d5ab92c5 Translated using Weblate (French) 
Currently translated at 72.6% (202 of 278 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2022-01-14 19:11:20 +00:00
vabene1111
79c8d26e8c Merge pull request #1311 from smilerz/patch-2 
fix bug creating food with create form
 2022-01-14 17:18:30 +01:00
vabene1111
9486b08e20 Merge pull request #1309 from MaxJa4/develop 
Disabled old issue templates and added new ones with new GitHub issues format
 2022-01-14 16:57:10 +01:00
Marcus Wolschon
934eeee5c4 #1093 code cleanup 2022-01-14 13:56:46 +01:00
Marcus Wolschon
2927333bf1 #1093 code cleanup 2022-01-14 13:52:42 +01:00
smilerz
0e1153ce3a deleted extraneous emit 2022-01-13 17:40:26 -06:00
smilerz
b3f05b0bfd fix bug creating food with create form 2022-01-13 16:50:15 -06:00
smilerz
6d9a90c6ba fix onhand_users 2022-01-13 16:49:10 -06:00
smilerz
6555df824d Merge branch 'develop' into feature/custom_filters 2022-01-13 16:01:05 -06:00
smilerz
e313481fc8 WIP 2022-01-13 16:00:59 -06:00
vabene1111
d36033a8b5 Merge pull request #1310 from TandoorRecipes/smilerz-patch-1 
Update serializer.py
 2022-01-13 22:53:58 +01:00
smilerz
d2d2765765 Update serializer.py 
image location should use MEDIA_URL alone and not combine with SCRIPT_NAME
 2022-01-13 15:53:24 -06:00
smilerz
3aa7f6a367 Merge branch 'develop' into feature/custom_filters 2022-01-13 14:41:53 -06:00
Maximilian Jannack
ffa91863dd Added config.yml for FAQ link 2022-01-13 21:26:15 +01:00