Commit Graph

5867 Commits

Author SHA1 Message Date
d0cbe350a7 Adds psuedo selectors to increase touch target 2024-01-03 22:38:38 +00:00
b6d4c4c3b8 Merge branch 'develop' into beta 2024-01-03 15:13:51 +01:00
30f3a697f0 fixed space theme defaults in model 2024-01-03 15:13:39 +01:00
964afd5f73 fixed migration tree 2024-01-03 15:13:31 +01:00
1fa2186dd0 fixed space theme defaults in model 2024-01-03 15:13:24 +01:00
146e97c8ec Merge branch 'develop' into feature/shopping-ui
# Conflicts:
#	vue/src/locales/en.json
2024-01-03 15:09:30 +01:00
42ced25e10 improved settings override message 2024-01-03 15:05:44 +01:00
6011cf359f Merge pull request #2853 from AquaticLava/Auto-Planner
Auto planner bug fix
2024-01-03 14:37:37 +01:00
f57acc412b Merge remote-tracking branch 'origin/Auto-Planner' into Auto-Planner 2024-01-02 18:44:39 -07:00
200cacb9ac changed keywords to be index based. 2024-01-02 18:44:23 -07:00
5c89173373 changed random recipe to be index based. 2024-01-02 18:43:22 -07:00
61b67cd37a Merge remote-tracking branch 'origin/Auto-Planner' into Auto-Planner 2024-01-02 15:38:47 -07:00
12c2f2f7aa Merge branch 'develop' into beta 2024-01-01 22:14:27 +01:00
3d8b1d6ccb lots of theming related changes
- upload a custom logo for your space
    - space settings can override user settings for theming
    - spaces can upload custom CSS overrides
    - allow users to disable showing the tandoor/space logo
    - allow changing navigation background color to any color desired
    - allow switching navigation text color between dark/light (different effects depending on theme)
2024-01-01 22:14:01 +01:00
aa0d6b5a6b Translated using Weblate (Hebrew)
Currently translated at 95.3% (517 of 542 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/he/
2024-01-01 20:19:56 +00:00
64ed75156c Translated using Weblate (German)
Currently translated at 98.7% (535 of 542 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2024-01-01 20:19:56 +00:00
c6d41e8810 fixed migrations 200 and 204 2024-01-01 19:11:37 +01:00
2a10843101 compiled translations 2024-01-01 15:06:58 +01:00
f861b39d05 Merge pull request #2833 from luc-ass/develop
Fix truenas_portainer compose example/documentation
2024-01-01 14:55:28 +01:00
5c18c09944 Merge branch 'develop' into develop 2024-01-01 14:55:21 +01:00
1bd5f96029 Merge pull request #2792 from Sriyukthika26/my-contribution
Update truenas_portainer.md
2024-01-01 14:53:47 +01:00
988df4eb00 Merge pull request #2823 from smilerz/admin_updates
Admin updates
2024-01-01 14:53:01 +01:00
bf61b6474e fixed ingredient note field to high 2024-01-01 14:51:20 +01:00
c76f5d9482 starting work on new sync algorithm 2024-01-01 12:01:39 +01:00
bace2f7ba4 Bump github/codeql-action from 2 to 3
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 00:44:38 +00:00
0576337e9c Bump pillow from 10.0.1 to 10.1.0
Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.1 to 10.1.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.0.1...10.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 00:37:18 +00:00
be177cf258 Merge remote-tracking branch 'origin/Auto-Planner' into Auto-Planner 2023-12-31 11:20:06 -07:00
5059abc232 Translated using Weblate (Russian)
Currently translated at 63.4% (344 of 542 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/ru/
2023-12-30 15:19:57 +00:00
475ce44df9 move supermarket editing to store 2023-12-30 08:52:43 +01:00
492d266fbe dont show categories without entries 2023-12-30 08:13:13 +01:00
c695f0dacb update SLR servings UI 2023-12-30 07:59:27 +01:00
cb63bb2615 avoid recursion in ingredient.__str__ 2023-12-28 10:44:51 -06:00
7ca5a34b28 fixed recursion in Step.__str__() 2023-12-28 10:00:15 -06:00
57d87c899c total stats 2023-12-28 14:27:55 +01:00
e37f8b3a51 shoppig list structure statistics 2023-12-28 14:25:48 +01:00
df03818f45 fixed button hover effect 2023-12-28 14:03:50 +01:00
063c64d078 improvements to recipe tab 2023-12-28 00:19:12 +01:00
2c3e0b547b stuff and things 2023-12-27 23:20:31 +01:00
999e3794f5 info row settings 2023-12-27 23:04:01 +01:00
5e5caf201c shopping device settings 2023-12-27 22:39:45 +01:00
0ce4d45eeb sorting 2023-12-27 21:15:24 +01:00
0dacdcc72f paddings 2023-12-27 15:39:17 +01:00
629dfd5d52 configurable info row 2023-12-27 14:04:36 +01:00
20bc1c5c2a fixed deleting objects 2023-12-27 12:01:13 +01:00
d3376b33d8 new datastructure 2023-12-27 11:34:55 +01:00
a7ea7a8987 fix code block and replace tab with spaces 2023-12-27 10:43:56 +01:00
b0c561661b basic category chaning 2023-12-23 11:11:36 +01:00
ae3818611d fixed checking food always works 2023-12-23 08:46:42 +01:00
d1c4e51842 fixed popover header in dark theme 2023-12-23 08:46:31 +01:00
e6f7f07220 some things actually working 2023-12-22 23:31:28 +01:00