|
|
613b618533
|
ExtendedRecipeMixin
|
2021-10-05 06:28:25 -05:00 |
|
|
|
823c5d3975
|
fixed model list view error for unpaginated lists
|
2021-10-01 18:55:16 +02:00 |
|
|
|
b6d878e885
|
fixed model list error
|
2021-10-01 18:34:30 +02:00 |
|
|
|
4ba4eec238
|
fixed ci and rebuild files
|
2021-10-01 12:44:37 +02:00 |
|
|
|
64b2e21747
|
Merge branch 'develop' into draggable_pill_update
|
2021-10-01 07:53:35 +00:00 |
|
|
|
17cedf17b5
|
stubbed out new shopping list
|
2021-09-30 14:56:59 -05:00 |
|
|
|
a140813a67
|
made add button on ModelList larger
|
2021-09-30 10:33:47 -05:00 |
|
|
|
b61512da77
|
meal plan refactor progress
- added paginated loading
- tab panes
- default meal type selection
- image placeholder
- drang and drop delete area
|
2021-09-30 02:33:40 +02:00 |
|
|
|
d1bed45eb6
|
added grip indication to supermarket category pills
|
2021-09-29 16:42:19 -05:00 |
|
|
|
71a13d33fe
|
update javascript
|
2021-09-29 15:39:34 +02:00 |
|
|
|
c1a22ea2a6
|
chain supermarket create/update to include categories
|
2021-09-27 17:55:58 -05:00 |
|
|
|
b3cffa4a38
|
cached facet results
|
2021-09-26 16:44:12 -05:00 |
|
|
|
b7be5cd325
|
meal plan fixes
added the option to create entries from recipe card context menu
|
2021-09-26 11:55:50 +02:00 |
|
|
|
5c85369120
|
meal plan context menu added, further progress
|
2021-09-22 20:03:03 +02:00 |
|
|
|
f3593e8151
|
implemented rule processing in ingredient parser
|
2021-09-16 18:31:21 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
0e50e4e8a0
|
meal master tweak and frontend build
|
2021-09-14 14:48:50 +02:00 |
|
|
|
02635b017c
|
more minor drawer fixes
|
2021-09-13 22:38:24 +02:00 |
|
|
|
77bd44ad42
|
minor drawer fixes
|
2021-09-13 22:30:01 +02:00 |
|
|
|
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 |
|
|
|
9ace332ba5
|
drawer added
|
2021-09-13 22:14:15 +02: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 |
|
|
|
c1161edc6d
|
build
|
2021-09-13 21:24:41 +02:00 |
|
|
|
22bde0424c
|
delete and create added for books
|
2021-09-13 20:49:25 +02:00 |
|
|
|
9efc60232a
|
removed old asset
|
2021-09-13 19:30:53 +02:00 |
|
|
|
8b09777b2c
|
Merge branch 'feature/books_refactor' into develop
# Conflicts:
# vue/webpack-stats.json
|
2021-09-13 19:30:13 +02:00 |
|
|
|
0501dd9a0a
|
layout progress
|
2021-09-12 22:47:31 +02:00 |
|
|
|
79c1f2eb86
|
Merge branch 'develop' into generic_card_fix
|
2021-09-11 13:09:02 +02:00 |
|
|
|
c8bff1660b
|
transposed v-model
|
2021-09-10 14:51:37 -05:00 |
|
|
|
f6eb1b69cb
|
card loading fixes
|
2021-09-10 11:37:27 -05:00 |
|
|
|
6888233b6a
|
fixed mispelled parameter
|
2021-09-10 06:44:09 -05:00 |
|
|
|
cd137f9da3
|
yarn build
|
2021-09-09 19:07:16 -05:00 |
|
|
|
aae3b679aa
|
filter by recipe
|
2021-09-09 18:55:47 -05:00 |
|
|
|
249557f8ef
|
filter by rating
|
2021-09-09 15:23:46 -05:00 |
|
|
|
51dd137d96
|
Merge branch 'develop' into create_inputList
|
2021-09-09 05:44:43 +02:00 |
|
|
|
83a747739a
|
add new from ListInput
|
2021-09-08 14:01:21 -05:00 |
|
|
|
5f37af5710
|
Move/Merge updated to handle object vs id
|
2021-09-08 09:16:58 -05:00 |
|
|
|
9bdcf09f60
|
started reworking books
|
2021-09-08 16:15:33 +02:00 |
|
