Commit Graph

310 Commits

Author SHA1 Message Date
vabene1111
ad163509b4 updated edit and added space find methods 2021-02-19 18:09:42 +01:00
vabene1111
fb58d35029 space stuff partially working 2021-02-19 15:50:55 +01:00
vabene1111
c42266b82c basic space stuff 2021-02-19 11:53:30 +01:00
vabene1111
894d2d2e6b gracful recipes api error on wrong format of update_at 2021-02-16 22:14:40 +01:00
vabene1111
ff0cd6fa93 fixed import log 2021-02-15 15:30:19 +01:00
vabene1111
46a9d19374 safron import 2021-02-09 17:34:38 +01:00
vabene1111
6ba1ff4505 added chowdown importer 2021-02-09 17:15:47 +01:00
vabene1111
5d1d6d4248 added mealie importer 2021-02-08 21:19:46 +01:00
vabene1111
7d051336d3 basic nextcloud import 2021-02-08 19:09:45 +01:00
vabene1111
79da8db889 added paprika import 2021-02-08 13:47:06 +01:00
vabene1111
086570ce90 using new import/export module 2021-02-08 11:38:38 +01:00
vabene1111
e0acd1de83 importing with image files working 2021-02-07 14:50:43 +01:00
vabene1111
3e7f96c0b8 basic export to zip working 2021-02-07 13:43:24 +01:00
vabene1111
d45adc1688 wip on new import/export system 2021-02-07 13:27:15 +01:00
vabene1111
103878e107 shopping list shortcut link 2021-02-03 23:05:42 +01:00
vabene1111
bcd2e44493 added simple entry mode to shopping 2021-02-03 19:38:09 +01:00
vabene1111
cc980b2e8a fixed broken test for good and improved file api 2021-01-28 16:21:19 +01:00
vabene1111
c30ce471c2 api permissions + shopping list on mobile 2021-01-28 14:41:00 +01:00
vabene1111
63cfa14a21 allauth working and integrated 2021-01-28 13:40:07 +01:00
vabene1111
53c715b6f6 Merge branch 'develop' into feature/allauth
# Conflicts:
#	requirements.txt
2021-01-28 12:07:30 +01:00
vabene1111
a0ebc47ade api permission fixes + shopping list default view mode 2021-01-26 22:15:09 +01:00
vabene1111
09716f2b00 wip supermarket categories 2021-01-25 21:58:24 +01:00
vabene1111
477236009c disable settings in demo 2021-01-22 22:38:16 +01:00
vabene1111
d9feb61e85 updated documentation 2021-01-22 21:58:39 +01:00
vabene1111
f1b7ed7d7a added option to choose webdav path 2021-01-22 20:29:29 +01:00
vabene1111
09062cb12c fixed recipe book api error 2021-01-21 20:57:26 +01:00
vabene1111
098f88e0b8 super basic working example 2021-01-21 20:54:55 +01:00
vabene1111
c41c319d25 added servings to url import 2021-01-21 19:39:06 +01:00
vabene1111
ec14338159 fixed share link with pre defined username 2021-01-21 14:42:49 +01:00
vabene1111
e5b7cf5f30 further improvised import/export feature 2021-01-19 21:41:52 +01:00
vabene1111
961b3f07b5 added demo setting 2021-01-17 14:37:34 +01:00
vabene1111
08733751aa add to book reimplemented 2021-01-14 01:21:15 +01:00
vabene1111
910dc29f06 updated javascript files 2021-01-13 22:48:50 +01:00
vabene1111
9e5a7b2cc0 added loading spinner and made new view the main recipe view 2021-01-13 20:59:31 +01:00
vabene1111
23bd0a7d90 fixed recipe context menu 2021-01-13 15:51:13 +01:00
vabene1111
95aff5c998 cook log 2021-01-13 15:21:51 +01:00
vabene1111
6ff0e3b7b3 slowly looking somewhat decently 2021-01-13 03:13:07 +01:00
vabene1111
bb43ed203a display of external recipes 2021-01-13 02:16:16 +01:00
vabene1111
ea2f493e01 fixed request context for recipe serializer on import 2021-01-12 21:40:14 +01:00
vabene1111
c561ddc08c fixed share link 2021-01-11 10:04:45 +01:00
Tobias Lindenberg
8ddbc34017 resolve conflicts
Signed-off-by: Tobias Lindenberg <tobias@lindenberg.pm>
2021-01-10 14:44:20 +01:00
Tobias Lindenberg
4dad26102a fix recipeimport 2021-01-10 13:28:57 +01:00
Tobias Lindenberg
afc7718c95 urls 2021-01-10 13:28:18 +01:00
Tobias Lindenberg
00f9bc087c views/view 2021-01-10 12:42:24 +01:00
Tobias Lindenberg
f2c658cb2d views/new 2021-01-10 12:25:28 +01:00
Tobias Lindenberg
c35f71370e views/lists 2021-01-10 12:22:22 +01:00
Tobias Lindenberg
edb9c883f7 views/import_export 2021-01-10 12:19:39 +01:00
Tobias Lindenberg
0405c123f4 views/edit 2021-01-10 12:16:10 +01:00
Tobias Lindenberg
b84a330883 views/delete 2021-01-10 12:12:16 +01:00
Tobias Lindenberg
2d8c6ef44a views/data 2021-01-10 12:10:54 +01:00