vabene1111
03c775d1cc
added merge capabilities to supermarket category
2024-02-10 09:01:21 +01:00
vabene1111
6aa2aa42c7
added more editing capabilities to line item modal
2024-02-10 08:56:15 +01:00
tomtjes
0ee5164aac
remove class used twice
2024-02-07 20:51:59 -05:00
tomtjes
1819ff2bbd
add classes to main components/views
2024-02-07 19:18:51 -05:00
tomtjes
14c2be9277
add classes to scalable numbers
...
apply "scalable" to all
apply "scaled-up" when ingredient factor is >1
apply "unscaled" when ingredient factor is 1
apply "scaled-down" when factor is <1
2024-02-07 16:51:19 -05:00
dependabot[bot]
6377d55ea5
Bump django from 4.2.7 to 4.2.10
...
Bumps [django](https://github.com/django/django ) from 4.2.7 to 4.2.10.
- [Commits](https://github.com/django/django/compare/4.2.7...4.2.10 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-07 18:21:59 +00:00
Patrick Magauran
768e9f8801
Add Setting to enable / disable feature
2024-02-06 22:52:59 -05:00
Patrick Magauran
e8db2b6401
Clicking on Recipe in Meal Plan auto does servings
2024-02-06 22:37:25 -05:00
Patrick Magauran
13f532a67b
Add serving size to recipe url so it loads with num
2024-02-06 22:21:37 -05:00
vabene1111
61ccc6061c
updated api client
2024-02-06 19:21:55 +01:00
smilerz
dc7db75963
regex replace not run on food if there are no food aliases
2024-02-06 11:14:47 -06:00
vabene1111
98b06b6f3c
improved modal
2024-02-06 14:48:18 +01:00
vabene1111
dffb2d4eae
fixed test
2024-02-06 14:42:14 +01:00
vabene1111
08a2b4d0b2
formatted file
2024-02-06 14:10:36 +01:00
vabene1111
5211fbe6da
styling and bg sync message
2024-02-06 13:52:26 +01:00
vabene1111
a2cb1ccf3a
Revert "playing with checkbox design"
...
This reverts commit ece7ca7e82
2024-02-06 13:25:34 +01:00
vabene1111
29438109a6
fixed postgres update doc mv -R
2024-02-06 10:58:17 +01:00
vabene1111
4bb4c3e9a4
Merge pull request #2935 from TandoorRecipes/dependabot/pip/cryptography-42.0.0
...
Bump cryptography from 41.0.7 to 42.0.0
2024-02-06 10:56:19 +01:00
dependabot[bot]
46dc0f1f03
Bump cryptography from 41.0.7 to 42.0.0
...
Bumps [cryptography](https://github.com/pyca/cryptography ) from 41.0.7 to 42.0.0.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/pyca/cryptography/compare/41.0.7...42.0.0 )
---
updated-dependencies:
- dependency-name: cryptography
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-06 03:28:24 +00:00
vabene1111
59e949067c
Merge branch 'develop' into feature/shopping-ui
2024-02-05 16:15:56 +01:00
vabene1111
3e97fa9633
fixed dash in PR
2024-02-05 16:15:50 +01:00
vabene1111
1a5881bb4b
Merge branch 'develop' into feature/shopping-ui
...
# Conflicts:
# cookbook/serializer.py
2024-02-05 15:59:56 +01:00
vabene1111
b6cbb28a87
Merge pull request #2914 from Mikhail5555/CiPipelineImprovements
...
Add Caching and Test export to CI workflow
2024-02-05 15:50:25 +01:00
vabene1111
36c0fbffbe
fixed duplicate detection in migration 0200
2024-02-05 14:52:40 +01:00
vabene1111
febf3a3d86
removed flawed duplicate detection
2024-02-05 14:05:11 +01:00
vabene1111
3f859e5227
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
2024-02-05 13:52:58 +01:00
vabene1111
7e39e6fea5
fixed meal type constraint
2024-02-05 13:52:52 +01:00
vabene1111
2fd72fe985
Merge pull request #2932 from software2000/develop
...
Update postgres in documentation
2024-02-05 13:51:33 +01:00
software2000
ce0ee8caaa
update postgres in documentation to version 16
2024-02-04 22:32:03 +01:00
vabene1111
4eafbddfdb
fixed SLE api endpoint
2024-02-02 09:31:33 +01:00
vabene1111
010fb0112f
Merge branch 'develop' into feature/shopping-ui
2024-02-02 07:46:48 +01:00
vabene1111
ece7ca7e82
playing with checkbox design
2024-02-01 21:09:21 +01:00
vabene1111
bb1b1a40b6
fixed search on userfile and supermarket generic select
2024-02-01 20:00:51 +01:00
vabene1111
f7b25c9b31
easier supermarket select on mobile
2024-02-01 19:39:11 +01:00
vabene1111
7f6cd16a77
changed default supermarket prefs
2024-02-01 19:36:07 +01:00
Lorenzo
e5303967df
Translated using Weblate (Italian)
...
Currently translated at 84.6% (469 of 554 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2024-02-01 17:22:53 +00:00
Lorenzo
199caff2a2
Translated using Weblate (Italian)
...
Currently translated at 93.0% (456 of 490 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
2024-02-01 17:22:53 +00:00
dependabot[bot]
c3eb12160a
Bump django-auth-ldap from 4.4.0 to 4.6.0
...
Bumps [django-auth-ldap](https://github.com/django-auth-ldap/django-auth-ldap ) from 4.4.0 to 4.6.0.
- [Release notes](https://github.com/django-auth-ldap/django-auth-ldap/releases )
- [Changelog](https://github.com/django-auth-ldap/django-auth-ldap/blob/master/docs/changes.rst )
- [Commits](https://github.com/django-auth-ldap/django-auth-ldap/compare/4.4.0...4.6.0 )
---
updated-dependencies:
- dependency-name: django-auth-ldap
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-01 00:34:00 +00:00
dependabot[bot]
f017c6ae68
Bump django-tables2 from 2.5.3 to 2.7.0
...
Bumps [django-tables2](https://github.com/jieter/django-tables2 ) from 2.5.3 to 2.7.0.
- [Changelog](https://github.com/jieter/django-tables2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jieter/django-tables2/compare/v2.5.3...v2.7.0 )
---
updated-dependencies:
- dependency-name: django-tables2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-01 00:33:57 +00:00
dependabot[bot]
b2f270a829
Bump @codemirror/view from 6.22.2 to 6.23.1 in /vue
...
Bumps [@codemirror/view](https://github.com/codemirror/view ) from 6.22.2 to 6.23.1.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/view/compare/6.22.2...6.23.1 )
---
updated-dependencies:
- dependency-name: "@codemirror/view"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-01 00:28:43 +00:00
dependabot[bot]
f87fe43796
Bump webpack-bundle-tracker from 1.8.1 to 3.0.1 in /vue
...
Bumps [webpack-bundle-tracker](https://github.com/django-webpack/webpack-bundle-tracker ) from 1.8.1 to 3.0.1.
- [Release notes](https://github.com/django-webpack/webpack-bundle-tracker/releases )
- [Commits](https://github.com/django-webpack/webpack-bundle-tracker/compare/1.8.1...v3.0.1 )
---
updated-dependencies:
- dependency-name: webpack-bundle-tracker
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-01 00:28:22 +00:00
dependabot[bot]
b46809155a
Bump pinia from 2.1.6 to 2.1.7 in /vue
...
Bumps [pinia](https://github.com/vuejs/pinia ) from 2.1.6 to 2.1.7.
- [Release notes](https://github.com/vuejs/pinia/releases )
- [Commits](https://github.com/vuejs/pinia/compare/pinia@2.1.6...pinia@2.1.7 )
---
updated-dependencies:
- dependency-name: pinia
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-01 00:28:00 +00:00
dependabot[bot]
30d69432ff
Bump axios from 1.6.0 to 1.6.7 in /vue
...
Bumps [axios](https://github.com/axios/axios ) from 1.6.0 to 1.6.7.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v1.6.0...v1.6.7 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-01 00:27:48 +00:00
vabene1111
6ccd74edab
Merge branch 'develop' into feature/shopping-ui
2024-01-29 10:29:48 +01:00
Mikhail Epifanov
1ad5f4843f
Merge branch 'develop' into CiPipelineImprovements
2024-01-29 09:49:39 +01:00
Mikhail Epifanov
971b58ccb0
add caching and test export
2024-01-29 09:48:19 +01:00
vabene1111
1d236998d2
Merge pull request #2909 from tomtjes/fixes-for-beta
...
fix description scroll
2024-01-29 09:06:49 +01:00
vabene1111
77f81523d0
lmiit SLE endpoint and always fitler for recent days
2024-01-29 09:02:11 +01:00
vabene1111
aac729a3a0
fixed firefox
2024-01-29 08:46:34 +01:00
vabene1111
ee7cdacc40
cleared TODOs
2024-01-29 08:41:02 +01:00
