cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28b67a2ba5
TandoorRecipes/cookbook/templates
History
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
..
account minor ui fixes 2021-06-22 01:03:26 +02:00
batch style fixes 2021-06-05 18:10:10 +02:00
forms Merge branch 'develop' into feature/keywords-rework 2021-06-30 14:57:33 +02:00
generic Squashed commit of the following: 2021-06-09 20:41:40 -05:00
include actually fixed error 2020-07-08 22:14:22 +02:00
rest_framework documentation update api 2020-06-17 10:29:01 +02:00
socialaccount fixed enable signup parameter for social auth 2021-06-21 12:43:52 +02:00
404.html added custom 404 page 2020-06-16 16:21:15 +02:00
api_info.html api documentation basics 2020-06-16 17:21:50 +02:00
base.html Merge branch 'develop' into feature/keywords-rework 2021-06-30 14:57:33 +02:00
books.html recipe book improvements 2020-05-02 21:59:32 +02:00
export.html using new import/export module 2021-02-08 11:38:38 +01:00
files.html file view 2021-06-08 13:12:04 +02:00
history.html added history page 2020-05-11 12:59:54 +02:00
import_response.html fixed frontend localization 2021-05-30 17:12:59 +02:00
import.html using new import/export module 2021-02-08 11:38:38 +01:00
index.html updated links to import recipes 2021-04-16 09:02:02 -05:00
javascript_urls.html recipe stuff 2021-01-12 20:51:28 +01:00
manifest.json refactor assset and paths 2021-02-15 21:01:54 +01:00
markdown_info.html favicon path in markdown docs 2021-02-15 21:16:31 +01:00
meal_plan_entry.html basic vue stuff working 2020-06-02 12:47:36 +02:00
meal_plan.html actual meal plan fixes 2021-06-13 18:11:31 +02:00
no_groups_info.html recipe share basics 2021-02-21 16:37:04 +01:00
no_perm_info.html recipe share basics 2021-02-21 16:37:04 +01:00
no_space_info.html reworked invite system 2021-05-28 16:49:03 +02:00
offline.html updated webpack loader and lots of javscript stuff 2021-04-28 09:41:06 +02:00
recipe_view.html fixed frontend localization 2021-05-30 17:12:59 +02:00
recipes_table.html minor theme fixes 2021-06-08 12:22:08 +02:00
search_info.html Squashed commit of the following: 2021-06-09 20:41:40 -05:00
search.html fixed frontend localization 2021-05-30 17:12:59 +02:00
settings.html Merge branch 'develop' into feature/keywords-rework 2021-06-30 14:57:33 +02:00
setup.html made and compiled messages + fixed lots of typos 2020-12-31 12:56:18 +01:00
shopping_list.html style fixes 2021-06-05 18:10:10 +02:00
space.html minor ui fixes 2021-06-22 01:03:26 +02:00
stats.html new search design basics + Boostrap fixes 2020-05-02 00:49:29 +02:00
supermarket.html started work on supermarket edit view 2021-05-31 18:40:59 +02:00
sw.js minor ui/ux improvements 2021-06-30 04:12:52 +02:00
system.html space stuff partially working 2021-02-19 15:50:55 +01:00
test2.html wip on new import/export system 2021-02-07 13:27:15 +01:00
test.html importing with image files working 2021-02-07 14:50:43 +01:00
url_import.html Squashed commit of the following: 2021-06-09 20:41:40 -05:00