2850 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smilerz	cae3773d5a	Fix after rebase	2021-12-28 12:03:33 -06:00
smilerz	f2222fd7d5	pre-merge	2021-12-28 12:03:33 -06:00
smilerz	b8dfc00106	undo move	2021-12-28 12:03:33 -06:00
smilerz	1d224d8658	yarn build	2021-12-28 12:03:33 -06:00
smilerz	2b41fbc9f8	Fix after rebase	2021-12-28 12:03:33 -06:00
smilerz	a24f09c419	WIP	2021-12-28 12:03:33 -06:00
smilerz	450de740b6	RecipeFactory and all related models	2021-12-28 12:03:33 -06:00
smilerz	b92c027919	food inherit tests	2021-12-28 12:03:33 -06:00
smilerz	6c0e979909	finish refactoring test_api_food to use factoryboy	2021-12-28 12:03:33 -06:00
smilerz	a035e02288	refactor Food tests to use factory_boy fixture factories	2021-12-28 12:03:33 -06:00
smilerz	6eec3d18fe	more fixes after rebase	2021-12-28 12:03:33 -06:00
smilerz	94b2e9b01c	minor updates	2021-12-28 12:03:33 -06:00
smilerz	de7d2e27d9	update migrations	2021-12-28 12:03:32 -06:00
smilerz	dcfe4de61f	Fix after rebase	2021-12-28 12:03:32 -06:00
smilerz	f245aa8b4f	add to shopping from card context menu	2021-12-28 12:03:32 -06:00
smilerz	a217db5822	add new unit/food from shopping list	2021-12-28 12:03:32 -06:00
smilerz	6e9d609fe0	edit supermarket categories	2021-12-28 12:03:32 -06:00
smilerz	ecac3f3c2d	related recipes included when adding mealplan to shopping list	2021-12-28 12:03:32 -06:00
smilerz	6135a6f26d	fix apis	2021-12-28 12:03:32 -06:00
smilerz	7a0b395107	alpha shopping list	2021-12-28 12:03:32 -06:00
smilerz	1f41fa04a3	autosync	2021-12-28 12:03:32 -06:00
smilerz	7c598720d0	WIP	2021-12-28 12:03:32 -06:00
smilerz	5c9f5e0e1a	fade-enter-active	2021-12-28 12:03:32 -06:00
smilerz	f400c7cd7c	shopping line item	2021-12-28 12:03:32 -06:00
smilerz	2a138a852f	inheritance works with object moves	2021-12-28 12:03:32 -06:00
smilerz	fbe748db62	food inherit attributes	2021-12-28 12:03:32 -06:00
smilerz	4377505b14	Fix after rebase	2021-12-28 12:03:31 -06:00
smilerz	c5c76cadea	getUserPreference available for all UserPreferences	2021-12-28 12:03:31 -06:00
smilerz	fbd17b48fe	Fix after rebase	2021-12-28 12:03:31 -06:00
smilerz	6eea7ac99b	model changes and GenericAutoSchema	2021-12-28 12:03:31 -06:00
smilerz	f5f9380344	model migrations	2021-12-28 12:03:31 -06:00
smilerz	e243e089cc	WIP	2021-12-28 12:03:31 -06:00
smilerz	0b1d8bbd5f	WIP	2021-12-28 12:03:31 -06:00
smilerz	10a33add75	Fix after rebase	2021-12-28 12:03:31 -06:00
vabene1111	f16e457d14	Merge pull request #1160 from TandoorRecipes/logout_redirect_patch ... fix logout redirect	2021-12-26 13:50:06 +01:00
smilerz	64f2787943	fix logout redirect	2021-12-23 14:48:30 -06:00
vabene1111	3ff15b6766	added copy me that importer	2021-12-23 15:54:48 +01:00
vabene1111	b8e0a7cf69	Merge pull request #1157 from TandoorRecipes/brand_button_patch ... fixes 1123	2021-12-23 15:00:33 +01:00
vabene1111	e2915dde55	Merge pull request #1156 from TandoorRecipes/1129_patch ... fixes 1129	2021-12-23 14:59:45 +01:00
smilerz	05f2fdecb3	fixes 1123	2021-12-23 07:44:11 -06:00
smilerz	5d33d82d70	fixes 1129	2021-12-23 07:38:30 -06:00
vabene1111	e3a3220f00	Merge pull request #1150 from auanasgheps/patch-1 ... punctuation fixes	2021-12-23 12:50:17 +01:00
vabene1111	f15f34887a	Merge pull request #1149 from smilerz/search_pagination ... Search pagination	2021-12-23 12:49:15 +01:00
Oliver Cervera	e470a70321	punctuation fixes ... First commit was done in rush. Fixed a couple of punctuations.	2021-12-20 11:09:05 +01:00
smilerz	1a99a2d6f1	remove console.log	2021-12-19 11:31:16 -06:00
smilerz	cf3ddfc610	fix inconsistent pagination	2021-12-19 11:08:30 -06:00
smilerz	ecbd3edb97	WIP	2021-12-19 10:21:46 -06:00
vabene1111	7837467c30	Merge pull request #1146 from auanasgheps/patch-1 ... Add documentation about swag by linuxserver	2021-12-18 23:14:24 +01:00
Oliver Cervera	84759383fa	Add documentation about swag by linuxserver ... Documents behaviour in #959	2021-12-18 13:49:09 +01:00
vabene1111	aaaae5b1ba	Merge pull request #1143 from smilerz/fix_get_facet_api ... fix bug in get_facet_api 1.0.3	2021-12-16 18:10:48 +01:00