Commit Graph

294 Commits

Author SHA1 Message Date
vabene1111
387893e1ef remove source map reference 2023-01-06 21:58:14 +01:00
vabene1111
78dc1bf9ec fixed missing .map files (by removing the reference) 2023-01-06 21:50:26 +01:00
Niklas Schwarz
b1ad5ef205 Add option to space to enable plural name usage
* Add option to space to enable usage of plural name
  for food and unit per space

* Respect option per space to use the plural name
2022-11-11 18:15:57 +01:00
Niklas Schwarz
9994b6f9c2 Add plural name for unit and food
Add an optional plural name for unit and food.
Additional options to show always the plural name for unit and food
for an ingredient is added.
2022-11-11 18:15:57 +01:00
vabene1111
0ca29cd677 small visual tweaks to search page 2022-09-17 08:06:38 +02:00
vabene1111
6605b87c5c new settings page finished 2022-08-05 16:54:53 +02:00
vabene1111
f7af0741fe fixed bookmarklet 2022-08-04 18:45:40 +02:00
vabene1111
98a54ef38f removed lots of unused stuff 2022-07-14 10:37:15 +02:00
vabene1111
af1282c268
Merge pull request #1723 from vekunz/feature/optimize_printing
Fix some issues to improve the print output
2022-06-14 20:59:57 +02:00
vabene1111
e368488933 deprecated all old vue stuff and working on tests 2022-06-07 20:08:32 +02:00
vabene1111
24b0d7f8e6 removed unused library 2022-05-30 22:10:25 +02:00
vabene1111
3cf0395a18 lots of small fixes 2022-04-22 19:26:49 +02:00
Kaibu
45a86a22e3 recipe switcher and navbar fixes
also added left_hand to global preferences
2022-04-18 14:13:23 +02:00
Veit Kunz
095befd9b7 Fix some issues to improve the print output 2022-04-14 14:26:36 +02:00
hendrikbl
a9414065b5 changed navbar logo size and order 2022-04-09 16:15:10 +02:00
vabene1111
4c5994ee7f Merge branch 'develop' into feature/custom_filters
# Conflicts:
#	cookbook/serializer.py
#	cookbook/views/api.py
#	vue/src/utils/openapi/api.ts
2022-02-07 18:56:19 +01:00
Chris Scoggins
890e9e7242
created CustomFilter model and api 2022-02-03 12:09:14 -06:00
vabene1111
a0892470e1
Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +01:00
Kaibu
c90e5d72af shopping list ux optimization, left handed mode 2022-01-21 00:13:36 +01:00
Tiago Rascazzi
9c873127a5 Added loading page 2022-01-08 11:07:33 -05:00
smilerz
c43b8e91da Fix after rebase 2021-12-28 12:05:14 -06:00
smilerz
9794d544cc Squashed commit of the following:
commit 7837467c30
Merge: aaaae5b1b 84759383f
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Dec 18 23:14:24 2021 +0100

    Merge pull request #1146 from auanasgheps/patch-1

    Add documentation about swag by linuxserver

commit 84759383fa
Author: Oliver Cervera <cervera93-19@yahoo.it>
Date:   Sat Dec 18 13:49:09 2021 +0100

    Add documentation about swag by linuxserver

    Documents behaviour in #959

commit aaaae5b1ba
Merge: 4a747f5cd ea62c10d9
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Thu Dec 16 18:10:48 2021 +0100

    Merge pull request #1143 from smilerz/fix_get_facet_api

    fix bug in get_facet_api

commit ea62c10d9a
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:20:56 2021 -0600

    remove console message

commit 3516505dd1
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:08:32 2021 -0600

    fix bug in get_facet_api
2021-12-28 12:03:35 -06:00
smilerz
f5e4adba8b fix get_facets_API 2021-12-28 12:03:35 -06:00
smilerz
1364f75f21 test userpreference food_inherit defaults 2021-12-28 12:03:34 -06:00
smilerz
3516505dd1 fix bug in get_facet_api 2021-12-16 09:08:32 -06:00
vabene1111
c0972b1ca1 removed some unused dependencies 2021-10-14 11:27:43 +02:00
vabene1111
b0411b986e removing build src files from repo and adding auto build 2021-10-13 10:23:34 +02:00
vabene1111
22fd499213 build frontend 2021-10-12 18:23:53 +02:00
vabene1111
fe99324c38
Merge branch 'develop' into api_performance 2021-10-12 16:28:49 +02:00
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
053508821f rebuild again 2021-10-06 20:16:29 +02:00
vabene1111
a870ff9325 Merge branch 'beta' into develop
# Conflicts:
#	cookbook/static/vue/js/checklist_view.js
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/cookbook_view.js
#	cookbook/static/vue/js/edit_internal_recipe.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/meal_plan_view.js
#	cookbook/static/vue/js/model_list_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	cookbook/templates/sw.js
2021-10-06 20:14:35 +02:00
vabene1111
ede7925203 compiled javascript 2021-10-06 20:13:36 +02:00
smilerz
613b618533 ExtendedRecipeMixin 2021-10-05 06:28:25 -05: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
4ba4eec238 fixed ci and rebuild files 2021-10-01 12:44:37 +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
d1bed45eb6 added grip indication to supermarket category pills 2021-09-29 16:42:19 -05:00
vabene1111
71a13d33fe update javascript 2021-09-29 15:39:34 +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
Kaibu
e2def416ab new meal planner basic features implemented 2021-09-15 17:31:25 +02:00