cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,362 Commits 2 Branches 0 Tags 57 MiB
b7b0b9c690
Commit Graph

227 Commits

Author SHA1 Message Date
smilerz
da24850d81 removed custom manager on Recipes 2021-06-09 20:39:18 -05:00
vabene1111
9eb17df575 added basic support for files 2021-06-08 20:17:48 +02:00
vabene1111
3aade540c1 file view 2021-06-08 13:12:04 +02:00
vabene1111
94c51f90cd fixed recipe book entry remove 2021-06-07 17:12:00 +02:00
vabene1111
3074d916dc many signup and space management fixes 2021-06-07 16:46:28 +02:00
smilerz
dc2a69e42a Fix after rebase 2021-06-06 14:25:14 -05:00
smilerz
26a5821cfc fuzzy match on lookups 2021-06-06 14:25:05 -05:00
smilerz
281149e247 search form and help doc 2021-06-06 14:25:05 -05:00
smilerz
591591e3dc search preference settings 2021-06-06 14:25:05 -05:00
smilerz
a956868eaf create indexes 2021-06-06 14:25:05 -05:00
smilerz
1df6ca685a split search vectors for recipe name and description 2021-06-06 14:25:05 -05:00
smilerz
43d223cf02 updated to handle sqlite 2021-06-06 14:25:04 -05:00
smilerz
d71f8ae006 working proof of concept 2021-06-06 14:25:04 -05:00
vabene1111
a970f0c00e made tandoor theme default 2021-06-05 16:38:38 +02:00
vabene1111
297dd6244a model metrics 2021-06-05 15:06:54 +02:00
vabene1111
02c5aed0a3 moved demo to space setting 2021-06-04 16:56:18 +02:00
Kaibu
ad24a44588 new tandoor theme added, minor ux fixes 2021-05-31 00:47:59 +02:00
vabene1111
c8054349b2 reworked invite system 2021-05-28 16:49:03 +02:00
smilerz
a69fb4922d updated model 2021-05-01 16:30:22 -05:00
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
7bc3292301 added bookmarklet model and api 2021-05-01 16:30:21 -05:00
vabene1111
7bc4ae9870 fixed paprika importer 2021-05-01 19:19:48 +02:00
vabene1111
99004ad34b new search and setting 2021-04-18 11:03:15 +02:00
vabene1111
25717f6a79 space max 2021-03-24 00:06:34 +01:00
vabene1111
afadc61d5d telegram bot 2021-03-18 22:34:53 +01:00
vabene1111
950315936e import log working 2021-03-18 18:30:12 +01:00
vabene1111
af1bc19fd8 fixed importer threading stuff 2021-03-18 18:08:22 +01:00
vabene1111
6a25428b3c fixed shopping list share permission 2021-03-18 11:04:55 +01:00
vabene1111
2149f4034b several shopping list improvements 2021-03-17 23:28:28 +01:00
vabene1111
e968a57c06 shopping list api tests and refactors 2021-03-17 20:42:17 +01:00
vabene1111
641feede74 space nested serializers 2021-03-17 19:55:34 +01:00
vabene1111
b48708652f delete model check fixes + sync log 2021-03-17 00:27:53 +01:00
vabene1111
d7402f60c5 meal plan api tests 2021-03-12 09:44:16 +01:00
vabene1111
846c660811 usr signup and more 2021-02-21 15:08:43 +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
vabene1111
bcd2e44493 added simple entry mode to shopping 2021-02-03 19:38:09 +01:00
vabene1111
935dee853e added ordering of supermarket categories 2021-01-26 19:19:42 +01:00
vabene1111
96c4823664 supermarket shopping list relation 2021-01-26 16:53:05 +01:00
vabene1111
5ab19b7958 supermarket category api working 2021-01-26 16:16:45 +01:00
vabene1111
09716f2b00 wip supermarket categories 2021-01-25 21:58:24 +01:00
vabene1111
a16ad2c887 added ingredient merging to shopping list 2021-01-25 17:24:03 +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
6992bf83aa added customizable Servings text 2021-01-21 20:05:46 +01:00
vabene1111
08733751aa add to book reimplemented 2021-01-14 01:21:15 +01:00
vabene1111
95aff5c998 cook log 2021-01-13 15:21:51 +01:00
vabene1111
c79432567c valid_until migration fix 2021-01-13 13:26:57 +01:00
vabene1111
ddc484562b recipe description 2021-01-13 13:26:48 +01:00
Tobias Lindenberg
4c03d1eb87 models 2021-01-10 13:09:23 +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
ee707eba5c super basic templating working 2021-01-05 21:46:24 +01:00
vabene1111
6ef173d82d fixed and cleand up a lot of servings related stuff 2020-12-31 12:44:19 +01:00
vabene1111
c4273a4c3f
Merge branch 'develop' into recipe-serving-count 2020-12-28 10:19:52 +01:00
vabene1111
95461316a5 prevent creation of empty string units 2020-12-27 23:12:24 +01:00
tourn
113e9ef1e3 Merge remote-tracking branch 'upstream/develop' into recipe-serving-count 2020-12-24 11:17:56 +01:00
vabene1111
7732aa7646 added support for fractions 2020-12-14 14:08:11 +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
Sebastian Markgraf
a754002f4e
Revert approach to fixed nutritional values. 2020-11-06 17:22:21 +01:00
tourn
69a6edee99 Show random recipes in meal planner 2020-11-03 16:46:31 +01:00
Sebastian Markgraf
2b1cde2efc
Add basic output for nutritions. 2020-10-16 23:44:18 +02:00
Sebastian Markgraf
368d631602
Add nutrition to model. 2020-10-15 22:03:25 +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
73f13f56e1 added ability to display message to users (via admin) 2020-09-22 12:36:27 +02:00
vabene1111
678cfaca12 fixed several shopping list issues 2020-09-22 12:01:11 +02:00
vabene1111
f91d9fcfe2 autosync shopping list and settings 2020-09-21 23:54:46 +02:00
vabene1111
34733a427f model __str__ methods 2020-09-01 21:37:33 +02:00
vabene1111
7f68bbd25d added link based signup 2020-09-01 21:35:37 +02:00
vabene1111
392ee73719 basics of invite link creation 2020-09-01 14:57:20 +02:00
tourn
652b4bf2af Add serving count to recipe 2020-08-30 16:00:01 +02:00
vabene1111
3c73b084cf super basic shopping list working 2020-08-26 21:11:20 +02:00
vabene1111
8055754455 shopping list basics 2020-08-11 12:17:12 +02:00
vabene1111
35e8dc4ce9 removed keyword created by as it was never populated 2020-07-09 21:55:05 +02:00
vabene1111
e83565b1f2 added api endpoints and tests 2020-07-08 23:19:39 +02:00
vabene1111
1619d4894c step header rendering 2020-07-02 12:12:17 +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
6eb41fe33f fixed keywords and food/unit loading 2020-06-29 22:41:54 +02:00
vabene1111
2c59302fe9 conditional header/no amount render 2020-06-29 22:01:42 +02:00
vabene1111
4ddc39f1c2 basic shopping list fix 2020-06-29 18:11:25 +02:00
vabene1111
27963fcaa6 image upload working 2020-06-29 15:39:58 +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
381bc5ffb4 partially working steps edit view 2020-06-25 23:48:27 +02:00
vabene1111
ae0928f85f added recipe steps 2020-06-25 22:38:17 +02:00
vabene1111
bf516d37a9 Merge branch 'develop' into feature/recipe-steps 2020-06-25 22:09:00 +02:00
vabene1111
6979bf34d9 fixed insecure uuid defaults 
due to some unexpected behavior the share link uuid values were not random. All already created share links were disabled.
 2020-06-25 22:01:54 +02:00
vabene1111
bda38f0647 changed recipe ingredient relation 2020-06-25 21:45:16 +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
8cd94d49e8 added comment system preference 2020-06-16 12:44:45 +02:00
vabene1111
dee7249347 added sharing links and appropriate tests 2020-06-16 11:23:58 +02:00
vabene1111
e89bd44412 added to string to meal plan 2020-06-11 23:43:48 +02:00
vabene1111
8ff52f542e ingredient rounding upgrades 2020-06-11 22:32:45 +02:00