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 |
|
vabene1111
|
8aa24d4771
|
per user meal types
|
2020-06-11 15:19:15 +02:00 |
|
vabene1111
|
a3dc5f283a
|
dynamic meal types
|
2020-06-02 11:46:16 +02:00 |
|
vabene1111
|
27297d170a
|
removed obsolte all_tags function
|
2020-06-02 11:07:11 +02:00 |
|
vabene1111
|
5706776002
|
added setting to disable recent viewed recipes
|
2020-06-02 10:53:32 +02:00 |
|
vabene1111
|
4a68a99907
|
show last viewd recipes on search page
|
2020-05-11 12:42:55 +02:00 |
|
vabene1111
|
123dc1a74d
|
meal plan entry view
|
2020-05-08 00:10:23 +02:00 |
|
vabene1111
|
2e23fcfd5d
|
added sharing to meal plan + fixed meal plan visibility
|
2020-05-07 23:16:24 +02:00 |
|
vabene1111
|
6a963c26b2
|
recipe rating
|
2020-05-02 17:31:35 +02:00 |
|
vabene1111
|
37f7326f4c
|
minor mealplan cleanups
|
2020-05-02 14:58:23 +02:00 |
|
vabene1111
|
e9da17151a
|
added title field and custom validation
|
2020-05-02 14:53:09 +02:00 |
|
vabene1111
|
0d0c6c9066
|
Merge branch 'feature/plan-title' into mealplan-recipes-optional
|
2020-05-02 14:44:15 +02:00 |
|
vabene1111
|
4620c78f5a
|
user preference fixes and improvements
|
2020-05-02 14:41:54 +02:00 |
|
vabene1111
|
349b9629f8
|
added sharing to recipe books
|
2020-05-02 14:15:56 +02:00 |
|
vabene1111
|
64ee18c4d8
|
improved recipe book design
|
2020-05-02 13:58:42 +02:00 |
|
vabene1111
|
3a9e5a80ba
|
final style touches + settings
|
2020-05-02 12:48:22 +02:00 |
|
vabene1111
|
1617fa7a3f
|
fixed permissions comments, books
|
2020-04-27 16:50:05 +02:00 |
|
vabene1111
|
43eb10e488
|
added basic exporting capability
|
2020-04-25 22:05:55 +02:00 |
|
vabene1111
|
4e9e628162
|
added ability to change default page
|
2020-04-13 22:52:02 +02:00 |
|
vabene1111
|
4f49b06704
|
user setting default ingredient unit
|
2020-04-13 22:37:50 +02:00 |
|
tourn
|
08cccfa133
|
Allow mealplan items to have no recipes
And display first line of notes in plan
|
2020-04-13 21:29:22 +02:00 |
|
vabene1111
|
f1c5a0ef5f
|
character limit increased
|
2020-04-07 18:46:20 +02:00 |
|
vabene1111
|
9e524a8f22
|
added user name change
|
2020-03-18 12:51:13 +01:00 |
|
vabene1111
|
0c2b3d2d03
|
added ingredient notes + removed null constraints
|
2020-03-17 22:47:17 +01:00 |
|
vabene1111
|
90dbc36402
|
added ability to link recipes to ingredients
|
2020-03-17 18:44:11 +01:00 |
|
vabene1111
|
17b9519fa9
|
refactor generic url creation
|
2020-03-17 17:23:39 +01:00 |
|
vabene1111
|
09ff7e82f1
|
django admin cleanup
|
2020-03-17 16:16:04 +01:00 |
|
vabene1111
|
9853cecabb
|
fixed keywords without icons
|
2020-03-16 14:48:04 +01:00 |
|
vabene1111
|
88dc713683
|
WIP pdf embedding
|
2020-02-19 16:55:13 +01:00 |
|
vabene1111
|
41bfa95cb2
|
nav color theming
|
2020-02-17 00:11:15 +01:00 |
|
vabene1111
|
7d4630e3af
|
normalized ingredients
|
2020-02-16 23:22:44 +01:00 |
|
vabene1111
|
f77aa7c8f0
|
migrating ingredients
|
2020-02-16 23:12:16 +01:00 |
|
vabene1111
|
81677a74bb
|
made flatly default theme + fixed preview image
|
2020-02-16 22:58:24 +01:00 |
|
vabene1111
|
cc7422a503
|
theming refactor
moved server side for a better page loading experience and less javascript mess
|
2020-02-13 23:47:24 +01:00 |
|
vabene1111
|
a2348f531b
|
basics of ingredient unit normalization
|
2020-01-30 12:26:47 +01:00 |
|
vabene1111
|
227d90d49d
|
basic shopping view
|
2020-01-30 00:28:01 +01:00 |
|
vabene1111
|
becdcdc6a4
|
small meal plan fixes
|
2020-01-17 18:31:46 +01:00 |
|
vabene1111
|
7449380434
|
meal plan WIP
|
2020-01-17 16:02:14 +01:00 |
|
vabene1111
|
38bfb96b46
|
various image related fixes
|
2019-12-26 12:06:18 +01:00 |
|
vabene1111
|
42faafef9f
|
added waiting time
|
2019-12-26 11:32:04 +01:00 |
|
vabene1111
|
6a010587bf
|
tweaked compression and upload limit
|
2019-12-25 19:41:25 +01:00 |
|
vabene1111
|
3cb01d6332
|
added recipe images
|
2019-12-25 16:46:16 +01:00 |
|
vabene1111
|
d90b012601
|
recipe books
|
2019-12-25 12:53:09 +01:00 |
|
vabene1111
|
8fcafcc25a
|
bookmarks wip
|
2019-12-24 15:06:58 +01:00 |
|
vabene1111
|
a4a62af3d2
|
storage permission
|
2019-12-09 11:34:44 +01:00 |
|
vabene1111
|
e62219f031
|
ingredients saving
|
2019-11-19 20:42:10 +01:00 |
|
vabene1111
|
48d1b8d952
|
changed ingredient field typ
|
2019-11-18 13:28:31 +01:00 |
|
vabene1111
|
cb35666f0e
|
various fixes
|
2019-11-18 13:26:56 +01:00 |
|
vabene1111
|
ce27ae88f1
|
time
|
2019-11-15 15:00:25 +01:00 |
|
vabene1111
|
9bd5e737a9
|
recipe conversion + cleanup
|
2019-11-15 14:33:24 +01:00 |
|
vabene1111
|
a3da7c2ffd
|
lots of cleanup and refactoring
|
2019-11-14 18:28:50 +01:00 |
|
vabene1111
|
c8df93dd5f
|
nextcloud links 90% working
|
2019-11-14 12:42:26 +01:00 |
|
vabene1111
|
2114ed037a
|
refactored storage backend
|
2019-11-14 10:29:24 +01:00 |
|
vabene1111
|
9a22c37862
|
comments
|
2019-11-14 10:06:51 +01:00 |
|
vabene1111
|
16cf81ab4a
|
view local recipes
|
2019-11-14 08:57:50 +01:00 |
|
Kaibu
|
97ab231231
|
fixed decimalfield
|
2019-11-14 00:12:07 +01:00 |
|
Kaibu
|
3ea37b217d
|
added amount to ingredients
|
2019-11-14 00:09:13 +01:00 |
|
vabene1111
|
b54da49858
|
basic local recipes
|
2019-11-13 22:38:43 +01:00 |
|
vabene1111
|
b98f87499a
|
removed categories
|
2019-11-13 21:46:03 +01:00 |
|
vabene1111
|
8b6f7bd7cb
|
fixed link creation and updated model
|
2018-06-06 23:31:47 +02:00 |
|
vabene1111
|
2e2144a9e3
|
added file id
|
2018-06-06 23:05:22 +02:00 |
|
Unknown
|
fb852b35a6
|
improvements and fixes
|
2018-06-01 15:53:06 +02:00 |
|
vabene1111
|
4871b6194c
|
storage backend reworked
|
2018-05-25 16:49:10 +02:00 |
|
vabene1111
|
7bc102f8df
|
improved search filter
|
2018-05-25 12:57:12 +02:00 |
|
vabene1111
|
0acecba367
|
visual improvements
|
2018-05-15 22:58:29 +02:00 |
|
vabene1111
|
b92c6dd88f
|
misc fixes and updates
|
2018-05-15 20:59:52 +02:00 |
|
vabene1111
|
87b7f0d204
|
emojis and migrations
|
2018-05-14 11:31:17 +02:00 |
|
vabene1111
|
8107e46b60
|
class filter tag
|
2018-05-07 00:38:37 +02:00 |
|
vabene1111
|
9b2d2bea4d
|
renamed models + new migrations + initial data
|
2018-05-06 23:50:40 +02:00 |
|
vabene1111
|
e09b4d3074
|
sync working
|
2018-03-30 23:37:31 +02:00 |
|
vabene1111
|
37639ad4c7
|
generic views
|
2018-03-30 22:41:23 +02:00 |
|
Unknown
|
d3a169a20d
|
messages + misc
|
2018-02-09 12:59:28 +01:00 |
|
vabene1111
|
59641e1af6
|
more nice things
|
2018-02-05 23:59:31 +01:00 |
|
vabene1111
|
ede7ddac0b
|
modal + link caching
|
2018-02-05 23:18:57 +01:00 |
|
vabene1111
|
35d8d50861
|
dropbox integration stuff
|
2018-02-05 19:57:32 +01:00 |
|
Unknown
|
4d3e8e6b53
|
forms
|
2018-02-01 15:05:53 +01:00 |
|
vabene1111
|
9bdc303f0e
|
overview + center
|
2018-02-01 00:20:47 +01:00 |
|
vabene1111
|
c382e9df24
|
basic stuff
|
2018-01-31 23:40:16 +01:00 |
|