65 Commits

Author	SHA1	Message	Date
smilerz	6a13619bbd	more fix from super ugly merge	2021-05-01 16:30:20 -05:00
smilerz	58e33ef31a	more cleanup from ugly merge	2021-05-01 16:30:20 -05:00
smilerz	8094c7d53a	added drag and drop to ingredients	2021-05-01 16:30:20 -05:00
smilerz	71e02c0916	manually parse json	2021-05-01 16:30:20 -05:00
smilerz	91e36eb222	updated URL import page with tab interface	2021-05-01 16:30:20 -05:00
Patrick Pirker	7414033495	Allow recipes to be imported from json directly	2021-05-01 16:30:20 -05:00
smilerz	f594ba4c69	enable import button after error	2021-04-17 11:12:22 -05:00
smilerz	987be4b04d	Fix after rebase	2021-04-16 09:02:27 -05:00
smilerz	496e04cfc8	convert servings to number on import	2021-04-16 09:02:04 -05:00
smilerz	a28f8e65d5	Revert "fixed broken tab" ... This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6.	2021-04-16 09:02:03 -05:00
smilerz	d193637091	added missing bookmarklet	2021-04-16 09:02:03 -05:00
smilerz	efe4c4043d	simplified url import	2021-04-16 09:02:03 -05:00
smilerz	a3490240f4	fixed broken tab	2021-04-16 09:02:02 -05:00
smilerz	b26aea96f4	delete bookmarklet on import	2021-04-16 09:02:02 -05:00
smilerz	3da74505d6	fixed ingredient display on preview	2021-04-16 09:02:02 -05:00
smilerz	c8a4861df8	redirect to import url for processing	2021-04-16 09:02:02 -05:00
smilerz	a341fd8ebe	added CORS middleware	2021-04-16 09:02:02 -05:00
smilerz	f80c44bca3	bookmarklet passing data to form	2021-04-16 09:02:02 -05:00
smilerz	09d2e9f831	added bookmarklet that doesn't work yet	2021-04-16 09:02:02 -05:00
smilerz	6a2c27749f	updated links to import recipes	2021-04-16 09:02:02 -05:00
smilerz	de60e12073	added collapsable cards	2021-04-16 09:02:02 -05:00
smilerz	cb708e7e47	added image import	2021-04-16 09:02:02 -05:00
smilerz	215eadb4a0	consolidated integration imports into url_import	2021-04-16 09:02:02 -05:00
smilerz	4ffc54f720	staged app import tabs	2021-04-16 09:02:02 -05:00
smilerz	40a2f7ff90	combined json import and source import	2021-04-16 09:02:01 -05:00
smilerz	4015517c0a	more fix from super ugly merge	2021-04-16 09:02:01 -05:00
smilerz	7c8d41753c	more cleanup from ugly merge	2021-04-16 09:02:01 -05:00
smilerz	647c1678f1	added drag and drop to ingredients	2021-04-16 09:02:01 -05:00
smilerz	44dee16e0a	manually parse json	2021-04-16 09:02:01 -05:00
smilerz	9930789aa8	updated URL import page with tab interface	2021-04-16 09:02:01 -05:00
Patrick Pirker	386834f409	Allow recipes to be imported from json directly	2021-04-16 09:02:01 -05:00
vabene1111	58fc26904b	fixed url importer stuff	2021-03-19 10:05:17 +01:00
smilerz	ce8524b247	added data validation on name and description length	2021-03-18 16:03:13 -05:00
smilerz	9137fbfb97	Merge remote-tracking branch 'upstream/develop' into recipe_description	2021-03-18 15:33:50 -05:00
vabene1111	48c90c483a	merged PR 474 adding manual json import	2021-03-18 12:36:00 +01:00
smilerz	0b5fc1a9f4	added description to url_import	2021-03-04 09:20:26 -06:00
smilerz	e1fa939757	pulled description field from url_import template	2021-03-04 08:33:02 -06:00
smilerz	bfaed434cc	refactored url_import to use recipe-scraper	2021-03-03 21:08:34 -06:00
smilerz	e0a0eeeecc	add keyword during url import	2021-02-09 12:55:40 -06:00
vabene1111	c41c319d25	added servings to url import	2021-01-21 19:39:06 +01:00
vabene1111	1bdf14dbf9	made and compiled messages + fixed lots of typos	2020-12-31 12:56:18 +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	8b2833f353	re added stuff	2020-12-28 14:14:34 +01:00
Aaron	bc31f013c0	Fix 'All Keywords' label in website import	2020-12-22 23:51:55 +01:00
vabene1111	2a0a85018a	fixed import and validation errors	2020-09-01 13:26:58 +02:00
vabene1111	62868cd2b2	added note support for recipe import	2020-09-01 11:49:19 +02:00
vabene1111	a8b1ee9765	changed url import api call to post url	2020-08-09 20:13:05 +02:00
vabene1111	696791d059	url import improvements	2020-07-15 18:28:43 +02:00
vabene1111	b89c38a696	error messages	2020-07-08 21:53:55 +02:00
vabene1111	8cff44df7d	recipe steps tagging support	2020-06-29 17:56:50 +02:00