90 Commits

Author	SHA1	Message	Date
vabene1111	fdeede5717	updated vue and vue bootrap + template improvements	2021-01-05 22:53:08 +01:00
vabene1111	1e471ad40d	removed all trans tags from javascript code ... replaced by django recommended javascript catalog still need to sort out the different translation domains	2020-12-31 12:30:31 +01:00
vabene1111	c4273a4c3f	Merge branch 'develop' into recipe-serving-count	2020-12-28 10:19:52 +01:00
vabene1111	592bd4f11e	fixed some english translations	2020-12-26 13:46:55 +01:00
tourn	113e9ef1e3	Merge remote-tracking branch 'upstream/develop' into recipe-serving-count	2020-12-24 11:17:56 +01:00
vabene1111	e7922a7e47	nutirtion fix	2020-12-14 19:12:01 +01:00
vabene1111	9863447bac	small nutrition fixes	2020-12-14 12:56:18 +01:00
vabene1111	53b00cc4c8	Merge pull request #199 from sebimarkgraf/feature/nutrition ... Add nutritional values	2020-12-14 12:29:56 +01:00
tourn	1e800889e4	Merge remote-tracking branch 'upstream/master' into recipe-serving-count	2020-11-20 14:44:09 +01:00
Sebastian Markgraf	422113a745	Finish editing of nutritional information	2020-11-17 22:27:01 +01:00
vabene1111	c413db5460	fixed english typo	2020-11-14 11:16:01 +01:00
vabene1111	526cf13b8d	increased max text area size of instructions	2020-10-15 21:27:41 +02:00
vabene1111	8239dc3604	fixed unit creation typo	2020-09-07 12:27:29 +02:00
vabene1111	4e92be3bbc	fixed scrolling issue in internal recipe edit ... related to bootstrap vue issue, waiting on proper fix	2020-09-01 11:39:46 +02:00
tourn	652b4bf2af	Add serving count to recipe	2020-08-30 16:00:01 +02:00
vabene1111	c45472689e	small fixes	2020-07-13 23:07:35 +02:00
vabene1111	5b7ec37637	hotkeys, styling, step improvements	2020-07-13 22:55:09 +02:00
vabene1111	4d08477b23	fixed decimals	2020-07-13 21:38:42 +02:00
vabene1111	692811f84f	fixed settings dropdown being below recipe edit buttons	2020-07-08 22:26:06 +02:00
vabene1111	372dd0afa1	recipe step sidebar no name	2020-07-08 21:55:17 +02:00
vabene1111	b89c38a696	error messages	2020-07-08 21:53:55 +02:00
vabene1111	b490673866	javascript toasts	2020-07-08 21:01:01 +02:00
vabene1111	5f2320a3e7	added save confirm	2020-07-05 22:36:39 +02:00
vabene1111	5b916e955c	WIP page leave confirm	2020-07-05 22:15:00 +02:00
vabene1111	64603fca51	added time to text steps	2020-07-02 13:23:16 +02:00
vabene1111	98f9555ef6	check box linking	2020-07-02 12:15:30 +02:00
vabene1111	1619d4894c	step header rendering	2020-07-02 12:12:17 +02:00
vabene1111	80423da16d	removed duplicate div	2020-07-01 23:44:58 +02:00
vabene1111	0005ca243c	testing around	2020-07-01 23:22:29 +02:00
vabene1111	adbc7e4a39	icons and stuff	2020-07-01 22:27:32 +02:00
vabene1111	9caec2dff2	step sidebar sorting	2020-07-01 21:53:41 +02:00
vabene1111	41eef9a913	step sorting buttons	2020-07-01 21:42:46 +02:00
vabene1111	31357c552c	ui improvements	2020-07-01 21:04:28 +02:00
vabene1111	5d70dca039	time step + step delete + sorting improvement	2020-07-01 20:38:35 +02:00
vabene1111	98bdad5955	second fix	2020-06-29 22:58:31 +02:00
vabene1111	6eb41fe33f	fixed keywords and food/unit loading	2020-06-29 22:41:54 +02:00
vabene1111	941264731e	fixed ingredient adding attributes	2020-06-29 22:03:43 +02:00
vabene1111	2c59302fe9	conditional header/no amount render	2020-06-29 22:01:42 +02:00
vabene1111	e2508cbc6f	step ordering	2020-06-29 20:45:30 +02:00
vabene1111	577af85d38	fixed import export	2020-06-29 19:09:15 +02:00
vabene1111	8cff44df7d	recipe steps tagging support	2020-06-29 17:56:50 +02:00
vabene1111	8f28e4766d	side nav in recipe edit	2020-06-29 16:12:24 +02:00
vabene1111	27963fcaa6	image upload working	2020-06-29 15:39:58 +02:00
vabene1111	d613da7faf	mobile and large layout	2020-06-29 14:10:21 +02:00
vabene1111	d481767154	wip flex ui	2020-06-29 13:29:59 +02:00
vabene1111	8b9c7daaae	fixed commas + desktop flex design	2020-06-29 12:27:54 +02:00
vabene1111	3a2ba773cf	layout before flex test	2020-06-29 11:30:24 +02:00
vabene1111	642224fec9	sorting and ingredient adding	2020-06-26 15:00:41 +02:00
vabene1111	3d4aebcd9d	ordering of ingredients and steps	2020-06-26 14:50:33 +02:00
vabene1111	c178aea363	nested serializers and basic recipe editing working	2020-06-26 13:41:41 +02:00