Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 5129ef7
Merge: deba961 8d4cb4f
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:41:00 2024 +0800

    Merge pull request TandoorRecipes#2715 from nyanSpruk/patch-1

    fix: Typo in shopping.md

commit deba961
Merge: 92cfd09 5a6a178
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:27:18 2024 +0800

    Merge pull request TandoorRecipes#2722 from swnf/bind-ipv6

    Make gunicorn and nginx listen to IPv6

commit 92cfd09
Merge: 14b7a8f 3adb4c5
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:24:54 2024 +0800

    Merge pull request TandoorRecipes#2785 from axeleroy/patch-1

    Add instructions to add the PWA on Firefox for Android

commit 14b7a8f
Merge: ab4bac0 8e0bc3a
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:21:30 2024 +0800

    Merge pull request TandoorRecipes#2866 from Colcothar/automation-doc-typo

    Fix typo in automation doc

commit ab4bac0
Merge: 838edc5 3140480
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:17:31 2024 +0800

    Merge pull request TandoorRecipes#2766 from TandoorRecipes/dependabot/pip/cryptography-41.0.7

    Bump cryptography from 41.0.6 to 41.0.7

commit 838edc5
Merge: 8910784 d131278
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:15:39 2024 +0800

    Merge pull request TandoorRecipes#2859 from harry48225/touchable-fix

    Touchable fix

commit 8910784
Merge: e951490 8f8147f
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:13:10 2024 +0800

    Merge pull request TandoorRecipes#2657 from TandoorRecipes/dependabot/npm_and_yarn/vue/workbox-background-sync-7.0.0

    Bump workbox-background-sync from 6.6.1 to 7.0.0 in /vue

commit e951490
Merge: 0d9e2a8 f826f93
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:13:00 2024 +0800

    Merge pull request TandoorRecipes#2526 from TandoorRecipes/dependabot/npm_and_yarn/vue/workbox-window-7.0.0

    Bump workbox-window from 6.6.1 to 7.0.0 in /vue

commit 0d9e2a8
Merge: e3445c4 bace2f7
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:09:35 2024 +0800

    Merge pull request TandoorRecipes#2850 from TandoorRecipes/dependabot/github_actions/github/codeql-action-3

    Bump github/codeql-action from 2 to 3

commit e3445c4
Merge: 1aa68f1 ccdd678
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:09:13 2024 +0800

    Merge pull request TandoorRecipes#2849 from TandoorRecipes/dependabot/github_actions/actions/setup-python-5

    Bump actions/setup-python from 4 to 5

commit 1aa68f1
Merge: a3a2812 4e05bc2
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:08:29 2024 +0800

    Merge pull request TandoorRecipes#2658 from TandoorRecipes/dependabot/npm_and_yarn/vue/workbox-routing-7.0.0

    Bump workbox-routing from 6.6.1 to 7.0.0 in /vue

commit ccdd678
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Jan 19 09:02:56 2024 +0000

    Bump actions/setup-python from 4 to 5

    Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
    - [Release notes](https://github.com/actions/setup-python/releases)
    - [Commits](actions/setup-python@v4...v5)

    ---
    updated-dependencies:
    - dependency-name: actions/setup-python
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit a3a2812
Merge: 8ef343c 537276c
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:02:07 2024 +0800

    Merge pull request TandoorRecipes#2713 from TandoorRecipes/dependabot/github_actions/actions/checkout-4

    Bump actions/checkout from 3 to 4

commit 8ef343c
Merge: e38b784 2397c66
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:01:39 2024 +0800

    Merge pull request TandoorRecipes#2527 from TandoorRecipes/dependabot/npm_and_yarn/vue/workbox-navigation-preload-7.0.0

    Bump workbox-navigation-preload from 6.6.1 to 7.0.0 in /vue

commit e38b784
Merge: 90eba29 f168fb8
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 17:01:21 2024 +0800

    Merge pull request TandoorRecipes#2712 from TandoorRecipes/dependabot/github_actions/actions/setup-node-4

    Bump actions/setup-node from 3 to 4

commit 90eba29
Merge: 1a262ef 52cd588
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 16:58:52 2024 +0800

    Merge pull request TandoorRecipes#2765 from TandoorRecipes/dependabot/pip/django-storages-1.14.2

    Bump django-storages from 1.13.2 to 1.14.2

commit 1a262ef
Merge: 06ce360 517e465
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 16:58:35 2024 +0800

    Merge pull request TandoorRecipes#2764 from TandoorRecipes/dependabot/pip/pytest-factoryboy-2.6.0

    Bump pytest-factoryboy from 2.5.1 to 2.6.0

commit 06ce360
Merge: 0584fc3 8c87e0a
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 16:58:14 2024 +0800

    Merge pull request TandoorRecipes#2767 from TandoorRecipes/dependabot/pip/django-autocomplete-light-3.9.7

    Bump django-autocomplete-light from 3.9.4 to 3.9.7

commit 0584fc3
Merge: b430476 0576337
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 16:57:47 2024 +0800

    Merge pull request TandoorRecipes#2848 from TandoorRecipes/dependabot/pip/pillow-10.1.0

    Bump pillow from 10.0.1 to 10.1.0

commit b430476
Merge: 72d4404 8ec8d98
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 16:56:32 2024 +0800

    Merge pull request TandoorRecipes#2884 from ebwinters/ebwinters/fix_mobile_weeks

    Fix next/prev week on mobile meal plan

commit 72d4404
Merge: 0c94cf1 d6d8067
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 16:53:58 2024 +0800

    Merge pull request TandoorRecipes#2887 from adjokic/patch-1

    Add documenation for Docker + Apache + Subfolder

commit 0c94cf1
Merge: 1673254 da49b6b
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 16:44:06 2024 +0800

    Merge pull request TandoorRecipes#2870 from TandoorRecipes/dependabot/npm_and_yarn/vue/follow-redirects-1.15.4

    Bump follow-redirects from 1.15.2 to 1.15.4 in /vue

commit 1673254
Merge: 0493ef7 45f0413
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 16:43:50 2024 +0800

    Merge pull request TandoorRecipes#2873 from TandoorRecipes/dependabot/pip/jinja2-3.1.3

    Bump jinja2 from 3.1.2 to 3.1.3

commit 0493ef7
Merge: 1fd6a47 38c464e
Author: vabene1111 <[email protected]>
Date:   Fri Jan 19 16:13:28 2024 +0800

    Merge pull request TandoorRecipes#2872 from FaySmash/patch-1

    Improved the understandability of the postgres upgrade steps

commit 1fd6a47
Author: Tomasz Klimczak <[email protected]>
Date:   Tue Jan 16 23:44:06 2024 +0000

    Translated using Weblate (Polish)

    Currently translated at 100.0% (554 of 554 strings)

    Translation: Tandoor/Recipes Frontend
    Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/

commit d6d8067
Author: adjokic <[email protected]>
Date:   Tue Jan 16 21:58:21 2024 -0600

    Add documenation for Docker + Apache + Subfolder

commit bb52f89
Author: vabene1111 <[email protected]>
Date:   Mon Jan 15 07:41:51 2024 +0800

    added max spaces per user + added custom app name + fixed theming tests

commit 8ec8d98
Author: [email protected] <[email protected]>
Date:   Sun Jan 14 12:29:00 2024 -0800

    fix mobile arrows

commit 35eff63
Author: vabene1111 <[email protected]>
Date:   Sun Jan 14 15:39:02 2024 +0800

    updated theming tests

commit 8d90fad
Author: vabene1111 <[email protected]>
Date:   Sun Jan 14 15:33:14 2024 +0800

    fixed theming breaking for users without space

commit 2ba2b97
Author: vabene1111 <[email protected]>
Date:   Sun Jan 14 08:40:05 2024 +0800

    moved manifest to use main theming function

commit 26408c3
Author: vabene1111 <[email protected]>
Date:   Sat Jan 13 07:42:54 2024 +0800

    removed debug code

commit 72b0bd7
Author: Cilantro4858 <[email protected]>
Date:   Fri Jan 12 20:35:43 2024 +0000

    Translated using Weblate (German)

    Currently translated at 100.0% (554 of 554 strings)

    Translation: Tandoor/Recipes Frontend
    Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/

commit 45f0413
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Jan 11 19:51:57 2024 +0000

    Bump jinja2 from 3.1.2 to 3.1.3

    Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3.
    - [Release notes](https://github.com/pallets/jinja/releases)
    - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
    - [Commits](pallets/jinja@3.1.2...3.1.3)

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

    Signed-off-by: dependabot[bot] <[email protected]>

commit 38c464e
Author: FaySmash <[email protected]>
Date:   Thu Jan 11 17:56:45 2024 +0100

    Improved the understandability of the postgres upgrade steps

    I improved the understandability some parts in the psql examples for someone not familiar with the psql syntax.

commit b4f158b
Author: Jan Kubošek <[email protected]>
Date:   Wed Jan 10 00:54:20 2024 +0000

    Translated using Weblate (Czech)

    Currently translated at 100.0% (554 of 554 strings)

    Translation: Tandoor/Recipes Frontend
    Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/cs/

commit da49b6b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Jan 10 08:50:00 2024 +0000

    Bump follow-redirects from 1.15.2 to 1.15.4 in /vue

    Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
    - [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
    - [Commits](follow-redirects/follow-redirects@v1.15.2...v1.15.4)

    ---
    updated-dependencies:
    - dependency-name: follow-redirects
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit e7d9d7b
Author: Jan Kubošek <[email protected]>
Date:   Tue Jan 9 19:47:05 2024 +0000

    Translated using Weblate (Czech)

    Currently translated at 100.0% (554 of 554 strings)

    Translation: Tandoor/Recipes Frontend
    Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/cs/

commit 5f7a57a
Author: Mára Štěpánek <[email protected]>
Date:   Tue Jan 9 12:11:51 2024 +0000

    Translated using Weblate (Czech)

    Currently translated at 92.0% (510 of 554 strings)

    Translation: Tandoor/Recipes Frontend
    Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/cs/

commit 4b1a80a
Author: Jan Kubošek <[email protected]>
Date:   Tue Jan 9 17:38:44 2024 +0000

    Translated using Weblate (Czech)

    Currently translated at 92.0% (510 of 554 strings)

    Translation: Tandoor/Recipes Frontend
    Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/cs/

commit 8efc3de
Author: Mára Štěpánek <[email protected]>
Date:   Tue Jan 9 11:45:32 2024 +0000

    Translated using Weblate (Czech)

    Currently translated at 90.5% (491 of 542 strings)

    Translation: Tandoor/Recipes Frontend
    Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/cs/

commit 1f3cd11
Author: Jan Kubošek <[email protected]>
Date:   Tue Jan 9 11:48:39 2024 +0000

    Translated using Weblate (Czech)

    Currently translated at 90.5% (491 of 542 strings)

    Translation: Tandoor/Recipes Frontend
    Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/cs/

commit 94cfc36
Author: Jan Kubošek <[email protected]>
Date:   Tue Jan 9 11:04:57 2024 +0000

    Translated using Weblate (Czech)

    Currently translated at 100.0% (362 of 362 strings)

    Translation: Tandoor/Recipes Backend
    Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/cs/

commit 8e0bc3a
Author: Colcothar <[email protected]>
Date:   Sat Jan 6 17:29:43 2024 +0000

    Fix typo in automation doc

commit d131278
Author: harry <[email protected]>
Date:   Wed Jan 3 22:38:10 2024 +0000

    Tweak alignment

commit d0cbe35
Author: harry <[email protected]>
Date:   Wed Nov 15 20:35:12 2023 +0000

    Adds psuedo selectors to increase touch target

commit bace2f7
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Jan 1 00:44:38 2024 +0000

    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](github/codeql-action@v2...v3)

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

    Signed-off-by: dependabot[bot] <[email protected]>

commit 0576337
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Jan 1 00:37:18 2024 +0000

    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](python-pillow/Pillow@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] <[email protected]>

commit 3adb4c5
Author: Axel Leroy <[email protected]>
Date:   Wed Dec 6 10:00:48 2023 +0100

    Add instructions to add the PWA on Firefox for Android

commit 8c87e0a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Dec 1 00:59:22 2023 +0000

    Bump django-autocomplete-light from 3.9.4 to 3.9.7

    Bumps [django-autocomplete-light](https://github.com/yourlabs/django-autocomplete-light) from 3.9.4 to 3.9.7.
    - [Release notes](https://github.com/yourlabs/django-autocomplete-light/releases)
    - [Changelog](https://github.com/yourlabs/django-autocomplete-light/blob/master/CHANGELOG)
    - [Commits](yourlabs/django-autocomplete-light@3.9.4...3.9.7)

    ---
    updated-dependencies:
    - dependency-name: django-autocomplete-light
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 3140480
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Dec 1 00:59:18 2023 +0000

    Bump cryptography from 41.0.6 to 41.0.7

    Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.6 to 41.0.7.
    - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
    - [Commits](pyca/cryptography@41.0.6...41.0.7)

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

    Signed-off-by: dependabot[bot] <[email protected]>

commit 52cd588
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Dec 1 00:59:13 2023 +0000

    Bump django-storages from 1.13.2 to 1.14.2

    Bumps [django-storages](https://github.com/jschneier/django-storages) from 1.13.2 to 1.14.2.
    - [Changelog](https://github.com/jschneier/django-storages/blob/master/CHANGELOG.rst)
    - [Commits](jschneier/django-storages@1.13.2...1.14.2)

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

    Signed-off-by: dependabot[bot] <[email protected]>

commit 517e465
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Dec 1 00:59:10 2023 +0000

    Bump pytest-factoryboy from 2.5.1 to 2.6.0

    Bumps [pytest-factoryboy](https://github.com/pytest-dev/pytest-factoryboy) from 2.5.1 to 2.6.0.
    - [Changelog](https://github.com/pytest-dev/pytest-factoryboy/blob/master/CHANGES.rst)
    - [Commits](pytest-dev/pytest-factoryboy@2.5.1...2.6.0)

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

    Signed-off-by: dependabot[bot] <[email protected]>

commit 5a6a178
Author: swnf <[email protected]>
Date:   Mon Nov 6 18:01:53 2023 +0100

    Make gunicorn and nginx listen to IPv6

commit 8d4cb4f
Author: Nik Jan Špruk <[email protected]>
Date:   Thu Nov 2 12:36:20 2023 +0100

    fix: Typo in shopping.md

    Made capital i in the sentence.

commit 537276c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Nov 1 00:40:31 2023 +0000

    Bump actions/checkout from 3 to 4

    Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@v3...v4)

    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit f168fb8
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Nov 1 00:40:27 2023 +0000

    Bump actions/setup-node from 3 to 4

    Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
    - [Release notes](https://github.com/actions/setup-node/releases)
    - [Commits](actions/setup-node@v3...v4)

    ---
    updated-dependencies:
    - dependency-name: actions/setup-node
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 4e05bc2
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sun Oct 1 00:49:42 2023 +0000

    Bump workbox-routing from 6.6.1 to 7.0.0 in /vue

    Bumps [workbox-routing](https://github.com/googlechrome/workbox) from 6.6.1 to 7.0.0.
    - [Release notes](https://github.com/googlechrome/workbox/releases)
    - [Commits](https://github.com/googlechrome/workbox/commits/v7.0.0)

    ---
    updated-dependencies:
    - dependency-name: workbox-routing
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 8f8147f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sun Oct 1 00:49:08 2023 +0000

    Bump workbox-background-sync from 6.6.1 to 7.0.0 in /vue

    Bumps [workbox-background-sync](https://github.com/googlechrome/workbox) from 6.6.1 to 7.0.0.
    - [Release notes](https://github.com/googlechrome/workbox/releases)
    - [Commits](https://github.com/googlechrome/workbox/commits/v7.0.0)

    ---
    updated-dependencies:
    - dependency-name: workbox-background-sync
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 2397c66
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Jul 1 00:05:24 2023 +0000

    Bump workbox-navigation-preload from 6.6.1 to 7.0.0 in /vue

    Bumps [workbox-navigation-preload](https://github.com/googlechrome/workbox) from 6.6.1 to 7.0.0.
    - [Release notes](https://github.com/googlechrome/workbox/releases)
    - [Commits](https://github.com/googlechrome/workbox/commits/v7.0.0)

    ---
    updated-dependencies:
    - dependency-name: workbox-navigation-preload
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit f826f93
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Jul 1 00:04:56 2023 +0000

    Bump workbox-window from 6.6.1 to 7.0.0 in /vue

    Bumps [workbox-window](https://github.com/googlechrome/workbox) from 6.6.1 to 7.0.0.
    - [Release notes](https://github.com/googlechrome/workbox/releases)
    - [Commits](https://github.com/googlechrome/workbox/commits/v7.0.0)

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

    Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
@smilerz
smilerz committed Jan 19, 2024
1 parent a1f7698 commit 6128cac
Show file tree
Hide file tree
Showing 24 changed files with 520 additions and 140 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
python-version: ['3.10']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
# Build Vue frontend
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
- name: Install Vue dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
if: github.repository_owner == 'TandoorRecipes' && ${{ github.event.workflow_run.conclusion == 'success' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- run: pip install mkdocs-material mkdocs-include-markdown-plugin
Expand Down
2 changes: 1 addition & 1 deletion boot.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ echo "Done"

chmod -R 755 /opt/recipes/mediafiles

exec gunicorn -b :$TANDOOR_PORT --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi
exec gunicorn -b "[::]:$TANDOOR_PORT" --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi
8 changes: 4 additions & 4 deletions cookbook/locale/cs/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-02-09 18:01+0100\n"
"PO-Revision-Date: 2023-07-31 14:19+0000\n"
"Last-Translator: Mára Štěpánek <[email protected]>\n"
"PO-Revision-Date: 2024-01-09 12:07+0000\n"
"Last-Translator: Jan Kubošek <[email protected]>\n"
"Language-Team: Czech <http://translate.tandoor.dev/projects/tandoor/"
"recipes-backend/cs/>\n"
"Language: cs\n"
Expand Down Expand Up @@ -190,7 +190,7 @@ msgid ""
"Leave empty for dropbox and enter only base url for nextcloud "
"(<code>/remote.php/webdav/</code> is added automatically)"
msgstr ""
"Pro dropbox ponechejte nevyplňené pole. Pro nextcloud použijte pouze "
"Pro dropbox ponechejte nevyplněné pole. Pro nextcloud použijte pouze "
"základní url (<code>/remote.php/webdav/</code> bude přidán automaticky)."

#: .\cookbook\forms.py:263
Expand Down Expand Up @@ -529,7 +529,7 @@ msgstr "Dávková úprava receptu"

#: .\cookbook\templates\batch\edit.html:20
msgid "Add the specified keywords to all recipes containing a word"
msgstr "Přidat štítek ke všem receptům, které obsahují specifické slovo."
msgstr "Přidat štítek ke všem receptům, které obsahují specifické slovo"

#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:66
msgid "Sync"
Expand Down
23 changes: 23 additions & 0 deletions cookbook/migrations/0208_space_app_name_userpreference_max_owned_spaces.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 4.2.7 on 2024-01-14 23:06

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('cookbook', '0207_space_logo_color_128_space_logo_color_144_and_more'),
]

operations = [
migrations.AddField(
model_name='space',
name='app_name',
field=models.CharField(blank=True, max_length=40, null=True),
),
migrations.AddField(
model_name='userpreference',
name='max_owned_spaces',
field=models.IntegerField(default=100),
),
]
15 changes: 12 additions & 3 deletions cookbook/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from treebeard.mp_tree import MP_Node, MP_NodeManager

from recipes.settings import (COMMENT_PREF_DEFAULT, FRACTION_PREF_DEFAULT, KJ_PREF_DEFAULT,
SORT_TREE_BY_NAME, STICKY_NAV_PREF_DEFAULT)
SORT_TREE_BY_NAME, STICKY_NAV_PREF_DEFAULT, MAX_OWNED_SPACES_PREF_DEFAULT)


def get_user_display_name(self):
Expand Down Expand Up @@ -303,7 +303,7 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
nav_logo = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_nav_logo')
nav_bg_color = models.CharField(max_length=8, default='', blank=True, )
nav_text_color = models.CharField(max_length=16, choices=NAV_TEXT_COLORS, default=BLANK)

app_name = models.CharField(max_length=40, null=True, blank=True, )
logo_color_32 = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_logo_color_32')
logo_color_128 = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_logo_color_128')
logo_color_144 = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_logo_color_144')
Expand Down Expand Up @@ -424,7 +424,7 @@ class UserPreference(models.Model, PermissionModelMixin):
nav_text_color = models.CharField(max_length=16, choices=NAV_TEXT_COLORS, default=DARK)
nav_show_logo = models.BooleanField(default=True)
nav_sticky = models.BooleanField(default=STICKY_NAV_PREF_DEFAULT)

max_owned_spaces = models.IntegerField(default=MAX_OWNED_SPACES_PREF_DEFAULT)
default_unit = models.CharField(max_length=32, default='g')
use_fractions = models.BooleanField(default=FRACTION_PREF_DEFAULT)
use_kj = models.BooleanField(default=KJ_PREF_DEFAULT)
Expand All @@ -450,6 +450,15 @@ class UserPreference(models.Model, PermissionModelMixin):
created_at = models.DateTimeField(auto_now_add=True)
objects = ScopedManager(space='space')

def save(self, *args, **kwargs):
if not self.pk:
self.max_owned_spaces = MAX_OWNED_SPACES_PREF_DEFAULT
self.comments = COMMENT_PREF_DEFAULT
self.nav_sticky = STICKY_NAV_PREF_DEFAULT
self.use_kj = KJ_PREF_DEFAULT
self.use_fractions = FRACTION_PREF_DEFAULT

return super().save(*args, **kwargs)
def __str__(self):
return str(self.user)

Expand Down
51 changes: 27 additions & 24 deletions cookbook/templatetags/theming_tags.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@

@register.simple_tag
def theme_values(request):
return get_theming_values(request)


def get_theming_values(request):
space = None
if request.space:
if getattr(request,'space',None):
space = request.space
if not request.user.is_authenticated and UNAUTHENTICATED_THEME_FROM_SPACE > 0:
with scopes_disabled():
space = Space.objects.filter(id=UNAUTHENTICATED_THEME_FROM_SPACE).first()

return get_theming_values(space, request.user)


def get_theming_values(space, user):
themes = {
UserPreference.BOOTSTRAP: 'themes/bootstrap.min.css',
UserPreference.FLATLY: 'themes/flatly.min.css',
Expand All @@ -46,31 +46,34 @@ def get_theming_values(space, user):
'nav_bg_color': '#ddbf86',
'nav_text_class': 'navbar-light',
'sticky_nav': 'position: sticky; top: 0; left: 0; z-index: 1000;',
'app_name': 'Tandoor Recipes',
}


if user.is_authenticated:
if user.userpreference.theme in themes:
tv['theme'] = static(themes[user.userpreference.theme])
if user.userpreference.nav_bg_color:
tv['nav_bg_color'] = user.userpreference.nav_bg_color
if user.userpreference.nav_text_color and user.userpreference.nav_text_color in nav_text_type_mapping:
tv['nav_text_class'] = nav_text_type_mapping[user.userpreference.nav_text_color]
if not user.userpreference.nav_sticky:
if request.user.is_authenticated:
if request.user.userpreference.theme in themes:
tv['theme'] = static(themes[request.user.userpreference.theme])
if request.user.userpreference.nav_bg_color:
tv['nav_bg_color'] = request.user.userpreference.nav_bg_color
if request.user.userpreference.nav_text_color and request.user.userpreference.nav_text_color in nav_text_type_mapping:
tv['nav_text_class'] = nav_text_type_mapping[request.user.userpreference.nav_text_color]
if not request.user.userpreference.nav_sticky:
tv['sticky_nav'] = ''

if space:
for logo in list(tv.keys()):
if logo.startswith('logo_color_') and getattr(space, logo, None):
tv[logo] = getattr(space, logo).file.url
if space.custom_space_theme:
tv['custom_theme'] = space.custom_space_theme.file.url
if space.space_theme in themes:
tv['theme'] = static(themes[space.space_theme])
if space.nav_logo:
tv['nav_logo'] = space.nav_logo.file.url
if space.nav_bg_color:
tv['nav_bg_color'] = space.nav_bg_color
if space.nav_text_color and space.nav_text_color in nav_text_type_mapping:
tv['nav_text_class'] = nav_text_type_mapping[space.nav_text_color]

if space.custom_space_theme:
tv['custom_theme'] = space.custom_space_theme.file.url
if space.space_theme in themes:
tv['theme'] = static(themes[space.space_theme])
if space.nav_logo:
tv['nav_logo'] = space.nav_logo.file.url
if space.nav_bg_color:
tv['nav_bg_color'] = space.nav_bg_color
if space.nav_text_color and space.nav_text_color in nav_text_type_mapping:
tv['nav_text_class'] = nav_text_type_mapping[space.nav_text_color]
if space.app_name:
tv['app_name'] = space.app_name
return tv
68 changes: 50 additions & 18 deletions cookbook/tests/other/test_theming.py
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,68 @@
from django.contrib import auth
from django.templatetags.static import static
from django.test import RequestFactory
from django_scopes import scopes_disabled

from cookbook.models import Space, UserPreference, UserFile
from cookbook.templatetags.theming_tags import theme_values, get_theming_values


def test_theming_function(space_1, u1_s1):
user = auth.get_user(u1_s1)

# uf = UserFile.objects.create(name='test', space=space_1, created_by=user) #TODO add file tests
user = auth.get_user(u1_s1)
request = RequestFactory()
request.user = auth.get_user(u1_s1)
request.space = space_1

# defaults apply without setting anything (user preference is automatically created with these defaults)
assert get_theming_values(request)['theme'] == static('themes/tandoor.min.css')
assert get_theming_values(request)['nav_bg_color'] == '#ddbf86'
assert get_theming_values(request)['nav_text_class'] == 'navbar-light'
assert get_theming_values(request)['nav_logo'] == static('assets/brand_logo.png')
assert get_theming_values(request)['sticky_nav'] == 'position: sticky; top: 0; left: 0; z-index: 1000;'
assert get_theming_values(request)['app_name'] == 'Tandoor Recipes'

assert get_theming_values(space_1, user)['theme'] == static('themes/tandoor.min.css')
assert get_theming_values(space_1, user)['nav_bg_color'] == '#ddbf86'
assert get_theming_values(space_1, user)['nav_text_class'] == 'navbar-light'
assert get_theming_values(space_1, user)['nav_logo'] == static('assets/brand_logo.png')
assert get_theming_values(space_1, user)['sticky_nav'] == 'position: sticky; top: 0; left: 0; z-index: 1000;'
with scopes_disabled():
up = UserPreference.objects.filter(user=request.user).first()
up.theme = UserPreference.TANDOOR_DARK
up.nav_bg_color = '#ffffff'
up.nav_text_color = UserPreference.LIGHT
up.nav_sticky = False
up.save()

user.userpreference.theme = UserPreference.TANDOOR_DARK
user.userpreference.nav_bg_color = '#ffffff'
user.userpreference.nav_text_color = UserPreference.LIGHT
user.userpreference.nav_sticky = False
user.userpreference.save()
request = RequestFactory()
request.user = auth.get_user(u1_s1)
request.space = space_1

assert get_theming_values(space_1, user)['theme'] == static('themes/tandoor_dark.min.css')
assert get_theming_values(space_1, user)['nav_bg_color'] == '#ffffff'
assert get_theming_values(space_1, user)['nav_text_class'] == 'navbar-dark'
assert get_theming_values(space_1, user)['sticky_nav'] == ''
# user values apply if only those are present
assert get_theming_values(request)['theme'] == static('themes/tandoor_dark.min.css')
assert get_theming_values(request)['nav_bg_color'] == '#ffffff'
assert get_theming_values(request)['nav_text_class'] == 'navbar-dark'
assert get_theming_values(request)['sticky_nav'] == ''
assert get_theming_values(request)['app_name'] == 'Tandoor Recipes'

space_1.space_theme = Space.BOOTSTRAP
space_1.nav_bg_color = '#000000'
space_1.nav_text_color = UserPreference.DARK
space_1.app_name = 'test_app_name'
space_1.save()

assert get_theming_values(space_1, user)['theme'] == static('themes/bootstrap.min.css')
assert get_theming_values(space_1, user)['nav_bg_color'] == '#000000'
assert get_theming_values(space_1, user)['nav_text_class'] == 'navbar-light'
request = RequestFactory()
request.user = auth.get_user(u1_s1)
request.space = space_1

# space settings apply when set
assert get_theming_values(request)['theme'] == static('themes/bootstrap.min.css')
assert get_theming_values(request)['nav_bg_color'] == '#000000'
assert get_theming_values(request)['nav_text_class'] == 'navbar-light'
assert get_theming_values(request)['app_name'] == 'test_app_name'

user.userspace_set.all().delete()
request = RequestFactory()
request.user = auth.get_user(u1_s1)

# default user settings should apply when user has no space
assert get_theming_values(request)['nav_bg_color'] == '#ffffff'
assert get_theming_values(request)['nav_text_class'] == 'navbar-dark'
assert get_theming_values(request)['nav_logo'] == static('assets/brand_logo.png')
29 changes: 15 additions & 14 deletions cookbook/views/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from cookbook.models import (Comment, CookLog, InviteLink, SearchFields, SearchPreference,
ShareLink, Space, UserSpace, ViewLog)
from cookbook.tables import CookLogTable, ViewLogTable
from cookbook.templatetags.theming_tags import get_theming_values
from cookbook.version_info import VERSION_INFO
from recipes.settings import PLUGINS, BASE_DIR

Expand Down Expand Up @@ -78,6 +79,11 @@ def space_overview(request):
messages.add_message(request, messages.WARNING, _('This feature is not available in the demo version!'))
else:
if create_form.is_valid():
if Space.objects.filter(created_by=request.user).count() >= request.user.userpreference.max_owned_spaces:
messages.add_message(request, messages.ERROR,
_('You have the reached the maximum amount of spaces that can be owned by you.') + f' ({request.user.userpreference.max_owned_spaces})')
return HttpResponseRedirect(reverse('view_space_overview'))

created_space = Space.objects.create(
name=create_form.cleaned_data['name'],
created_by=request.user,
Expand Down Expand Up @@ -481,29 +487,24 @@ def report_share_abuse(request, token):


def web_manifest(request):
theme_values = get_theming_values(request)

icons = [
{"src": static("/assets/logo_color.svg"), "sizes": "any"},
{"src": static("/assets/logo_color144.png"), "type": "image/png", "sizes": "144x144"},
{"src": static("/assets/logo_color512.png"), "type": "image/png", "sizes": "512x512"}
{"src": theme_values['logo_color_svg'], "sizes": "any"},
{"src": theme_values['logo_color_144'], "type": "image/png", "sizes": "144x144"},
{"src": theme_values['logo_color_512'], "type": "image/png", "sizes": "512x512"}
]

if request.user.is_authenticated and getattr(request.space, 'logo_color_svg') and getattr(request.space, 'logo_color_144') and getattr(request.space, 'logo_color_512'):
icons = [
{"src": request.space.logo_color_svg.file.url, "sizes": "any"},
{"src": request.space.logo_color_144.file.url, "type": "image/png", "sizes": "144x144"},
{"src": request.space.logo_color_512.file.url, "type": "image/png", "sizes": "512x512"}
]

manifest_info = {
"name": "Tandoor Recipes",
"short_name": "Tandoor",
"name": theme_values['app_name'],
"short_name": theme_values['app_name'],
"description": _("Manage recipes, shopping list, meal plans and more."),
"icons": icons,
"start_url": "./search",
"background_color": "#ffcb76",
"background_color": theme_values['nav_bg_color'],
"display": "standalone",
"scope": ".",
"theme_color": "#ffcb76",
"theme_color": theme_values['nav_bg_color'],
"shortcuts": [
{
"name": _("Plan"),
Expand Down
9 changes: 6 additions & 3 deletions docs/faq.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ Tandoor can be installed as a progressive web app (PWA) on mobile and desktop de
#### Safari (iPhone/iPad)
Open Tandoor, click Safari's share button, select `Add to Home Screen`

### Chrome/Chromium
#### Chrome/Chromium
Open Tandoor, click the `add Tandoor to the home screen` message that pops up at the bottom of the screen

#### Firefox for Android
Open Tandoor, click on the `⋮` menu icon, then on `Install`

### Desktop browsers

#### Google Chrome
Expand Down Expand Up @@ -124,13 +127,13 @@ to your dream setup.
## How can I upgrade postgres (major versions)?
Postgres requires manual intervention when updating from one major version to another. The steps are roughly

1. use `pg_dumpall` to dump your database into SQL (for Docker `docker-compose exec -T <database_container_name> pg_dumpall -U <postgres_user_name> -f /path/to/dump.sql`)
1. use `pg_dumpall` to dump your database into SQL (for Docker `docker-compose exec -T <postgres_container_name> pg_dumpall -U <postgres_user_name> -f /path/to/dump.sql`)
2. stop the DB / down the container
3. move your postgres directory in order to keep it as a backup (e.g. `mv postgres postgres_old`)
4. update postgres to the new major version (for Docker just change the version number and pull)
5. start the db / up the container (do not start tandoor as it will automatically perform the database migrations which will conflict with loading the dump)
6. if not using docker, you might need to create the same postgres user you had in the old database
7. load the postgres dump (for Docker `'/usr/local/bin/docker-compose exec -T <database_container_name> psql -U <postgres_user_name> postgres < /path/to/dump.sql`)
7. load the postgres dump (for Docker `'/usr/local/bin/docker-compose exec -T <postgres_container_name> psql -U <postgres_user_name> <postgres_database_name> < /path/to/dump.sql`)

If anything fails, go back to the old postgres version and data directory and try again.

Expand Down
2 changes: 1 addition & 1 deletion docs/features/automation.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ In order to prevent denial of service attacks on the RegEx engine the number of
and the length of the inputs that are processed are limited. Those limits should never be reached
during normal usage.

## Instructtion Replace, Title Replace, Food Replace & Unit Replace
## Instruction Replace, Title Replace, Food Replace & Unit Replace

These work just like the Description Replace automation.
Instruction, Food and Unit Replace will run against every iteration of the object in a recipe during import.
Expand Down
Loading

0 comments on commit 6128cac

Please sign in to comment.