mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 20:28:46 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,438 Commits 21 Branches 170 Tags
88a2255ed20537ad186fdf48b7abd5171b75f0ca
Commit Graph

183 Commits

Author SHA1 Message Date
vabene1111
88a2255ed2 fixes 
translation
disabled note rendering when less than 15 characters
fixed step header rendering
fixed image in recipe edit on mobile layout
 2021-10-11 16:29:32 +02:00
Kaibu
37e45bea76 meal plan fixes 
- added translations
- form validation & tagging support for meal types
 2021-10-09 02:25:31 +02:00
vabene1111
823c5d3975 fixed model list view error for unpaginated lists 2021-10-01 18:55:16 +02:00
vabene1111
b6d878e885 fixed model list error 2021-10-01 18:34:30 +02:00
vabene1111
64b2e21747 Merge branch 'develop' into draggable_pill_update 2021-10-01 07:53:35 +00:00
smilerz
17cedf17b5 stubbed out new shopping list 2021-09-30 14:56:59 -05:00
smilerz
a140813a67 made add button on ModelList larger 2021-09-30 10:33:47 -05:00
Kaibu
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
smilerz
c1a22ea2a6 chain supermarket create/update to include categories 2021-09-27 17:55:58 -05:00
smilerz
b3cffa4a38 cached facet results 2021-09-26 16:44:12 -05:00
Kaibu
b7be5cd325 meal plan fixes 
added the option to create entries from recipe card context menu
 2021-09-26 11:55:50 +02:00
Kaibu
5c85369120 meal plan context menu added, further progress 2021-09-22 20:03:03 +02:00
vabene1111
f3593e8151 implemented rule processing in ingredient parser 2021-09-16 18:31:21 +02:00
vabene1111
a7dc23194e converted ingredient parser to class and added automation beta hint 2021-09-16 17:52:11 +02:00
Kaibu
e2def416ab new meal planner basic features implemented 2021-09-15 17:31:25 +02:00
vabene1111
cfaae5b200 Merge branch 'develop' into patch3 2021-09-15 17:28:25 +02:00
vabene1111
1fa9c806a6 Merge branch 'develop' into patch2 2021-09-15 17:28:01 +02:00
smilerz
6a29c79e5c fix resetList function 2021-09-15 08:50:46 -05:00
smilerz
0680cefbe1 fixed or/and filters 2021-09-15 08:29:49 -05:00
vabene1111
dbfa27e4b9 automatic rule creation 2021-09-15 14:58:55 +02:00
vabene1111
aeb5682176 Merge branch 'pr/897' into develop 2021-09-15 09:16:09 +02:00
smilerz
4296e8e44f remove console messages 2021-09-14 16:19:38 -05:00
Kaibu
d9300a9a90 meal planner refactor progress 2021-09-14 23:16:33 +02:00
smilerz
f0cf92eaa3 draggable 2021-09-14 16:10:58 -05:00
smilerz
508284c046 edit SupermarketCategoryRelations 2021-09-14 16:09:48 -05: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
Kaibu
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +02:00
vabene1111
bbc6015898 Merge branch 'pr/891' into develop 2021-09-13 22:11:41 +02:00
smilerz
85aca8acf6 shopping_list_category 2021-09-13 14:30:03 -05: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
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
79c1f2eb86 Merge branch 'develop' into generic_card_fix 2021-09-11 13:09:02 +02:00
smilerz
f6eb1b69cb card loading fixes 2021-09-10 11:37:27 -05:00
smilerz
6888233b6a fixed mispelled parameter 2021-09-10 06:44:09 -05:00
smilerz
cd137f9da3 yarn build 2021-09-09 19:07:16 -05:00
smilerz
aae3b679aa filter by recipe 2021-09-09 18:55:47 -05:00
smilerz
249557f8ef filter by rating 2021-09-09 15:23:46 -05:00
vabene1111
51dd137d96 Merge branch 'develop' into create_inputList 2021-09-09 05:44:43 +02:00
smilerz
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
smilerz
5f37af5710 Move/Merge updated to handle object vs id 2021-09-08 09:16:58 -05:00