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
6,411 Commits 21 Branches 170 Tags
4266029e8427518525522bb5b1b46025fad6d4cd
Commit Graph

6411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
4266029e84 somewhat broken initial meal plan version 2024-04-14 22:23:45 +02:00
vabene1111
849856df26 Merge branch 'develop' into feature/vue3 
# Conflicts:
#	cookbook/views/api.py
 2024-04-14 21:24:43 +02:00
vabene1111
371d8a76b8 added flake8 watcher 2024-04-14 18:58:52 +02:00
vabene1111
7f63451b9a Merge pull request #3095 from Manon-ds/fixRounding 
fix: rounding units
 2024-04-14 18:21:28 +02:00
vabene1111
ee8237d493 Merge pull request #3101 from tooboredtocode/develop 
improve docker run speed
 2024-04-14 18:20:06 +02:00
vabene1111
91d3c43422 Merge pull request #3109 from smilerz/recipe_scrapers 
Compatible with recipe_scrapers v15
 2024-04-14 18:15:20 +02:00
smilerz
1700b9c531 change test_automations to use scrape_html 
remove reliance on custom text_scraper class
changed url on test case to generic wildmode vs specific site
 2024-04-12 09:20:56 -05:00
smilerz
7133249f4b update recipe_scrapers to use scrape_html 
scrape_me has been deprecated
 2024-04-12 08:11:59 -05:00
smilerz
ab9ea87549 upgrade recipe-scrapers 2024-04-12 08:11:58 -05:00
smilerz
975ad34672 Revert "tests for pk only nested serializer" 
This reverts commit 714242b6df.
 2024-04-12 07:02:57 -05:00
smilerz
6cb6861228 Revert "Revert "moved prettier configuration to .prettierrc"" 
This reverts commit cc24964368.
 2024-04-12 07:02:42 -05:00
smilerz
cc24964368 Revert "moved prettier configuration to .prettierrc" 
This reverts commit c33c4ed79b.
 2024-04-11 18:24:44 -05:00
smilerz
714242b6df tests for pk only nested serializer 2024-04-11 17:36:24 -05:00
vabene1111
e398fc0b38 Merge branch 'develop' into feature/vue3 
# Conflicts:
#	.gitignore
#	docs/contribute.md
#	recipes/settings.py
#	requirements.txt
 2024-04-11 18:00:42 +02:00
smilerz
c33c4ed79b moved prettier configuration to .prettierrc 2024-04-11 07:27:22 -05:00
vabene1111
971f8f3dad Merge pull request #3102 from smilerz/yapf_prettier 
Yapf prettier
 2024-04-11 07:46:12 +02:00
vabene1111
ca5fda7927 added property type delete admin 2024-04-10 20:04:17 +02:00
smilerz
2e6cc3e58e document configurations required for formatting and linting 2024-04-08 19:16:18 -05:00
tooboredtocode
42b7d1afcb fix: image not working in docker compose environments 2024-04-08 23:58:10 +02:00
tooboredtocode
99868e4e80 Reapply "Merge pull request #3055 from tooboredtocode/develop" 
This reverts commit f14acc371d.
 2024-04-08 23:56:49 +02:00
smilerz
38b22f3a56 setup project level linting with flake8 
project level formatting with prettier
project level formatting with yapf
 2024-04-08 10:49:53 -05:00
Manon Brun
b70a3bce9f Merge branch 'develop' into fixRounding 2024-04-08 09:13:57 +01:00
vabene1111
f14acc371d Revert "Merge pull request #3055 from tooboredtocode/develop" 
This reverts commit d7669279ff, reversing
changes made to 4293ec77c0.
1.5.17 		2024-04-08 07:20:41 +02:00
vabene1111
514c4106b1 basic calendar 2024-04-07 13:29:00 +02:00
vabene1111
3cf89aca10 playing with calendars 2024-04-07 12:54:05 +02:00
vabene1111
9bf8b615dc re added basic recipe activity 2024-04-07 09:28:11 +02:00
vabene1111
cb8dd3bc99 sizing and navs 2024-04-07 08:29:21 +02:00
vabene1111
1cd9caef4a step display tweaks 2024-04-07 07:56:58 +02:00
vabene1111
1025829123 proper timer component 2024-04-07 07:15:25 +02:00
vabene1111
019a931b99 structure cleanup 2024-04-07 06:27:59 +02:00
vabene1111
8398193a51 Merge branch 'develop' into feature/vue3 2024-04-05 21:18:06 +02:00
vabene1111
c031db9019 downgraded recipe scrapers to pass tests for now 2024-04-05 21:18:01 +02:00
Manon Brun
78686faad3 fix: rounding units 2024-04-05 15:57:09 +01:00
vabene1111
ebc2902450 Merge branch 'develop' into feature/vue3 
# Conflicts:
#	requirements.txt
 2024-04-04 20:58:44 +02:00
vabene1111
d7669279ff Merge pull request #3055 from tooboredtocode/develop 
Improve docker run speeds
 2024-04-04 20:52:48 +02:00
vabene1111
4293ec77c0 fixed changing categories of shopping items 2024-04-04 20:49:48 +02:00
vabene1111
0a30c39add Merge pull request #3082 from TandoorRecipes/dependabot/github_actions/awalsh128/cache-apt-pkgs-action-1.4.2 
Bump awalsh128/cache-apt-pkgs-action from 1.4.1 to 1.4.2
 2024-04-04 20:42:52 +02:00
vabene1111
1b6449270b Merge pull request #3081 from TandoorRecipes/dependabot/pip/beautifulsoup4-4.12.3 
Bump beautifulsoup4 from 4.12.2 to 4.12.3
 2024-04-04 20:42:41 +02:00
vabene1111
3ae264eea7 Merge pull request #3080 from TandoorRecipes/dependabot/pip/django-debug-toolbar-4.3.0 
Bump django-debug-toolbar from 4.2.0 to 4.3.0
 2024-04-04 20:42:35 +02:00
vabene1111
c9dc7164f5 Merge pull request #3078 from TandoorRecipes/dependabot/pip/pytest-cov-5.0.0 
Bump pytest-cov from 4.1.0 to 5.0.0
 2024-04-04 20:42:22 +02:00
vabene1111
5751ba1ec5 Merge pull request #3079 from TandoorRecipes/dependabot/pip/django-crispy-forms-2.1 
Bump django-crispy-forms from 2.0 to 2.1
 2024-04-04 20:42:16 +02:00
vabene1111
3eca8c6db4 Merge pull request #3077 from TandoorRecipes/dependabot/pip/recipe-scrapers-14.55.0 
Bump recipe-scrapers from 14.52.0 to 14.55.0
 2024-04-04 20:42:03 +02:00
vabene1111
5cccbb8e5c Merge pull request #3092 from TandoorRecipes/dependabot/pip/pillow-10.3.0 
Bump pillow from 10.2.0 to 10.3.0
 2024-04-04 15:56:09 +02:00
dependabot[bot]
4390703c0c Bump pillow from 10.2.0 to 10.3.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.2.0 to 10.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/10.2.0...10.3.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-03 16:22:02 +00:00
smilerz
47bc3cfbe7 Update backup.md 
update compose configuration for pgbackup to include .env file
 2024-04-03 09:07:09 -05:00
atom karinca
30a2012e90 Translated using Weblate (Turkish) 
Currently translated at 5.9% (29 of 485 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/tr/
 2024-04-01 22:04:36 +00:00
dependabot[bot]
b38ea866b4 Bump awalsh128/cache-apt-pkgs-action from 1.4.1 to 1.4.2 
Bumps [awalsh128/cache-apt-pkgs-action](https://github.com/awalsh128/cache-apt-pkgs-action) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/awalsh128/cache-apt-pkgs-action/releases)
- [Commits](https://github.com/awalsh128/cache-apt-pkgs-action/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: awalsh128/cache-apt-pkgs-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-01 01:02:35 +00:00
dependabot[bot]
5a0b9e14d2 Bump beautifulsoup4 from 4.12.2 to 4.12.3 
Bumps [beautifulsoup4](https://www.crummy.com/software/BeautifulSoup/bs4/) from 4.12.2 to 4.12.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-01 00:53:28 +00:00
dependabot[bot]
4f0f59a55c Bump django-debug-toolbar from 4.2.0 to 4.3.0 
Bumps [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/jazzband/django-debug-toolbar/releases)
- [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst)
- [Commits](https://github.com/jazzband/django-debug-toolbar/compare/4.2...4.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-01 00:53:25 +00:00
dependabot[bot]
768b678c93 Bump django-crispy-forms from 2.0 to 2.1 
Bumps [django-crispy-forms](https://github.com/django-crispy-forms/django-crispy-forms) from 2.0 to 2.1.
- [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/2.0...2.1)

---
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>
 2024-04-01 00:53:19 +00:00