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 |
|