vabene1111
8f5b017857
dont build arm
2022-05-01 21:51:57 +02:00
vabene1111
9915a3eebf
Merge branch 'develop'
2022-05-01 13:09:48 +02:00
vabene1111
19c2d3bcf1
shopping description
2022-05-01 13:03:36 +02:00
vabene1111
9259f306ec
final importer touches
2022-05-01 12:51:37 +02:00
vabene1111
4f33101319
fixed empty step time error
2022-04-29 21:57:05 +02:00
vabene1111
3cef470134
made and compiled messages
2022-04-29 18:42:33 +02:00
Kaibu
93c53e5fc8
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
2022-04-24 12:52:06 +02:00
Kaibu
d931feadf5
supermarkets rework mostly done
2022-04-24 12:52:00 +02:00
vabene1111
fe32ff15b3
another toast fix
2022-04-24 12:46:17 +02:00
vabene1111
a44dea64b8
fixed toast error
2022-04-23 20:55:01 +02:00
Kaibu
54af76e9cf
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
...
# Conflicts:
# vue/src/apps/ShoppingListView/ShoppingListView.vue
2022-04-23 20:45:35 +02:00
Kaibu
fcfef255c1
shopping list supermarket rework
2022-04-23 20:44:46 +02:00
vabene1111
2914c20522
added space tier banner
2022-04-23 20:18:10 +02:00
vabene1111
825b7b7cf9
ingredient editor and parser
2022-04-23 19:58:40 +02:00
vabene1111
b9fb78c24d
Merge pull request #1739 from ndbeals/develop
...
Fix image upload handler to use content-type
2022-04-23 19:55:08 +02:00
vabene1111
2fbce7d84d
Merge pull request #1734 from Drumstickx/develop
...
Fix link in German locale
2022-04-23 19:53:47 +02:00
vabene1111
69a23f34b4
updated tests ingredient pagination
2022-04-23 18:54:23 +02:00
vabene1111
9f90306f6c
at least basic ui for ingredient editor
2022-04-23 17:13:27 +02:00
vabene1111
1fb6f96571
minor shopping tweaks
2022-04-23 16:51:04 +02:00
vabene1111
0b8dd63510
small fixes
2022-04-23 15:27:21 +02:00
Kaibu
b79bc0d9a8
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
2022-04-23 14:47:14 +02:00
Kaibu
8149192455
shopping list and import view ux
2022-04-23 14:47:10 +02:00
vabene1111
66c0cc070a
removed old shopping list
2022-04-23 14:43:03 +02:00
vabene1111
e2ab3a0efb
fixed ingredient parser length issues
2022-04-23 14:15:06 +02:00
vabene1111
e0b7d1a8f0
added support for unit/amount at end of ingredient
2022-04-23 13:53:04 +02:00
vabene1111
012a1a7915
ingredient parser produces expected results again
2022-04-23 13:03:15 +02:00
Nathan Beals
2af36a3db4
Merge branch 'develop' of github.com:ndbeals/tandoor_recipes into develop
2022-04-23 00:11:08 -04:00
Nathan Beals
8df3009cb2
Update image upload handler to be content-type aware
...
Update handle_image: made filetype required and not optional
Updated handle_image usage to reflect changes
2022-04-23 00:11:04 -04:00
Kaibu
161ae9879a
import app view refactor
2022-04-23 03:02:46 +02:00
vabene1111
71a60a46be
Translated using Weblate (German)
...
Currently translated at 96.8% (372 of 384 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-04-23 00:54:22 +00:00
Kaibu
93acac1f3b
Translated using Weblate (German)
...
Currently translated at 96.8% (372 of 384 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-04-23 00:54:22 +00:00
vabene1111
b4ebd98ee8
ingredient editor paginatio
2022-04-23 02:28:26 +02:00
vabene1111
78c0c5c213
ingredient editor improve merge/delete add edit
2022-04-23 02:17:40 +02:00
vabene1111
30d5587fbe
added err msg to all standard toasts
2022-04-23 01:41:08 +02:00
vabene1111
e4223787be
updated standard toast function
2022-04-23 01:31:15 +02:00
vabene1111
3850287deb
WSL docs
2022-04-23 01:28:56 +02:00
Kaibu
7fae95e248
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
2022-04-23 01:28:25 +02:00
Kaibu
b037203b8f
ui improvements (shopping and meal plan)
...
- fixed content scaling for meal plan and shopping
- style fixes on shopping list
- touch based swipe actions for shopping list
- better mobile experience overall
2022-04-23 01:28:20 +02:00
vabene1111
9b132e71f2
screw up ingredient parser
2022-04-23 01:21:13 +02:00
vabene1111
1a21659b5e
Merge pull request #1737 from TandoorRecipes/dependabot/pip/django-3.2.13
...
Bump django from 3.2.12 to 3.2.13
2022-04-23 01:01:40 +02:00
dependabot[bot]
1a1dd092d0
Bump django from 3.2.12 to 3.2.13
...
Bumps [django](https://github.com/django/django ) from 3.2.12 to 3.2.13.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/3.2.12...3.2.13 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-22 22:45:49 +00:00
vabene1111
9adc1f7266
small fixes and tests
2022-04-22 22:27:17 +02:00
vabene1111
6953f763d2
improved source url field rendering
2022-04-22 21:13:00 +02:00
vabene1111
4ecf77f431
Merge branch 'feature/importer_to_vue' into develop
...
# Conflicts:
# vue/src/apps/RecipeView/RecipeView.vue
2022-04-22 21:07:02 +02:00
vabene1111
c4f5b160a6
show original text in recipe editor
2022-04-22 21:05:23 +02:00
vabene1111
d8f6dbc58f
import list to textarea
2022-04-22 21:00:59 +02:00
vabene1111
8d3747a304
added missing doc entries
2022-04-22 20:30:05 +02:00
vabene1111
1740913a14
improve experience when importing multiple recipes
2022-04-22 20:19:39 +02:00
vabene1111
3cf0395a18
lots of small fixes
2022-04-22 19:26:49 +02:00
Kaibu
42dfc9d126
source url added
2022-04-22 18:53:23 +02:00
