mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 12:18:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,307 Commits 21 Branches 170 Tags
cbb2c0460c51b57298880e8e17636c63a70a1fec
Commit Graph

2307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
cbb2c0460c fixed fractional servings breaking importer 2021-09-14 21:54:08 +02:00
vabene1111
d1807f3c14 show shared users in recipe book view 2021-09-14 21:12:18 +02:00
vabene1111
aca526a9cd added sharing back to recipe books 2021-09-14 21:07:15 +02:00
vabene1111
26f9d25bd2 fixed some integration issues 2021-09-14 20:31:41 +02:00
vabene1111
3b429c5d84 change iexact to exact for get_or_create tree mixing 2021-09-14 19:26:09 +02:00
vabene1111
5c6f09975b fixed importer rembering old ignored recipes 2021-09-14 15:17:00 +02:00
vabene1111
0e50e4e8a0 meal master tweak and frontend build 2021-09-14 14:48:50 +02:00
vabene1111
1c661c9baf recipe edit view hotkeys and small tweaks 2021-09-14 12:36:04 +02:00
vabene1111
b151356bce recipe editor UI improvements 2021-09-14 11:47:00 +02:00
vabene1111
658ef23b42 compile messages 2021-09-13 22:40:53 +02:00
vabene1111
cfdce3de2a make and compile messages 2021-09-13 22:40:47 +02:00
Kaibu
02635b017c more minor drawer fixes 2021-09-13 22:38:24 +02:00
Kaibu
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +02:00
Kaibu
659847a949 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 
# Conflicts:
#	cookbook/templates/base.html
 2021-09-13 22:15:24 +02:00
Kaibu
9ace332ba5 drawer added 2021-09-13 22:14:15 +02:00
Jesse
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
vabene1111
bbc6015898 Merge branch 'pr/891' into develop 2021-09-13 22:11:41 +02:00
vabene1111
6f44ad760c quick solution for external recipe nav 2021-09-13 21:51:24 +02:00
smilerz
5e1ae1d877 add shopping_category and supermarkets 2021-09-13 14:41:50 -05:00
Kaibu
0c3dcf143f drawer rework 2021-09-13 21:41:15 +02:00
smilerz
85aca8acf6 shopping_list_category 2021-09-13 14:30:03 -05:00
Oliver Cervera
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
vabene1111
c1161edc6d build 2021-09-13 21:24:41 +02:00
vabene1111
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
vabene1111
234e27c4c1 recipe editor 2021-09-13 21:13:43 +02:00
Kaibu
22bde0424c delete and create added for books 2021-09-13 20:49:25 +02:00
Kaibu
9efc60232a removed old asset 2021-09-13 19:30:53 +02:00
Kaibu
8b09777b2c Merge branch 'feature/books_refactor' into develop 
# Conflicts:
#	vue/webpack-stats.json
 2021-09-13 19:30:13 +02:00
Kaibu
fd8797e2b7 cookbook view refactored, minor ui fixes 2021-09-13 19:28:16 +02:00
vabene1111
b752541302 added markdown editor for instructions 2021-09-13 17:25:39 +02:00
vabene1111
f009e105ec recipe search fixed 2021-09-13 15:21:15 +02:00
vabene1111
b9ff4387ad first rendering version 2021-09-13 14:26:54 +02:00
vabene1111
b86c9d295a basic errors fixed 2021-09-13 14:06:19 +02:00
vabene1111
4fbf080e2f basics 2021-09-13 12:39:29 +02:00
Kaibu
0501dd9a0a layout progress 2021-09-12 22:47:31 +02:00
vabene1111
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
vabene1111
6592db6b73 Merge pull request #884 from vabene1111/dependabot/npm_and_yarn/vue/workbox-precaching-6.3.0 
Bump workbox-precaching from 6.2.4 to 6.3.0 in /vue
 2021-09-11 13:12:44 +02:00
dependabot[bot]
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
dependabot[bot]
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
vabene1111
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
dependabot[bot]
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
vabene1111
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
vabene1111
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
vabene1111
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
vabene1111
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
vabene1111
5a27fe2123 Merge pull request #872 from vabene1111/dependabot/pip/boto3-1.18.38 
Bump boto3 from 1.18.37 to 1.18.38
 2021-09-11 13:09:36 +02:00
vabene1111
f394fcce0d Merge pull request #871 from vabene1111/dependabot/pip/beautifulsoup4-4.10.0 
Bump beautifulsoup4 from 4.9.3 to 4.10.0
 2021-09-11 13:09:32 +02:00
vabene1111
1f416488b7 Merge pull request #881 from smilerz/generic_card_fix 
card loading fixes
 2021-09-11 13:09:07 +02:00
vabene1111
79c1f2eb86 Merge branch 'develop' into generic_card_fix 2021-09-11 13:09:02 +02:00
vabene1111
1be24e80de Merge pull request #878 from smilerz/filter_by_rating 
Filter by rating
 2021-09-11 13:08:14 +02:00