Commit Graph

694 Commits

Author SHA1 Message Date
2d7d160d1b download shopping list PDF 2021-12-15 12:37:03 -06:00
54ca8b2bd0 refresh shopping list when item is delayed 2021-12-15 12:37:03 -06:00
a972a757b2 WIP 2021-12-15 12:37:03 -06:00
7c0d1236c2 Fix after rebase 2021-12-15 12:37:03 -06:00
09b0dcb136 pre-merge 2021-12-15 12:37:03 -06:00
5b4867d172 undo move 2021-12-15 12:37:03 -06:00
d3d4c210c1 yarn build 2021-12-15 12:37:03 -06:00
6cffee57fe Fix after rebase 2021-12-15 12:36:33 -06:00
e229a70360 more fixes after rebase 2021-12-15 12:36:33 -06:00
099a5420d6 update migrations 2021-12-15 12:36:06 -06:00
5a9543b4d8 Fix after rebase 2021-12-15 12:36:06 -06:00
60d7e63da8 add to shopping from card context menu 2021-12-15 12:36:06 -06:00
867e2d4fbf add new unit/food from shopping list 2021-12-15 12:36:06 -06:00
757fa5e49c edit supermarket categories 2021-12-15 12:36:06 -06:00
8b682c33f3 related recipes included when adding mealplan to shopping list 2021-12-15 12:35:48 -06:00
7c6a7ef6a4 alpha shopping list 2021-12-15 12:35:48 -06:00
4c506750de autosync 2021-12-15 12:35:48 -06:00
b84d77be15 WIP 2021-12-15 12:35:48 -06:00
247dd30b20 fade-enter-active 2021-12-15 12:35:48 -06:00
5e4e203dfb shopping line item 2021-12-15 12:35:48 -06:00
79b6d4817e inheritance works with object moves 2021-12-15 12:35:48 -06:00
6075ce50e7 food inherit attributes 2021-12-15 12:35:48 -06:00
2ca7722afb Fix after rebase 2021-12-15 12:35:48 -06:00
7a9e5b1e3f getUserPreference available for all UserPreferences 2021-12-15 12:35:48 -06:00
3d674cfca6 model changes and GenericAutoSchema 2021-12-15 12:35:48 -06:00
9827c3ffd5 Fix after rebase 2021-12-15 12:35:48 -06:00
4a747f5cd4 Revert "Revert "fixed vue build""
This reverts commit edde015b71.
2021-12-15 18:02:37 +01:00
2559905a78 fixed empty fields breaking recipe update 2021-12-15 17:45:53 +01:00
edde015b71 Revert "fixed vue build"
This reverts commit 7e07508a31.
2021-12-15 17:26:06 +01:00
9b7b8beea4 addeed yarn lock 2021-12-15 17:22:24 +01:00
09cc5aafe9 fix package.json 2021-12-07 15:38:03 -06:00
e3196a79a8 Merge pull request #1102 from TandoorRecipes/dependabot/npm_and_yarn/vue/typescript-4.5.2
Bump typescript from 4.4.4 to 4.5.2 in /vue
2021-12-03 17:38:53 +01:00
c89c88b981 Merge pull request #1101 from TandoorRecipes/dependabot/npm_and_yarn/vue/eslint-8.3.0
Bump eslint from 7.32.0 to 8.3.0 in /vue
2021-12-03 17:38:27 +01:00
cf6ea04f30 Bump typescript from 4.4.4 to 4.5.2 in /vue
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.4.4 to 4.5.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.4.4...v4.5.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-03 16:38:10 +00:00
da748995e7 Bump eslint from 7.32.0 to 8.3.0 in /vue
Bumps [eslint](https://github.com/eslint/eslint) from 7.32.0 to 8.3.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.32.0...v8.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-03 16:37:54 +00:00
1d80ba3a3b Merge pull request #1103 from TandoorRecipes/dependabot/npm_and_yarn/vue/axios-0.24.0
Bump axios from 0.21.4 to 0.24.0 in /vue
2021-12-03 17:37:48 +01:00
29fe6c7363 Merge pull request #1099 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue-simple-calendar-6.0.3
Bump vue-simple-calendar from 5.0.1 to 6.0.3 in /vue
2021-12-03 17:37:38 +01:00
2bef5c3b51 Merge pull request #1096 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/eslint-config-typescript-9.1.0
Bump @vue/eslint-config-typescript from 7.0.0 to 9.1.0 in /vue
2021-12-03 17:36:36 +01:00
7e07508a31 fixed vue build 2021-12-03 11:47:04 +01:00
6c97594591 Bump axios from 0.21.4 to 0.24.0 in /vue
Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 0.24.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.4...v0.24.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-01 00:08:38 +00:00
5d353a0839 Bump vue-simple-calendar from 5.0.1 to 6.0.3 in /vue
Bumps [vue-simple-calendar](https://github.com/richardtallent/vue-simple-calendar) from 5.0.1 to 6.0.3.
- [Release notes](https://github.com/richardtallent/vue-simple-calendar/releases)
- [Changelog](https://github.com/richardtallent/vue-simple-calendar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/richardtallent/vue-simple-calendar/commits/v6.0.3)

---
updated-dependencies:
- dependency-name: vue-simple-calendar
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-01 00:07:33 +00:00
e02d2530aa Bump @vue/eslint-config-typescript from 7.0.0 to 9.1.0 in /vue
Bumps [@vue/eslint-config-typescript](https://github.com/vuejs/eslint-config-typescript) from 7.0.0 to 9.1.0.
- [Release notes](https://github.com/vuejs/eslint-config-typescript/releases)
- [Commits](https://github.com/vuejs/eslint-config-typescript/compare/v7.0.0...v9.1.0)

---
updated-dependencies:
- dependency-name: "@vue/eslint-config-typescript"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-01 00:07:24 +00:00
5d6574b8cc Merge pull request #1068 from rose-a/fix-recipe-step-template
Render separate ingredients flex row for each step
2021-11-30 17:23:47 +01:00
4d2e7eadb6 Merge branch 'develop' into generic_modal_v2 2021-11-30 17:23:27 +01:00
7c985cec23 Merge pull request #1088 from smilerz/search_troubleshooting
add search debug
2021-11-30 17:21:40 +01:00
1907223a8a reduced api calls 2021-11-25 12:51:55 +01:00
9b5fe8f4e7 prevent page jump due to href=# 2021-11-25 01:35:12 +01:00
d76fdd090a meal plan hotkeys and sharing 2021-11-25 01:28:07 +01:00
55a0304700 add search debug 2021-11-24 12:10:15 -06:00
5b6dd62f8e generic modal refactored 2021-11-23 19:18:10 -06:00