vabene1111 79cd17a5ba Merge branch 'develop' into feature/unit-conversion ...

# Conflicts:
#	vue/src/components/Modals/GenericModalForm.vue

2023-05-24 08:53:49 +02:00

..

account

Remove yellow button to unify GUI of reset password in mobile/web viewports #2102

2022-10-05 12:25:29 +02:00

batch

…

forms

removed lots of unused stuff

2022-07-14 10:37:15 +02:00

generic

…

include

removed lots of unused stuff

2022-07-14 10:37:15 +02:00

openid

…

rest_framework

…

socialaccount

…

404.html

…

api_info.html

…

base.html

Merge branch 'develop' into feature/unit-conversion

2023-05-24 08:53:49 +02:00

books.html

…

export_response.html

…

export.html

…

history.html

…

import_response.html

…

index.html

…

ingredient_editor.html

…

manifest.json

…

markdown_info.html

…

meal_plan.html

…

no_groups_info.html

…

no_perm_info.html

…

offline.html

…

profile.html

…

recipe_view.html

added bottom padding for recipe view

2023-02-27 16:43:37 +01:00

search_info.html

…

search.html

…

settings.html

fixed search settings not working with sqlite DB

2022-09-23 16:16:44 +02:00

setup.html

…

shoppinglist_template.html

new settings page finished

2022-08-05 16:54:53 +02:00

space_manage.html

…

space_overview.html

added ability to set space images

2022-07-14 15:23:59 +02:00

supermarket.html

…

system.html

…

test2.html

…

test.html

setup test view

2023-02-16 18:26:26 +01:00

url_import.html

…

user_settings.html

new settings page finished

2022-08-05 16:54:53 +02:00