vabene1111
b563447674
ingredient linking fixed + tests fixed
2021-01-19 21:26:20 +01:00
vabene1111
523a2b41d1
fixed keyboard import edit
2021-01-19 21:11:02 +01:00
vabene1111
a0741f6ad3
added warning message to meal plan if no type is given
2021-01-19 20:55:51 +01:00
vabene1111
b52c3d6bd4
testing with the offline page
2021-01-17 21:26:56 +01:00
vabene1111
803369a7a6
basic offline page working
2021-01-17 21:11:03 +01:00
vabene1111
2e3e629406
actually decent service worker wip
2021-01-17 18:33:12 +01:00
vabene1111
d7894e07e9
service worker stuff
2021-01-17 16:58:50 +01:00
vabene1111
63dbdfa4a6
removed service worker stuff
2021-01-17 14:47:13 +01:00
vabene1111
961b3f07b5
added demo setting
2021-01-17 14:37:34 +01:00
vabene1111
f18980a9e2
workbox expirments
2021-01-14 13:31:56 +01:00
vabene1111
08733751aa
add to book reimplemented
2021-01-14 01:21:15 +01:00
vabene1111
b271f81af2
updated hook + compiled again
2021-01-14 00:05:42 +01:00
vabene1111
d99e523608
added pre commit hooks and some other workflow stuff
2021-01-14 00:00:26 +01:00
vabene1111
50829dce47
fixed access for shared recipes
2021-01-13 22:59:19 +01:00
vabene1111
910dc29f06
updated javascript files
2021-01-13 22:48:50 +01:00
vabene1111
642015b368
testing docker stuff
2021-01-13 22:17:40 +01:00
vabene1111
99f06955dc
corrected servings factor
2021-01-13 21:35:39 +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
f9059f636c
update docs + removed old import
2021-01-13 15:25:34 +01:00
vabene1111
95aff5c998
cook log
2021-01-13 15:21:51 +01:00
vabene1111
bf9b8a0230
updated ci + build static files
2021-01-13 13:28:31 +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
vabene1111
a59ac44f3b
recipe page styling
2021-01-13 10:57:38 +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
1bb412e007
sanitize inputs of jinja so that output does not need to be
2021-01-13 01:34:21 +01:00
vabene1111
e69d1c3408
save
2021-01-13 01:23:20 +01:00
vabene1111
0eebd438ca
commit
2021-01-13 01:08:51 +01:00
vabene1111
983d40f2c1
save WIP
2021-01-12 23:28:13 +01:00
vabene1111
bbd01fdb04
Merge branch 'develop' into feature/vue
2021-01-12 21:40:32 +01:00
vabene1111
ea2f493e01
fixed request context for recipe serializer on import
2021-01-12 21:40:14 +01:00
vabene1111
24ed6a1cd2
recipe stuff
2021-01-12 20:51:28 +01:00
vabene1111
816ced83b5
currently everything working
2021-01-12 19:50:21 +01:00
transifex-integration[bot]
9203b8e985
Apply translations in ca
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'ca' language.
2021-01-11 22:37:24 +00:00
vabene1111
7b936ec4fd
removed some debug code
2021-01-11 22:00:40 +01:00
vabene1111
99f0ab830b
localization in vue apps working
2021-01-11 22:00:23 +01:00
vabene1111
34028587fc
working on a recipe view
2021-01-11 18:31:06 +01:00
vabene1111
df0cfc3677
Merge branch 'develop' into feature/vue
2021-01-11 16:20:49 +01:00
vabene1111
16e2af8c5d
remove debug code from service worker
2021-01-11 16:20:32 +01:00
vabene1111
02aec7d6d6
very WIP
2021-01-11 16:19:37 +01:00
vabene1111
cb913f6cea
some test code and playing around
2021-01-11 15:04:35 +01:00
vabene1111
5bb20bd479
Merge branch 'develop' into feature/vue
2021-01-11 10:04:55 +01:00
vabene1111
c561ddc08c
fixed share link
2021-01-11 10:04:45 +01:00
vabene1111
fd3743377b
Merge pull request #328 from bloomcake/small-cleanup
...
Small cleanup
2021-01-11 09:55:14 +01:00
transifex-integration[bot]
f2028ee928
Apply translations in it
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
2021-01-10 23:01:06 +00:00
Tobias Lindenberg
8ddbc34017
resolve conflicts
...
Signed-off-by: Tobias Lindenberg <tobias@lindenberg.pm>
2021-01-10 14:44:20 +01:00
Tobias Lindenberg
67581c7fa4
tests/api
2021-01-10 14:32:41 +01:00
Tobias Lindenberg
bc1f28eda6
tests/edits
2021-01-10 14:23:52 +01:00
Tobias Lindenberg
61daf9d5c9
tests/other
2021-01-10 14:16:28 +01:00
Tobias Lindenberg
a37c77bb84
tests/views
2021-01-10 14:14:27 +01:00
Tobias Lindenberg
6d2c48a1c8
tests/test_setup
2021-01-10 14:11:29 +01:00
Tobias Lindenberg
bed5b72864
templatetags/theming_tags
2021-01-10 14:10:21 +01:00
Tobias Lindenberg
325d6e4326
templatetags/custom_tags
2021-01-10 14:08:23 +01:00
Tobias Lindenberg
f7ff700c7a
provider/nextcloud
2021-01-10 14:06:58 +01:00
Tobias Lindenberg
41c8e53569
provider/dropbox
2021-01-10 14:03:57 +01:00
Tobias Lindenberg
ff8e431630
helper/init
2021-01-10 13:59:27 +01:00
Tobias Lindenberg
eb9b2ac6fe
helper/template_helper
2021-01-10 13:57:51 +01:00
Tobias Lindenberg
1ad468e652
helper/recipe_url_import
2021-01-10 13:57:06 +01:00
Tobias Lindenberg
986bda0c81
helper/permission_helper
2021-01-10 13:51:55 +01:00
Tobias Lindenberg
bb361001b9
helper/permissions_config
2021-01-10 13:47:23 +01:00
Tobias Lindenberg
26aa0207aa
helper/mdx_urlize
2021-01-10 13:46:53 +01:00
Tobias Lindenberg
8b1bd3c555
helper/ingredient_parser
2021-01-10 13:45:33 +01:00
Tobias Lindenberg
b59c7288b1
helper/ingredient_parser
2021-01-10 13:44:55 +01:00
Tobias Lindenberg
f5b456018d
helper/dal
2021-01-10 13:41:09 +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
e5ef19ffe4
tables
2021-01-10 13:15:01 +01:00
Tobias Lindenberg
ecf065db2b
serializer
2021-01-10 13:12:06 +01:00
Tobias Lindenberg
4c03d1eb87
models
2021-01-10 13:09:23 +01:00
Tobias Lindenberg
b71e9fe57d
forms
2021-01-10 13:05:04 +01:00
Tobias Lindenberg
7ab6276397
filters
2021-01-10 12:46:02 +01:00
Tobias Lindenberg
c7da37e7e7
admin
2021-01-10 12:44:42 +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
vabene1111
db6fe4256f
added shortcuts to manifest
2021-01-10 10:27:50 +01:00
vabene1111
b93b16d6eb
save WIP
...
not really getting the feel for this, will continue later, need to really learn how this works
2021-01-09 23:27:25 +01:00
vabene1111
6acf4bb831
Revert "temp save vue transition stuff"
...
This reverts commit 976cedd536
2021-01-09 23:11:37 +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
Johannes Stefan
b5e08a4828
added webmanifest to static files to improve mobile (shortcut) experience
2021-01-09 00:19:09 +01:00
vabene1111
976cedd536
temp save vue transition stuff
2021-01-08 22:31:48 +01:00
vabene1111
9044f9e1ff
testing with vue mixings and components
2021-01-07 23:58:04 +01:00
vabene1111
4b719af4e1
fixed broken microdata blowing up ingredient lists
2021-01-07 23:09:37 +01:00
vabene1111
78fa5338d3
fixed ingredient dropping on parser fail
2021-01-07 22:56:05 +01:00
vabene1111
e9f2b875b9
formatting
2021-01-07 22:47:53 +01:00
vabene1111
fe3f817bc5
Merge pull request #322 from jakobwenzel/fixIngredientParser
...
Fix ingredient parser to allow Plural-suffixes
2021-01-07 22:35:48 +01:00
vabene1111
5aadb66013
Merge pull request #321 from neferin12/develop
...
Sticky Navbar
2021-01-07 22:29:54 +01:00
Julian Pollinger
6225648e3a
Minor formatting
2021-01-07 21:50:26 +01:00
Jakob Wenzel
29903af085
catch error when trying to parse into ingredient/note
2021-01-07 19:49:02 +01:00
Jakob Wenzel
8ed2562454
allow plural-suffixes in ingredient parser
2021-01-07 19:30:07 +01:00
Jakob Wenzel
fd255fd6ad
added failing testcase for ingredient parser
2021-01-07 19:20:20 +01:00
Jakob Wenzel
8931fa8557
fix ingredient parser testcase
...
* call correct function
* flip assertion
2021-01-07 19:06:08 +01:00
Julian Pollinger
251bd88f70
Make the sticky navbar an option
2021-01-07 18:49:11 +01:00
vabene1111
2d82fc1ddd
fixed meal plan settings cookie expiring
2021-01-07 15:42:34 +01:00
Julian Pollinger
19df1cf65d
Sticky Navbar
2021-01-06 19:09:41 +01:00
Julian Pollinger
ebdd8fc053
Update base.html
2021-01-06 18:57:25 +01:00
vabene1111
320d94a223
fixed incorrect redirects for unauthenticated users
2021-01-05 23:24:58 +01:00
vabene1111
43ccc351c7
added changes typo fix
2021-01-05 22:54:57 +01:00
vabene1111
d36e4c6e0a
fixed another typoe
2021-01-05 22:54:46 +01:00
vabene1111
fdeede5717
updated vue and vue bootrap + template improvements
2021-01-05 22:53:08 +01:00
vabene1111
738b601462
templating working
2021-01-05 22:07:46 +01:00
vabene1111
2c93a2f177
Merge branch 'develop' into feature/templating
2021-01-05 21:48:50 +01:00
vabene1111
6b2d164585
fixed broken import chain
2021-01-05 21:48:44 +01:00
vabene1111
ee707eba5c
super basic templating working
2021-01-05 21:46:24 +01:00
vabene1111
f26b09cc0a
fixed broken translations in help_texts
2021-01-05 21:26:42 +01:00
transifex-integration[bot]
6a1d892e8b
Apply translations in it
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
2021-01-05 11:44:52 +00:00
vabene1111
2b9ad2feed
removed fixture based backup
...
many different things can lead to this method of backing up failing both on backup and on restore.
to not give the user a false sense of security this feature was removed for the time being.
once i have time i will add a proper backup system.
2021-01-04 00:30:39 +01:00
melkypie
ace7ee4274
Add latvian language
2020-12-31 18:47:07 +02:00
vabene1111
5a7c914fe7
added lots of user information
2020-12-31 13:38:16 +01:00
vabene1111
1bdf14dbf9
made and compiled messages + fixed lots of typos
2020-12-31 12:56:18 +01:00
vabene1111
6ef173d82d
fixed and cleand up a lot of servings related stuff
2020-12-31 12:44:19 +01:00
vabene1111
1e471ad40d
removed all trans tags from javascript code
...
replaced by django recommended javascript catalog
still need to sort out the different translation domains
2020-12-31 12:30:31 +01:00
vabene1111
4ff1a6bc93
Merge pull request #297 from lipschultz/created-by
...
Assign authenticated user to created_by
2020-12-31 12:16:16 +01:00
transifex-integration[bot]
9692e2386b
Apply translations in es
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'es' language.
2020-12-28 13:34:59 +00: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
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
vabene1111
1775b64ba4
better migration for unit fix
2020-12-27 23:10:22 +01:00
vabene1111
5a9270373f
Merge branch 'translations_cookbook-locale-en-lc-messages-django-po--develop_it' into develop
...
# Conflicts:
# cookbook/locale/it/LC_MESSAGES/django.po
2020-12-27 16:57:35 +01:00
transifex-integration[bot]
37f98ce9fe
Apply translations in it
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
2020-12-27 12:46:39 +00:00
vabene1111
fa556c9a7f
added migration to fix emtpy units
...
set all units to none for all recipes containing empty named units and delete them
2020-12-26 17:20:17 +01:00
vabene1111
29e1d1286c
fixed importer empty units
2020-12-26 15:17:37 +01:00
Michael Lipschultz
f489043077
Assign authenticated user to created_by
2020-12-26 09:09:47 -05:00
vabene1111
bdd004518c
verified and updated importer tests
2020-12-26 14:50:54 +01:00
vabene1111
840f5ec60d
added ingredient parser test
2020-12-26 13:57:51 +01:00
vabene1111
566eea1d75
Merge pull request #277 from l0c4lh057/master
...
Improve text to ingredient parsing
2020-12-26 13:52:24 +01:00
vabene1111
bb48655acb
Merge pull request #279 from l0c4lh057/improve
...
Minor improvements
2020-12-26 13:48:54 +01:00
vabene1111
d723165b1c
updated base translations
2020-12-26 13:48:33 +01:00
vabene1111
592bd4f11e
fixed some english translations
2020-12-26 13:46:55 +01:00
vabene1111
0aec23fcdd
added tests for recipe view permissions
2020-12-26 13:28:49 +01:00
vabene1111
d364994ed7
compiled messages
2020-12-26 13:14:36 +01:00
vabene1111
1f5c02bcc3
Merge branch 'develop' into translations_cookbook-locale-en-lc-messages-django-po--develop_nl
2020-12-26 10:52:27 +01:00
transifex-integration[bot]
f753b63b13
Apply translations in es
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'es' language.
2020-12-25 22:47:41 +00:00
tourn
6f3068a28c
Show default serving count in meal planner
2020-12-24 11:51:51 +01:00
tourn
aa57b47d18
Use correct serving count from recipe view -> add to shopping
2020-12-24 11:28:59 +01:00
tourn
113e9ef1e3
Merge remote-tracking branch 'upstream/develop' into recipe-serving-count
2020-12-24 11:17:56 +01:00
transifex-integration[bot]
5899527621
Apply translations in nl
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
2020-12-23 15:13:42 +00:00
Aaron
0a40de0f14
Add min/max to servings spinner
2020-12-22 23:52:40 +01:00
Aaron
bc31f013c0
Fix 'All Keywords' label in website import
2020-12-22 23:51:55 +01:00
Aaron
e7fc15dc72
Show advanced search again if it was used
2020-12-22 23:50:59 +01:00
Aaron
79396cec9e
switch from double to single quotes
2020-12-21 22:42:27 +01:00
Aaron
5e07c6130f
Switch to 4-space indentation
2020-12-21 20:14:32 +01:00
Aaron
94e1fdfbff
Improve text to ingredient parsing
...
The previous implementation of parsing ingredients was very simple. I now wrote a parser
that I would consider good. It takes care of several edge cases and notations.
- Supports fraction unicode (½, ¼, ⅜, ...)
- Supports notations like `1½` and `1 1/2`
- Supports unit directly after the amount without space inbetween (`2g`, `2½g`)
- Supports notes (`5g onion (cubed)` -> amount: 5, unit: g, ingredient: onion, note: cubed)
- Supports notes (`5g onion, cubed` -> amount: 5, unit: g, ingredient: onion, note: cubed)
- Does not break when both commas and brackets exist
2020-12-21 20:00:46 +01:00
transifex-integration[bot]
ec31d251ea
Apply translations in it
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
2020-12-18 12:09:20 +00:00
transifex-integration[bot]
3f6a342026
Apply translations in fr
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'fr' language.
2020-12-16 14:47:47 +00:00
vabene1111
f72fc699f8
fixed import image error
2020-12-15 22:54:10 +01:00
vabene1111
7ca88f3c0a
fixed scaling for fractions
2020-12-15 22:16:15 +01:00
vabene1111
ac2e9dd6cb
updated german translation
2020-12-15 22:04:40 +01:00
transifex-integration[bot]
6124501f5a
Apply translations in de
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'de' language.
2020-12-15 21:03:40 +00:00
vabene1111
4ec313f752
fixed another importer issue
2020-12-15 21:59:34 +01:00
vabene1111
dd07c56ede
fixed issue with new fraction importer
2020-12-15 21:52:56 +01:00
vabene1111
77fae46aee
translation updates
2020-12-15 21:39:42 +01:00
transifex-integration[bot]
247eab2a4f
Apply translations in ca
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'ca' language.
2020-12-15 12:00:28 +00:00
vabene1111
9ea90f1c87
fraction import
2020-12-14 19:56:21 +01:00
vabene1111
e7922a7e47
nutirtion fix
2020-12-14 19:12:01 +01:00
vabene1111
d3bc440c83
meal plan quality of life stuff
2020-12-14 17:37:51 +01:00
vabene1111
910b28fe2d
meal plan date handling rewrite
2020-12-14 17:11:40 +01:00
vabene1111
89cd8bc2d2
fixed wrong translation
2020-12-14 15:49:32 +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
vabene1111
9863447bac
small nutrition fixes
2020-12-14 12:56:18 +01:00
vabene1111
53b00cc4c8
Merge pull request #199 from sebimarkgraf/feature/nutrition
...
Add nutritional values
2020-12-14 12:29:56 +01:00
vabene1111
a5d2bd75d6
recompiled messages + added timezone setting
2020-12-14 12:03:43 +01:00
tourn
6fd9cf0d8c
Use serving count in shopping list
2020-11-20 15:22:58 +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
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
c413db5460
fixed english typo
2020-11-14 11:16:01 +01:00
vabene1111
0e319ff293
fixed typo in german transaltion
2020-11-14 11:15:21 +01:00
transifex-integration[bot]
19e2094ecd
Apply translations in nl
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
2020-11-13 22:21:02 +00:00
Sebastian Markgraf
2f038edf8c
Fix missing string literals for translations.
2020-11-06 17:24:20 +01:00
Sebastian Markgraf
a754002f4e
Revert approach to fixed nutritional values.
2020-11-06 17:22:21 +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
vabene1111
8d582548bd
Merge pull request #213 from tourn/random-recipes2
...
Show random recipes in meal planner
2020-11-04 15:06:50 +01:00
vabene1111
a1b15d46b8
fixed note only meal plan entries not working
2020-11-04 14:58:31 +01:00
tourn
69a6edee99
Show random recipes in meal planner
2020-11-03 16:46:31 +01:00
Tmaxxrox97
085e777ee0
Changed Username field label from "Name" to "Username"
2020-10-29 09:52:05 -05:00
vabene1111
e427d8b714
donst export checked items
2020-10-21 20:35:26 +02:00
vabene1111
89b8dbe57f
added online check to prevent message spam
2020-10-20 23:08:30 +02:00
vabene1111
f2a17fe3bb
fixed shopping list GET param regex
2020-10-20 22:51:19 +02:00
vabene1111
14e0dae6e3
compiled translations
2020-10-20 21:23:37 +02:00
transifex-integration[bot]
c542f3154e
Apply translations in de
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'de' language.
2020-10-20 19:22:06 +00:00
vabene1111
c6f40db7e3
shopping list tweaks
2020-10-20 20:54:15 +02:00
Sebastian Markgraf
31dabd4757
Add nutritions output
2020-10-18 17:31:56 +02:00
Sebastian Markgraf
7a89015ac5
Add migrations.
2020-10-16 23:59:19 +02:00
Sebastian Markgraf
2b1cde2efc
Add basic output for nutritions.
2020-10-16 23:44:18 +02:00
vabene1111
cb3b8c931e
fixed broken defautl share
2020-10-16 00:11:41 +02:00
