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
3,327 Commits 21 Branches 170 Tags
fccb2650f52b83f86cfae5e9e79d060ec5a73d17
Commit Graph

3327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
fccb2650f5 Merge pull request #1451 from TandoorRecipes/dependabot/pip/django-hcaptcha-0.2.0 
Bump django-hcaptcha from 0.1.0 to 0.2.0
 2022-02-03 14:41:32 +01:00
vabene1111
e4f74af9c0 Merge pull request #1450 from TandoorRecipes/dependabot/pip/django-crispy-forms-1.14.0 
Bump django-crispy-forms from 1.13.0 to 1.14.0
 2022-02-03 14:41:29 +01:00
vabene1111
982cde5623 Merge pull request #1449 from TandoorRecipes/dependabot/pip/pyppeteer-1.0.2 
Bump pyppeteer from 0.2.6 to 1.0.2
 2022-02-03 14:41:23 +01:00
vabene1111
66949356ea Merge pull request #1448 from TandoorRecipes/dependabot/pip/django-cors-headers-3.11.0 
Bump django-cors-headers from 3.10.1 to 3.11.0
 2022-02-03 14:41:19 +01:00
vabene1111
ed99da2d1e Merge pull request #1472 from smilerz/updated_dockerignore 
updated .dockerignore
 2022-02-03 14:33:18 +01:00
vabene1111
ed852b3246 Merge pull request #1437 from MaxJa4/improvement/wait_for_db 
[Docker] Web_recipes waits for db_recipes to be ready
 2022-02-03 14:32:37 +01:00
vabene1111
eec0a49cd6 Merge pull request #1435 from MaxJa4/docs/headers 
[Docs] Added example configs and header information
 2022-02-03 14:30:20 +01:00
vabene1111
382c08dc0c Merge pull request #1445 from thumm/feature/ldap_cacertfile 
Add new env parameter to set ldap ca cert file
 2022-02-03 14:28:29 +01:00
Mario Dvorsek
231d1695ff Translated using Weblate (Slovenian) 
Currently translated at 15.3% (78 of 509 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sl/
 2022-02-02 15:31:32 +00:00
Sven
97febe9aa1 Translated using Weblate (German) 
Currently translated at 96.1% (546 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-02-02 15:31:32 +00:00
Chris Scoggins
c5a435905b remove vue source 2022-02-02 07:50:27 -06:00
vabene1111
86e34593d5 Merge pull request #1464 from StephenBrown2/make_header 
Fix Make_Header/Make_Ingredient text and reference
 2022-02-01 17:40:47 +01:00
Stephen Brown II
3961c684f9 Fix Make_Header/Make_Ingredient text and reference 2022-02-01 09:17:30 -06:00
vabene1111
b2a415b333 Merge pull request #1447 from smilerz/mealplan_shopping_useability 
Mealplan shopping useability
 2022-02-01 08:28:59 +01:00
dependabot[bot]
966cda2371 Bump django-hcaptcha from 0.1.0 to 0.2.0 
Bumps [django-hcaptcha](https://github.com/AndrejZbin) from 0.1.0 to 0.2.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-01 00:03:35 +00:00
dependabot[bot]
fcb1de4b93 Bump django-crispy-forms from 1.13.0 to 1.14.0 
Bumps [django-crispy-forms](https://github.com/django-crispy-forms/django-crispy-forms) from 1.13.0 to 1.14.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.13.0...1.14.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>
 2022-02-01 00:03:31 +00:00
dependabot[bot]
ca61764d2d Bump pyppeteer from 0.2.6 to 1.0.2 
Bumps [pyppeteer](https://github.com/pyppeteer/pyppeteer) from 0.2.6 to 1.0.2.
- [Release notes](https://github.com/pyppeteer/pyppeteer/releases)
- [Changelog](https://github.com/pyppeteer/pyppeteer/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/pyppeteer/pyppeteer/compare/0.2.6...1.0.2)

---
updated-dependencies:
- dependency-name: pyppeteer
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-01 00:03:26 +00:00
dependabot[bot]
a5946b49f8 Bump django-cors-headers from 3.10.1 to 3.11.0 
Bumps [django-cors-headers](https://github.com/adamchainz/django-cors-headers) from 3.10.1 to 3.11.0.
- [Release notes](https://github.com/adamchainz/django-cors-headers/releases)
- [Changelog](https://github.com/adamchainz/django-cors-headers/blob/main/HISTORY.rst)
- [Commits](https://github.com/adamchainz/django-cors-headers/compare/3.10.1...3.11.0)

---
updated-dependencies:
- dependency-name: django-cors-headers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-01 00:03:23 +00:00
Chris Scoggins
13d144345e adjust height of viewport in mobile shopping view 2022-01-31 16:30:54 -06:00
Chris Scoggins
b633be9c13 fix display issues 2022-01-31 16:24:40 -06:00
Chris Scoggins
f45e09a5a5 add units to search fields 2022-01-31 14:41:18 -06:00
Chris Scoggins
5b3a0a6e29 refactor IngredientComponent, move shopping logic to card 2022-01-31 14:05:01 -06:00
Thomas Schumm
505bac514f Add new env parameter to set ldap ca cert file 2022-01-31 19:34:32 +01:00
MaxJa4
39c3ce7ab2 More emphasis on waiting for migrations 2022-01-31 15:42:48 +01:00
MaxJa4
419821733c Optimized healthcheck timings 
1s faster interval (to increase retry speed on faster systems), 1s shorter timeout (since it db should react in a lot less than 1s), increased retries to 12 total so all adds up to 60s of potential retry-time for older systems (e.g. RPI 3)
 2022-01-31 14:27:39 +01:00
vabene1111
8216d0c025 Merge pull request #1439 from oliviapinson/develop 
Simple font size change
 2022-01-31 11:41:29 +01:00
dudel
98128fabab Translated using Weblate (German) 
Currently translated at 95.9% (545 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-01-30 15:07:01 +00:00
Olivia Pinson
2d36db7822 Simple font size change 
Adjusted font size so longer months won't affect arrow buttons. I think this helps the meal plan calendar look more aesthetic.
 2022-01-29 22:44:19 -05:00
MaxJa4
300d132266 Removed retry process since it's fixed now 
Removed retry process since it's fixed now by improvement/wait_for_db
 2022-01-30 01:24:17 +01:00
MaxJa4
6330d15ebe Update docker-compose.yml 2022-01-30 01:20:54 +01:00
MaxJa4
d7d37f9908 Update docker-compose.yml 2022-01-30 01:20:33 +01:00
MaxJa4
fb29db7aad Web container waits for DB container to be ready 
Fixes the setup issue almost all Raspberry Pi users have and probably some others with slow or low spec systems.
The web_recipes container waits for db_recipes to be healthy.
db_recipes is healthy, as soon as postgres is completely ready.

Note: ps_isready doesn't work here for some reason.

Tested multiple times with a Raspberry Pi 4.
 2022-01-30 01:19:50 +01:00
MaxJa4
76dac29f1c Added raspberry pi setup issue FAQ 
Added raspberry pi setup issue FAQ/info
 2022-01-30 00:28:27 +01:00
Chris Scoggins
e00794bbdf review shopping list in MealPlan modal 2022-01-29 14:10:14 -06:00
Chris Scoggins
a7796cbf5c fix shopping list sharing 2022-01-29 11:59:06 -06:00
Chris Scoggins
e2f8f29ec8 refactor list_from_recipe as class RecipeShoppingEditor 2022-01-29 10:28:01 -06:00
MaxJa4
6e8729bb58 Added example configs and header information 
Added example configs for plain local nginx and Apache2.
Also added FAQ section for all generic issues when not setting all required headers correctly.
Added section for required headers in the Docker installation docs.
 2022-01-28 17:44:52 +01:00
vabene1111
9fcfa17004 Merge pull request #1377 from MaxJa4/docs/docker-installation 
Enhancement of installation instruction docs
 2022-01-28 15:35:20 +01:00
vabene1111
58f1ce0331 fixed rendering issue with single step recipes 2022-01-28 15:26:11 +01:00
vabene1111
20b4c4fb36 fixed using undeclared unused field 2022-01-28 15:21:07 +01:00
vabene1111
965e1664af Merge pull request #1411 from TheHaf/feature/addPortionSizeModifiersToGui 
Feature/add portion size modifiers to gui
 2022-01-28 15:17:05 +01:00
vabene1111
8232c77ef6 Merge pull request #1432 from smilerz/mealplan_shopping_useability 
fix servings reactivity
 2022-01-28 15:16:01 +01:00
Chris Scoggins
85bbcb0010 fix servings reactivity 2022-01-28 07:38:36 -06:00
vabene1111
338d8459de Merge pull request #1429 from smilerz/fix_shopping_sharing 
fix #1426
 2022-01-28 08:54:08 +01:00
Mario Dvorsek
fbf9a81121 Translated using Weblate (Slovenian) 
Currently translated at 97.2% (283 of 291 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/
 2022-01-28 00:07:08 +00:00
Alex Hanselmann
1f80936805 Translated using Weblate (German) 
Currently translated at 93.1% (529 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-01-28 00:07:08 +00:00
Chris Scoggins
8d424d668d fix #1426 2022-01-27 16:46:46 -06:00
vabene1111
b2fcdaa14e wont load by default otherwise 2022-01-27 14:15:38 +01:00
vabene1111
d4d949b870 Merge pull request #1421 from TandoorRecipes/minor_fixes 
Minor fixes
 2022-01-27 08:02:06 +01:00
smilerz
759ae99b56 Update en.json 2022-01-26 18:58:45 -06:00