cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,684 Commits 2 Branches 0 Tags
6af3d7c98fdb93b4b2b5c47a13219dbb0ec48bcc
Commit Graph

4684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arne Hüffmeier
cf24e1014a add two infos 2022-09-01 13:38:47 +02:00
dependabot[bot]
bd1b40dd94 Bump core-js from 3.22.7 to 3.25.0 in /vue 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.22.7 to 3.25.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.22.7...v3.25.0)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-01 00:37:12 +00:00
dependabot[bot]
95d4bfb2bd Bump typescript from 4.7.2 to 4.8.2 in /vue 
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.7.2 to 4.8.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.7.2...v4.8.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-01 00:34:33 +00:00
dependabot[bot]
23caac9d09 Bump drf-writable-nested from 0.6.4 to 0.7.0 
Bumps [drf-writable-nested](https://github.com/beda-software/drf-writable-nested) from 0.6.4 to 0.7.0.
- [Release notes](https://github.com/beda-software/drf-writable-nested/releases)
- [Changelog](https://github.com/beda-software/drf-writable-nested/blob/master/CHANGELOG.md)
- [Commits](https://github.com/beda-software/drf-writable-nested/compare/v0.6.4...v0.7.0)

---
updated-dependencies:
- dependency-name: drf-writable-nested
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-01 00:15:01 +00:00
nough
ece4f6e32d Update updating.md 2022-08-28 20:52:52 +01:00
nough
5e7d1ba827 Update updating.md 
remove outline of docker update batch script - it wasn't ready and I committed it when I didn't understand how github branches work (I still don't, really).
 2022-08-28 20:51:26 +01:00
nough
a88214eea6 Update external_recipes.md 
fixed my mistakes
 2022-08-27 22:18:52 +01:00
nough
7ec5646338 update external_recipes.md with docker info 
added info on docker external recipes, as i've just followed this process myself. unsure if I needed to add the externalfiles folder to the nginx_recipes volume, but I have anyway in my personal one, and that worked.
 2022-08-27 22:12:33 +01:00
nough
c020bea41e Merge branch 'TandoorRecipes:develop' into develop 2022-08-27 21:57:02 +01:00
吕楪
e6f79a6fa3 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (460 of 460 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
 2022-08-23 13:32:56 +00:00
Mike Miller
0ab430ea82 Translated using Weblate (German) 
Currently translated at 99.7% (459 of 460 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-08-23 13:32:56 +00:00
Kirstin Seidel-Gebert
3d95657b8a Translated using Weblate (German) 
Currently translated at 99.7% (459 of 460 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-08-23 13:32:56 +00:00
吕楪
726157a062 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (524 of 524 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/
 2022-08-23 13:32:51 +00:00
Kirstin Seidel-Gebert
f8793f3ec8 Translated using Weblate (German) 
Currently translated at 99.6% (522 of 524 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-08-23 13:32:51 +00:00
吕楪
09929beeb9 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 98.6% (454 of 460 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
 2022-08-22 09:56:23 +00:00
Mathias Rasmussen
2a1b2c18fc Translated using Weblate (Danish) 
Currently translated at 100.0% (528 of 528 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/da/
 2022-08-18 14:32:52 +00:00
Mathias Rasmussen
0cc3df71d2 Translated using Weblate (Danish) 
Currently translated at 100.0% (460 of 460 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/da/
 2022-08-14 16:32:49 +00:00
Thorin
e124c211ac Translated using Weblate (Spanish) 
Currently translated at 73.2% (315 of 430 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/es/
 2022-08-12 21:32:52 +00:00
Thorin
dc2f62dc9d Translated using Weblate (Spanish) 
Currently translated at 53.0% (278 of 524 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/es/
 2022-08-12 21:32:52 +00:00
Cameron Grant
38921f1254 Updated time to use hours and minutes split 2022-08-11 14:23:31 -07:00
vabene1111
4fec9a493e Merge pull request #1989 from TandoorRecipes/dependabot/pip/django-4.0.7 
Bump django from 4.0.6 to 4.0.7
 2022-08-11 23:07:43 +02:00
dependabot[bot]
71c5adda79 Bump django from 4.0.6 to 4.0.7 
Bumps [django](https://github.com/django/django) from 4.0.6 to 4.0.7.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/4.0.6...4.0.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-11 15:25:12 +00:00
Andrew Jayne
cffa731106 fix: ingredient parsing for non-latin languages 
Before this change the ingredient string for non-latin
languages was not being parsed into the correct amount
or units when the food is found at the start of the
ingredient string.

This was because the regex being used was restricted to
latin characters.

With this change the amount and units are correctly
parsed from such a string.

Fixes https://github.com/TandoorRecipes/recipes/issues/1983
 2022-08-07 21:37:59 +01:00
vabene1111
c7f75fe58f boot.sh 2022-08-05 17:55:25 +02:00
vabene1111
2eed5143fe boot.sh 2022-08-05 17:43:59 +02:00
vabene1111
6e4ea518d9 boot.sh 2022-08-05 17:36:00 +02:00
vabene1111
a898d722d6 fixed typo 2022-08-05 17:21:59 +02:00
vabene1111
904358bb00 allow changing gunicorn settings 2022-08-05 17:13:27 +02:00
vabene1111
6605b87c5c new settings page finished 2022-08-05 16:54:53 +02:00
vabene1111
64688ca5e1 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-08-05 14:28:22 +02:00
vabene1111
e9a1a06bda fixed recipe share permission 2022-08-05 14:28:17 +02:00
vabene1111
a8da28f877 Merge pull request #1980 from 8633brown/nplusone 
prefetch food relations #1965
 2022-08-05 07:53:01 +02:00
8633brown
70b2bd6ccf prefetch food relations #1965 2022-08-04 22:11:48 +01:00
vabene1111
8ed5d52ddf fixed space settings saving issue 2022-08-04 18:54:00 +02:00
vabene1111
f7af0741fe fixed bookmarklet 2022-08-04 18:45:40 +02:00
vabene1111
3ec4afb02f fixed scoping and permissions for tokens 2022-08-04 18:33:45 +02:00
vabene1111
3f77b73a61 add multiple API tokens per user, removes old API tokens 2022-08-04 17:24:54 +02:00
Oliver Cervera
9e62d8a3a3 Translated using Weblate (Italian) 
Currently translated at 79.9% (419 of 524 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2022-08-04 11:32:45 +00:00
vabene1111
9ef21241bf markdown editor adjustments 2022-08-01 17:13:44 +02:00
vabene1111
5e77adf7e6 fixed mail send 2022-08-01 16:56:18 +02:00
vabene1111
4df0a46701 Merge pull request #1975 from TandoorRecipes/dependabot/pip/icalendar-4.1.0 
Bump icalendar from 4.0.9 to 4.1.0
 2022-08-01 16:28:48 +02:00
dependabot[bot]
f186404628 Bump icalendar from 4.0.9 to 4.1.0 
Bumps [icalendar](https://github.com/collective/icalendar) from 4.0.9 to 4.1.0.
- [Release notes](https://github.com/collective/icalendar/releases)
- [Changelog](https://github.com/collective/icalendar/blob/4.1.0/CHANGES.rst)
- [Commits](https://github.com/collective/icalendar/compare/4.0.9...4.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-01 14:28:24 +00:00
vabene1111
8e3ec91f3c Merge pull request #1961 from AquaticLava/develop 
Fixes  #1234
 2022-08-01 16:28:18 +02:00
vabene1111
2605addf34 Merge pull request #1974 from TandoorRecipes/dependabot/pip/drf-writable-nested-0.6.4 
Bump drf-writable-nested from 0.6.3 to 0.6.4
 2022-08-01 16:27:48 +02:00
vabene1111
1ab3e57b83 Merge pull request #1947 from dmaes/develop 
Add S3_CUSTOM_DOMAIN settings, closes #1943
 2022-08-01 16:27:16 +02:00
dependabot[bot]
2f36ae5112 Bump drf-writable-nested from 0.6.3 to 0.6.4 
Bumps [drf-writable-nested](https://github.com/beda-software/drf-writable-nested) from 0.6.3 to 0.6.4.
- [Release notes](https://github.com/beda-software/drf-writable-nested/releases)
- [Changelog](https://github.com/beda-software/drf-writable-nested/blob/master/CHANGELOG.md)
- [Commits](https://github.com/beda-software/drf-writable-nested/compare/v0.6.3...v0.6.4)

---
updated-dependencies:
- dependency-name: drf-writable-nested
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-01 14:27:15 +00:00
vabene1111
acc19ca65e Merge pull request #1973 from TandoorRecipes/dependabot/pip/python-ldap-3.4.2 
Bump python-ldap from 3.4.0 to 3.4.2
 2022-08-01 16:26:46 +02:00
vabene1111
ea213e2dfd Merge pull request #1948 from iamkarlson/feature/fix_csrf_django_40 
fixed csrf
 2022-08-01 16:25:56 +02:00
vabene1111
02cf3264a3 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-08-01 16:18:46 +02:00
vabene1111
a0b1186558 settings wip 2022-08-01 16:18:43 +02:00