vabene1111
7e38e946a5
fixed various space related bugs
2021-03-11 16:41:05 +01:00
vabene1111
b552badff7
fixed limit random recipe
2021-03-11 15:37:37 +01:00
vabene1111
e7f8d58a7d
added test for cook log
2021-03-10 21:25:18 +01:00
vabene1111
528f329ebb
new keyword api test working
2021-03-10 20:31:00 +01:00
smilerz
bfaed434cc
refactored url_import to use recipe-scraper
2021-03-03 21:08:34 -06:00
vabene1111
d01f7409bf
removed django-random-queryset
...
the looping strategy is not efficient when using spacing as ids for a single user might be spaced far apart. A single user also only has a few hundred recipes so using the order by ? method should be more efficient and also automatically be compatible with spaces
2021-02-25 16:44:42 +01:00
smilerz
3ac22c08ff
fixed duplicate keyword handling
2021-02-24 18:52:04 -06:00
vabene1111
40387428e7
recipe filter
2021-02-21 16:49:34 +01:00
vabene1111
46fb02376e
recipe share basics
2021-02-21 16:37:04 +01:00
vabene1111
24e43e3e2e
updated migrations + setup process update
2021-02-21 15:34:35 +01:00
vabene1111
846c660811
usr signup and more
2021-02-21 15:08:43 +01:00
vabene1111
beb4aa634f
forms
2021-02-20 23:42:44 +01:00
vabene1111
58c6077925
basic test stuff
2021-02-20 22:56:29 +01:00
vabene1111
96c963795e
more spaces work
2021-02-20 18:47:14 +01:00
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
smilerz
fc5455a0f2
Revert "added new keyword management page"
...
This reverts commit 6962b0e218
2021-02-18 07:27:43 -06:00
smilerz
28d8f62af7
Revert "add filter to new keywords page"
...
This reverts commit c6dd55df4e
2021-02-18 07:25:31 -06:00
smilerz
c6dd55df4e
add filter to new keywords page
2021-02-17 10:45:31 -06:00
smilerz
6962b0e218
added new keyword management page
2021-02-17 07:09:19 -06: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
Tobias Lindenberg
6af5f59c80
views/api
2021-01-10 12:06:49 +01:00
Tobias Lindenberg
3c4384e2f6
views/__init__
2021-01-10 12:06:40 +01:00
vabene1111
e50239f067
added basic service worker
2021-01-10 12:00:16 +01:00
Tobias Lindenberg
4fa6919ca0
sort views imports
2021-01-10 11:55:21 +01:00
Tobias Lindenberg
86134eecb4
added unique constraint on RecipeBookEntry table
...
Signed-off-by: Tobias Lindenberg <tobias@lindenberg.pm>
2021-01-09 22:17:56 +01:00
vabene1111
78fa5338d3
fixed ingredient dropping on parser fail
2021-01-07 22:56:05 +01:00
Julian Pollinger
251bd88f70
Make the sticky navbar an option
2021-01-07 18:49:11 +01:00
vabene1111
320d94a223
fixed incorrect redirects for unauthenticated users
2021-01-05 23:24:58 +01:00
vabene1111
6b2d164585
fixed broken import chain
2021-01-05 21:48:44 +01:00
vabene1111
93b2e2d7e4
fixed small issues
2020-12-28 14:18:51 +01:00
vabene1111
8b2833f353
re added stuff
2020-12-28 14:14:34 +01:00
vabene1111
29e1d1286c
fixed importer empty units
2020-12-26 15:17:37 +01:00
vabene1111
592bd4f11e
fixed some english translations
2020-12-26 13:46:55 +01:00
vabene1111
f72fc699f8
fixed import image error
2020-12-15 22:54:10 +01:00
vabene1111
910b28fe2d
meal plan date handling rewrite
2020-12-14 17:11:40 +01:00
vabene1111
56c9edd328
removed deprecated psycopg2
2020-12-14 15:11:41 +01:00
vabene1111
7732aa7646
added support for fractions
2020-12-14 14:08:11 +01:00
Sebastian Markgraf
c4fbad614e
Include random in filtermixin
2020-11-14 20:20:30 +01:00
vabene1111
4c92a4b39c
fixed shopping list recipe search
2020-11-14 11:20:43 +01:00
vabene1111
4dfda4439c
re added standard filter to recipe api
2020-11-04 16:53:49 +01:00
vabene1111
591d185b9d
improved random recipe queryset function
2020-11-04 15:09:35 +01:00
tourn
69a6edee99
Show random recipes in meal planner
2020-11-03 16:46:31 +01:00
vabene1111
f2a17fe3bb
fixed shopping list GET param regex
2020-10-20 22:51:19 +02:00
vabene1111
cd46203d55
added permission classes for sharing + tests
2020-10-15 23:41:38 +02:00
vabene1111
7bc09dfe89
finishes shopping lists
2020-09-29 14:15:18 +02:00
vabene1111
a9bad5e5f9
create shopping from mealplan
2020-09-29 12:41:59 +02:00
vabene1111
678cfaca12
fixed several shopping list issues
2020-09-22 12:01:11 +02:00
vabene1111
70df7c5307
improved autosync data efficency
2020-09-22 00:20:44 +02:00
vabene1111
f91d9fcfe2
autosync shopping list and settings
2020-09-21 23:54:46 +02:00
vabene1111
148ce2faef
shopping list item checking
2020-09-21 22:55:52 +02:00
vabene1111
0ff65d35dc
partial shopping list saving
2020-09-07 13:09:03 +02:00
vabene1111
7f68bbd25d
added link based signup
2020-09-01 21:35:37 +02:00
