Commit Graph

306 Commits

Author SHA1 Message Date
e2def416ab new meal planner basic features implemented 2021-09-15 17:31:25 +02:00
cfaae5b200 Merge branch 'develop' into patch3 2021-09-15 17:28:25 +02:00
1fa9c806a6 Merge branch 'develop' into patch2 2021-09-15 17:28:01 +02:00
60aa384f3c Merge pull request #901 from smilerz/patch
fix inputLookup
2021-09-15 17:27:42 +02:00
6a29c79e5c fix resetList function 2021-09-15 08:50:46 -05:00
0680cefbe1 fixed or/and filters 2021-09-15 08:29:49 -05:00
5c0fa7cd19 fix inputLookup 2021-09-15 08:13:22 -05:00
dbfa27e4b9 automatic rule creation 2021-09-15 14:58:55 +02:00
19d1e2d456 moved toast to bottom right to not obstruct modals 2021-09-15 14:35:03 +02:00
803a25a75f Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-09-15 14:26:43 +02:00
4f3a364f13 translation 2021-09-15 14:26:40 +02:00
90dc445c45 Translated using Weblate (Italian)
Currently translated at 100.0% (151 of 151 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2021-09-15 11:07:30 +00:00
d6f7aade46 basics for automation 2021-09-15 13:07:25 +02:00
aeb5682176 Merge branch 'pr/897' into develop 2021-09-15 09:16:09 +02:00
4296e8e44f remove console messages 2021-09-14 16:19:38 -05:00
d9300a9a90 meal planner refactor progress 2021-09-14 23:16:33 +02:00
c9a910daca rebase with develop 2021-09-14 16:14:30 -05:00
f0cf92eaa3 draggable 2021-09-14 16:10:58 -05:00
508284c046 edit SupermarketCategoryRelations 2021-09-14 16:09:48 -05:00
d1807f3c14 show shared users in recipe book view 2021-09-14 21:12:18 +02:00
aca526a9cd added sharing back to recipe books 2021-09-14 21:07:15 +02:00
1c661c9baf recipe edit view hotkeys and small tweaks 2021-09-14 12:36:04 +02:00
b151356bce recipe editor UI improvements 2021-09-14 11:47:00 +02:00
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +02:00
0055f02f14 Translated using Weblate (Dutch)
Currently translated at 84.5% (126 of 149 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
2021-09-13 20:11:59 +00:00
bbc6015898 Merge branch 'pr/891' into develop 2021-09-13 22:11:41 +02:00
5e1ae1d877 add shopping_category and supermarkets 2021-09-13 14:41:50 -05:00
85aca8acf6 shopping_list_category 2021-09-13 14:30:03 -05:00
37b2a95797 Translated using Weblate (Italian)
Currently translated at 92.2% (119 of 129 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2021-09-13 19:24:47 +00:00
c1161edc6d build 2021-09-13 21:24:41 +02:00
6350d0e9c5 Merge branch 'feature/recipe-edit-vue' into develop
# Conflicts:
#	vue/vue.config.js
#	vue/webpack-stats.json
2021-09-13 21:14:45 +02:00
234e27c4c1 recipe editor 2021-09-13 21:13:43 +02:00
22bde0424c delete and create added for books 2021-09-13 20:49:25 +02:00
8b09777b2c Merge branch 'feature/books_refactor' into develop
# Conflicts:
#	vue/webpack-stats.json
2021-09-13 19:30:13 +02:00
fd8797e2b7 cookbook view refactored, minor ui fixes 2021-09-13 19:28:16 +02:00
b752541302 added markdown editor for instructions 2021-09-13 17:25:39 +02:00
f009e105ec recipe search fixed 2021-09-13 15:21:15 +02:00
b9ff4387ad first rendering version 2021-09-13 14:26:54 +02:00
b86c9d295a basic errors fixed 2021-09-13 14:06:19 +02:00
4fbf080e2f basics 2021-09-13 12:39:29 +02:00
0501dd9a0a layout progress 2021-09-12 22:47:31 +02:00
c7be37d4b8 Merge pull request #885 from vabene1111/dependabot/npm_and_yarn/vue/typescript-4.4.3
Bump typescript from 4.3.2 to 4.4.3 in /vue
2021-09-11 13:12:53 +02:00
3460319a35 Bump typescript from 4.3.2 to 4.4.3 in /vue
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.3.2 to 4.4.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.3.2...v4.4.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-11 11:11:31 +00:00
f64b3bca00 Bump workbox-precaching from 6.2.4 to 6.3.0 in /vue
Bumps [workbox-precaching](https://github.com/googlechrome/workbox) from 6.2.4 to 6.3.0.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.2.4...v6.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-11 11:11:11 +00:00
163d5a3892 Merge pull request #883 from vabene1111/dependabot/npm_and_yarn/vue/workbox-routing-6.3.0
Bump workbox-routing from 6.2.4 to 6.3.0 in /vue
2021-09-11 13:10:38 +02:00
1007a9f884 Bump workbox-routing from 6.2.4 to 6.3.0 in /vue
Bumps [workbox-routing](https://github.com/googlechrome/workbox) from 6.2.4 to 6.3.0.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.2.4...v6.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-11 11:10:18 +00:00
9d0d72a7b2 Merge pull request #877 from vabene1111/dependabot/npm_and_yarn/vue/typescript-4.4.2
Bump typescript from 4.3.2 to 4.4.2 in /vue
2021-09-11 13:10:00 +02:00
29602e2f27 Merge pull request #876 from vabene1111/dependabot/npm_and_yarn/vue/workbox-precaching-6.2.4
Bump workbox-precaching from 6.1.5 to 6.2.4 in /vue
2021-09-11 13:09:55 +02:00
eb8c06032e Merge pull request #874 from vabene1111/dependabot/npm_and_yarn/vue/typescript-eslint/parser-4.31.0
Bump @typescript-eslint/parser from 4.26.1 to 4.31.0 in /vue
2021-09-11 13:09:45 +02:00
c0d1987545 Merge pull request #873 from vabene1111/dependabot/npm_and_yarn/vue/workbox-strategies-6.2.4
Bump workbox-strategies from 6.1.5 to 6.2.4 in /vue
2021-09-11 13:09:41 +02:00