smilerz
|
faf458e8ef
|
Squashed commit of the following:
commit 707d862e01a7497a1f22879d314b865a35e0e85b
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 10:35:00 2021 -0500
works now
commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 10:25:24 2021 -0500
updated serializer and api
commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 10:20:19 2021 -0500
fixed bookmarklet
commit 9779104902d3be0258c95cd2eeebcba0d5d48892
Merge: bb8262c 0cb3928
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 09:56:27 2021 -0500
Merge branch 'bookmarklet' into json_import
commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 09:42:53 2021 -0500
retrieve bookmarklet ID from get
commit e89e0218de684d40b2e2bfb6ba833891206c828e
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 09:29:33 2021 -0500
Revert "fixed broken tab"
This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6.
commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79
Merge: b1e73aa 35a7f62
Author: smilerz <smilerz@gmail.com>
Date: Sun Apr 11 20:35:57 2021 -0500
Merge branch 'main_fork' into json_import
|
2021-05-01 16:30:22 -05:00 |
|
smilerz
|
7cc757ac33
|
redirect to import url for processing
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
6acbd6d308
|
added hack to fix scopes & CORS for bookmarklet
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
30a357e27f
|
added CORS middleware
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
7fb440a855
|
bookmarklet passing data to form
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
1568d86143
|
fixed missing space in keyword when adding recipe
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
58e33ef31a
|
more cleanup from ugly merge
|
2021-05-01 16:30:20 -05:00 |
|
vabene1111
|
3daebc4170
|
Merge branch 'develop' into json_import
|
2021-05-01 22:39:20 +02:00 |
|
vabene1111
|
ec95f8032c
|
fixed recipe url import issue on some pages without images
|
2021-04-26 16:41:48 +02:00 |
|
smilerz
|
a1572a4809
|
changed keyword to get_or_create
|
2021-04-20 09:15:03 -05:00 |
|
smilerz
|
2b5dceee7c
|
WIP
|
2021-04-20 08:09:42 -05:00 |
|
smilerz
|
987be4b04d
|
Fix after rebase
|
2021-04-16 09:02:27 -05:00 |
|
smilerz
|
eb2593aacd
|
handle text in cook times during import
|
2021-04-16 09:02:04 -05:00 |
|
smilerz
|
7524609cd0
|
retrieve bookmarklet ID from get
|
2021-04-16 09:02:03 -05:00 |
|
smilerz
|
c8a4861df8
|
redirect to import url for processing
|
2021-04-16 09:02:02 -05:00 |
|
smilerz
|
5e27cd606e
|
added hack to fix scopes & CORS for bookmarklet
|
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
|
21f6c7a21f
|
fixed missing space in keyword when adding recipe
|
2021-04-16 09:02:02 -05:00 |
|
smilerz
|
7c8d41753c
|
more cleanup from ugly merge
|
2021-04-16 09:02:01 -05:00 |
|
smilerz
|
fd09ae1510
|
add description to recipe on submit
|
2021-03-18 15:55:11 -05:00 |
|
vabene1111
|
7e38e946a5
|
fixed various space related bugs
|
2021-03-11 16:41:05 +01:00 |
|
vabene1111
|
beb4aa634f
|
forms
|
2021-02-20 23:42:44 +01:00 |
|
vabene1111
|
96c963795e
|
more spaces work
|
2021-02-20 18:47:14 +01:00 |
|
vabene1111
|
c41c319d25
|
added servings to url import
|
2021-01-21 19:39:06 +01:00 |
|
Tobias Lindenberg
|
2d8c6ef44a
|
views/data
|
2021-01-10 12:10:54 +01:00 |
|
Tobias Lindenberg
|
4fa6919ca0
|
sort views imports
|
2021-01-10 11:55:21 +01:00 |
|
vabene1111
|
78fa5338d3
|
fixed ingredient dropping on parser fail
|
2021-01-07 22:56:05 +01:00 |
|
vabene1111
|
29e1d1286c
|
fixed importer empty units
|
2020-12-26 15:17:37 +01:00 |
|
vabene1111
|
f72fc699f8
|
fixed import image error
|
2020-12-15 22:54:10 +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
|
5bad507845
|
fixed and improved URL import
|
2020-07-05 21:11:25 +02:00 |
|
vabene1111
|
df912b8865
|
renamed recipeingredient to ingredient
|
2020-06-25 21:37:18 +02:00 |
|
vabene1111
|
f685253645
|
renamed ingredient to food
|
2020-06-25 21:24:03 +02:00 |
|
vabene1111
|
73f2240763
|
fixed import error
|
2020-06-23 14:00:07 +02:00 |
|
vabene1111
|
5ed369ba69
|
recipe import unit/ingredeitn selection
|
2020-06-23 12:34:00 +02:00 |
|
vabene1111
|
98c278fe60
|
importing improvements
|
2020-06-23 11:04:49 +02:00 |
|
vabene1111
|
8594346488
|
basic importing working
|
2020-06-23 10:34:04 +02:00 |
|
vabene1111
|
9e748552b2
|
recipe url import ld json
|
2020-06-22 21:16:31 +02:00 |
|
vabene1111
|
2904d5938d
|
fixed sync create permission
|
2020-06-17 13:00:13 +02:00 |
|
vabene1111
|
b53f83a76c
|
improved stats page
|
2020-04-29 17:18:12 +02:00 |
|
vabene1111
|
1617fa7a3f
|
fixed permissions comments, books
|
2020-04-27 16:50:05 +02:00 |
|
vabene1111
|
ad467fae28
|
added basic group permission system
|
2020-04-26 17:21:44 +02:00 |
|
vabene1111
|
7518d8c6b1
|
fixed several rewrite issues
|
2020-03-17 17:36:05 +01:00 |
|
vabene1111
|
95993c087b
|
case insensitive batch edit
|
2019-12-01 23:07:13 +01:00 |
|
vabene1111
|
14130f4417
|
translations
|
2019-11-21 14:37:31 +01:00 |
|
vabene1111
|
404516d677
|
fixed missing user at import
|
2019-11-15 15:03:32 +01:00 |
|
vabene1111
|
b98f87499a
|
removed categories
|
2019-11-13 21:46:03 +01:00 |
|
vabene1111
|
be32b3f63e
|
share link fixed
|
2018-06-07 00:29:00 +02:00 |
|