vabene1111 28b67a2ba5 Merge branch 'develop' into feature/keywords-rework ... # Conflicts: # cookbook/static/vue/js/chunk-vendors.js # cookbook/static/vue/js/import_response_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 # cookbook/views/views.py # vue/src/components/RecipeCard.vue # vue/src/locales/en.json		2021-06-30 14:57:33 +02:00
..
assets	style fixes	2021-06-05 18:10:10 +02:00
css	social login buttons	2021-06-20 14:58:56 +02:00
custom	meal plan entry view	2020-05-08 00:10:23 +02:00
django_js_reverse	Squashed commit of the following:	2021-06-09 20:41:40 -05:00
emojionearea	emojis and migrations	2018-05-14 11:31:17 +02:00
fontawesome	cleanup and dependency updates + new nav	2019-11-19 19:59:53 +01:00
js	Squashed commit of the following:	2021-06-09 20:41:40 -05:00
pdfjs	improved pdf viewer	2020-06-10 15:40:24 +02:00
tabulator	updated tabulator js to 4.6	2020-03-31 01:20:49 +02:00
themes	minor ui/ux improvements	2021-06-30 04:12:52 +02:00
vue	Merge branch 'develop' into feature/keywords-rework	2021-06-30 14:57:33 +02:00
webfonts	new tandoor theme added, minor ux fixes	2021-05-31 00:47:59 +02:00