Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit ba1f10c Merge: 4e0cc34 ef4ce62 Author: vabene1111 <[email protected]> Date: Tue Jan 18 07:59:32 2022 +0100 Merge branch 'develop' into facet-fix commit 4e0cc34 Author: smilerz <[email protected]> Date: Mon Jan 17 17:18:43 2022 -0600 better fix for counting facets commit ef4ce62 Author: Kaibu <[email protected]> Date: Mon Jan 17 23:48:57 2022 +0100 custom class selection for lookupinput comp commit b990462 Merge: c601419 5e34c6d Author: Kaibu <[email protected]> Date: Mon Jan 17 23:48:12 2022 +0100 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop commit 5e34c6d Merge: 532d32c d8d76ae Author: vabene1111 <[email protected]> Date: Mon Jan 17 23:29:49 2022 +0100 Merge pull request TandoorRecipes#1353 from smilerz/supermarket-category fix missing label on first supermarket category commit d8d76ae Author: smilerz <[email protected]> Date: Mon Jan 17 16:12:54 2022 -0600 fix missing label supermarket category commit c601419 Author: Kaibu <[email protected]> Date: Mon Jan 17 23:02:42 2022 +0100 shopping list ux improvements commit 532d32c Author: vabene1111 <[email protected]> Date: Mon Jan 17 22:41:38 2022 +0100 fixed shopping user save setting would not work commit 54721a0 Author: vabene1111 <[email protected]> Date: Mon Jan 17 22:37:14 2022 +0100 also added space to bot commit c279335 Author: vabene1111 <[email protected]> Date: Mon Jan 17 22:28:02 2022 +0100 fixed order of delete commit d04e951 Author: vabene1111 <[email protected]> Date: Mon Jan 17 22:13:36 2022 +0100 fixed telegram shopping bot commit b9065f7 Author: vabene1111 <[email protected]> Date: Mon Jan 17 22:03:57 2022 +0100 added space deletion feature commit c8c29e1 Author: vabene1111 <[email protected]> Date: Mon Jan 17 21:14:22 2022 +0100 fixed performance issue commit 5724ef9 Author: smilerz <[email protected]> Date: Mon Jan 17 14:02:58 2022 -0600 fix boolean directive commit 2595a26 Merge: e1c7305 4372964 Author: vabene1111 <[email protected]> Date: Mon Jan 17 20:26:02 2022 +0100 Merge pull request TandoorRecipes#1351 from MaxJa4/patch-1 Add hint about trailing slashes for subpath setups commit e1c7305 Author: vabene1111 <[email protected]> Date: Mon Jan 17 20:22:37 2022 +0100 switcher basically working again commit 418c384 Merge: 90b6f9a cc5be84 Author: vabene1111 <[email protected]> Date: Mon Jan 17 20:15:01 2022 +0100 Merge pull request TandoorRecipes#1352 from smilerz/fix-search force list params to list commit cc5be84 Author: smilerz <[email protected]> Date: Mon Jan 17 13:13:26 2022 -0600 force list params to list commit 90b6f9a Author: vabene1111 <[email protected]> Date: Mon Jan 17 19:54:16 2022 +0100 fixed sub recipe issue commit 4372964 Author: MaxJa4 <[email protected]> Date: Mon Jan 17 18:43:14 2022 +0100 Update .env.template commit a8c885b Author: MaxJa4 <[email protected]> Date: Mon Jan 17 18:41:41 2022 +0100 Remove newline at the end commit a539d14 Author: vabene1111 <[email protected]> Date: Mon Jan 17 18:15:23 2022 +0100 wip switcher commit 2b0541b Author: MaxJa4 <[email protected]> Date: Mon Jan 17 18:05:39 2022 +0100 Add hint about trailing slashes for subpath setups Add hint about trailing slashes for subpath setups due to recent issue on Discord. commit 3f53a92 Merge: d231588 0ed9100 Author: vabene1111 <[email protected]> Date: Mon Jan 17 18:01:47 2022 +0100 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop commit 0ed9100 Merge: d2b796d 85ecac3 Author: vabene1111 <[email protected]> Date: Mon Jan 17 17:59:19 2022 +0100 Merge pull request TandoorRecipes#1350 from TandoorRecipes/patch-empty-recipe_list Update recipe_search.py commit d231588 Author: vabene1111 <[email protected]> Date: Mon Jan 17 17:58:09 2022 +0100 Revert "temporarily disable recipe switcher" This reverts commit d2b796d. commit d2b796d Author: vabene1111 <[email protected]> Date: Mon Jan 17 17:58:04 2022 +0100 temporarily disable recipe switcher commit 8b1e80e Author: vabene1111 <[email protected]> Date: Mon Jan 17 17:51:29 2022 +0100 wip commit 85ecac3 Author: smilerz <[email protected]> Date: Mon Jan 17 10:10:38 2022 -0600 Update recipe_search.py commit e0b8d6f Author: vabene1111 <[email protected]> Date: Mon Jan 17 17:00:08 2022 +0100 added exception catch to nextcloud importer to handle empty folders in sync commit edd4787 Author: vabene1111 <[email protected]> Date: Mon Jan 17 16:51:04 2022 +0100 fixed signup button and autofocus on user input fields commit c14dd04 Merge: a376728 769365d Author: vabene1111 <[email protected]> Date: Mon Jan 17 16:50:36 2022 +0100 Merge pull request TandoorRecipes#1348 from smilerz/fuzzy_search Fuzzy search commit 769365d Merge: ddb9e70 30421d0 Author: smilerz <[email protected]> Date: Mon Jan 17 09:46:33 2022 -0600 Merge branch 'fuzzy_search' of github.com:smilerz/recipes into fuzzy_search commit ddb9e70 Author: smilerz <[email protected]> Date: Mon Jan 17 09:46:26 2022 -0600 fix url_import commit a376728 Author: vabene1111 <[email protected]> Date: Mon Jan 17 16:29:29 2022 +0100 fixed keyword creation in exporter TandoorRecipes#1213 commit 306f90a Author: vabene1111 <[email protected]> Date: Mon Jan 17 16:27:10 2022 +0100 recipe editor decimal fixes commit a19ad70 Merge: 4af6de7 8f3044d Author: vabene1111 <[email protected]> Date: Mon Jan 17 16:22:18 2022 +0100 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop commit 4af6de7 Author: vabene1111 <[email protected]> Date: Mon Jan 17 16:22:11 2022 +0100 Revert "Merge pull request TandoorRecipes#1280 from MarcusWolschon/feature1275_readable_export_file_names" This reverts commit c4f40b9, reversing changes made to 93b868b. commit 8f3044d Merge: 7c5ffda 51620a3 Author: vabene1111 <[email protected]> Date: Mon Jan 17 16:04:40 2022 +0100 Merge pull request TandoorRecipes#1316 from tomtjes/docs-swag-example add swag config example commit 7c5ffda Merge: d3b71e4 30421d0 Author: vabene1111 <[email protected]> Date: Mon Jan 17 15:51:54 2022 +0100 Merge pull request TandoorRecipes#1347 from smilerz/fuzzy_search Fuzzy search commit 30421d0 Merge: dde350c d3b71e4 Author: vabene1111 <[email protected]> Date: Mon Jan 17 15:51:23 2022 +0100 Merge branch 'develop' into fuzzy_search commit d3b71e4 Author: vabene1111 <[email protected]> Date: Mon Jan 17 15:43:35 2022 +0100 cleand up context menu code commit 1a84a8f Merge: 16cb99f 934eeee Author: vabene1111 <[email protected]> Date: Mon Jan 17 15:39:11 2022 +0100 Merge pull request TandoorRecipes#1289 from MarcusWolschon/features/1093_recipe_link_in_plan commit 16cb99f Merge: a451f72 f07690d Author: vabene1111 <[email protected]> Date: Mon Jan 17 15:37:48 2022 +0100 Merge pull request TandoorRecipes#1317 from mheiland/patch-1 Example for third-party authentication commit a451f72 Merge: f12196d 99b3ed8 Author: vabene1111 <[email protected]> Date: Mon Jan 17 15:35:43 2022 +0100 Merge pull request TandoorRecipes#1327 from tomtjes/docs-faq-amendments FAQ amendments commit dde350c Author: smilerz <[email protected]> Date: Mon Jan 17 08:35:19 2022 -0600 prettier cleanup commit f12196d Merge: d4242a2 b3e971f Author: vabene1111 <[email protected]> Date: Mon Jan 17 15:20:45 2022 +0100 Merge pull request TandoorRecipes#1343 from MatthiasLohr/feature/db-url-path Allow to specify an actual path using DATABASE_URL commit d4242a2 Merge: 0c603e3 8a7c4e1 Author: vabene1111 <[email protected]> Date: Mon Jan 17 15:16:37 2022 +0100 Merge branch 'master' into develop commit 8a7c4e1 Author: vabene1111 <[email protected]> Date: Mon Jan 17 15:16:13 2022 +0100 fixed invite link counting commit 745bb58 Author: vabene1111 <[email protected]> Date: Sun Jan 9 18:25:38 2022 +0100 fixed valid filter on invite link counter commit b3e971f Author: Matthias Lohr <[email protected]> Date: Mon Jan 17 11:21:36 2022 +0100 allow to specify an actual path using DATABASE_URL commit 0c603e3 Author: Oliver Cervera <[email protected]> Date: Sun Jan 16 15:21:49 2022 +0000 Translated using Weblate (Italian) Currently translated at 84.1% (239 of 284 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/ commit fed9cfe Author: Oliver Cervera <[email protected]> Date: Sun Jan 16 15:44:28 2022 +0000 Translated using Weblate (Italian) Currently translated at 96.6% (492 of 509 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/ commit 5a65fd2 Merge: c2a763f 24e4249 Author: vabene1111 <[email protected]> Date: Sun Jan 16 17:29:35 2022 +0100 Merge pull request TandoorRecipes#1331 from TandoorRecipes/dependabot/npm_and_yarn/vue/follow-redirects-1.14.7 Bump follow-redirects from 1.14.6 to 1.14.7 in /vue commit c2a763f Author: SMunos <[email protected]> Date: Fri Jan 14 23:19:21 2022 +0000 Translated using Weblate (French) Currently translated at 100.0% (284 of 284 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/ commit 528767a Author: Josselin du PLESSIS <[email protected]> Date: Fri Jan 14 23:20:10 2022 +0000 Translated using Weblate (French) Currently translated at 100.0% (284 of 284 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/ commit 9b182f6 Author: 糖多 <[email protected]> Date: Sat Jan 15 06:09:40 2022 +0000 Translated using Weblate (Chinese (Simplified)) Currently translated at 32.0% (91 of 284 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/ commit 968b710 Author: 糖多 <[email protected]> Date: Sat Jan 15 06:19:48 2022 +0000 Translated using Weblate (Chinese (Simplified)) Currently translated at 28.6% (146 of 509 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/ commit f11e07d Author: Josselin du PLESSIS <[email protected]> Date: Fri Jan 14 23:23:05 2022 +0000 Translated using Weblate (French) Currently translated at 100.0% (509 of 509 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/ commit 24e4249 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun Jan 16 01:02:54 2022 +0000 Bump follow-redirects from 1.14.6 to 1.14.7 in /vue Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.7. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.14.6...v1.14.7) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> commit 9da496c Merge: 8cebc98 9221533 Author: vabene1111 <[email protected]> Date: Sat Jan 15 21:46:04 2022 +0100 Merge pull request TandoorRecipes#1323 from MaxJa4/patch-1 Added Apache2 in the bug report template commit 99b3ed8 Author: tomtjes <[email protected]> Date: Sat Jan 15 13:58:40 2022 -0500 add FAQ for PWA commit 281535e Author: tomtjes <[email protected]> Date: Sat Jan 15 13:57:20 2022 -0500 phrase FAQ as questions commit 9221533 Author: MaxJa4 <[email protected]> Date: Sat Jan 15 12:56:01 2022 +0100 Added Apache2 in the bug report template Added Apache2 as selectable option in the bug report template commit f07690d Author: mheiland <[email protected]> Date: Sat Jan 15 00:24:56 2022 +0100 Example for third-party authentication Providing an example to integrate Keycloak as IAM for Tandoor. Hinting that both SOCIAL* variables are required. commit 8cebc98 Author: SMunos <[email protected]> Date: Fri Jan 14 23:18:38 2022 +0000 Translated using Weblate (French) Currently translated at 100.0% (284 of 284 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/ commit 965d2c0 Author: FrenchAnon <[email protected]> Date: Fri Jan 14 23:17:50 2022 +0000 Translated using Weblate (French) Currently translated at 100.0% (284 of 284 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/ commit 17ad01a Author: Josselin du PLESSIS <[email protected]> Date: Fri Jan 14 22:42:42 2022 +0000 Translated using Weblate (French) Currently translated at 100.0% (284 of 284 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/ commit 51620a3 Author: tomtjes <[email protected]> Date: Fri Jan 14 15:10:22 2022 -0500 add swag config example commit 91fcb1b Author: Tomasz Klimczak <[email protected]> Date: Thu Jan 6 12:50:29 2022 +0000 Translated using Weblate (Polish) Currently translated at 80.9% (225 of 278 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/ commit 01d5ab9 Author: Tiago Rascazzi <[email protected]> Date: Thu Jan 6 16:30:49 2022 +0000 Translated using Weblate (French) Currently translated at 72.6% (202 of 278 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/ commit 79c8d26 Merge: 9486b08 0e1153c Author: vabene1111 <[email protected]> Date: Fri Jan 14 17:18:30 2022 +0100 Merge pull request TandoorRecipes#1311 from smilerz/patch-2 fix bug creating food with create form commit 9486b08 Merge: d36033a ffa9186 Author: vabene1111 <[email protected]> Date: Fri Jan 14 16:57:10 2022 +0100 Merge pull request TandoorRecipes#1309 from MaxJa4/develop Disabled old issue templates and added new ones with new GitHub issues format commit 934eeee Author: Marcus Wolschon <[email protected]> Date: Fri Jan 14 13:56:46 2022 +0100 commit 2927333 Author: Marcus Wolschon <[email protected]> Date: Fri Jan 14 13:52:42 2022 +0100 commit 0e1153c Author: smilerz <[email protected]> Date: Thu Jan 13 17:40:26 2022 -0600 deleted extraneous emit commit b3f05b0 Author: smilerz <[email protected]> Date: Thu Jan 13 16:50:15 2022 -0600 fix bug creating food with create form commit ffa9186 Author: Maximilian Jannack <[email protected]> Date: Thu Jan 13 21:26:15 2022 +0100 Added config.yml for FAQ link commit cf2d33d Author: Maximilian Jannack <[email protected]> Date: Thu Jan 13 21:17:08 2022 +0100 Disabled old issue templates and added new ones with new GitHub issues format commit 8f08ba7 Author: Marcus Wolschon <[email protected]> Date: Wed Jan 12 16:15:55 2022 +0100 commit 8a4f35e Author: Marcus Wolschon <[email protected]> Date: Wed Jan 12 11:37:08 2022 +0100
- Loading branch information