vabene1111
6781128c1b
added help to import/export
2021-02-09 18:02:45 +01:00
vabene1111
73b7f60222
translations
2021-02-09 18:01:32 +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
58c5b2c301
add paprika import image support
2021-02-09 16:10:28 +01:00
vabene1111
5d1d6d4248
added mealie importer
2021-02-08 21:19:46 +01:00
vabene1111
149c5b5f5e
nextcloud import working with images
2021-02-08 19:19:56 +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
d2783429a1
added documentation to importer
2021-02-08 11:26:41 +01:00
vabene1111
de19a10cba
more abstract import/export interface
2021-02-08 11:18:13 +01:00
vabene1111
f312631676
import tag recipes and show results after import
2021-02-08 10:54:04 +01:00
vabene1111
e0acd1de83
importing with image files working
2021-02-07 14:50:43 +01:00
vabene1111
585c31490a
export recipe without wrting files
2021-02-07 14:01:37 +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
b0fe98c091
fixed shopping url
2021-02-03 23:50:33 +01:00
vabene1111
103878e107
shopping list shortcut link
2021-02-03 23:05:42 +01:00
vabene1111
175fca2b39
Merge pull request #386 from cesarblancg/develop
...
Solving Apple web app issue
2021-02-03 20:35:32 +01:00
vabene1111
4600aab13a
fixed unit merge bug
2021-02-03 20:28:36 +01:00
vabene1111
966a107414
fixed merge of uncreated food entries
2021-02-03 20:15:42 +01:00
vabene1111
69674e2648
allow entry mode toggle
2021-02-03 19:51:43 +01:00
vabene1111
bcd2e44493
added simple entry mode to shopping
2021-02-03 19:38:09 +01:00
cesarblancg
e745e4be0c
Solving ipad pro issue
2021-02-03 18:49:48 +01:00
transifex-integration[bot]
e50d3233fd
Apply translations in nl
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
2021-01-29 18:41:14 +00:00
vabene1111
cc980b2e8a
fixed broken test for good and improved file api
2021-01-28 16:21:19 +01:00
vabene1111
93e965697a
updated test to reflect new permission
2021-01-28 16:17:29 +01:00
vabene1111
8d65d20d1f
account linking and docs update
2021-01-28 16:10:26 +01:00
vabene1111
148324b37f
fixed nutrition value database duplication
2021-01-28 14:44:23 +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
96146a388a
added recipes to shopping list
2021-01-28 11:20:51 +01:00
vabene1111
e8d9cc6ad9
shopping list null entry
2021-01-27 17:48:08 +01:00
vabene1111
a0ebc47ade
api permission fixes + shopping list default view mode
2021-01-26 22:15:09 +01:00
vabene1111
b698fad83a
fixed no_amount ingredients showing units in ingredient list
2021-01-26 22:00:46 +01:00
vabene1111
5e53c66eaa
added ingredient headers again
2021-01-26 21:55:36 +01:00
vabene1111
37008ef290
added unaccent filter for recipe search
2021-01-26 21:14:33 +01:00
vabene1111
35ee5847ca
shopping list and docs
2021-01-26 20:58:19 +01:00
vabene1111
935dee853e
added ordering of supermarket categories
2021-01-26 19:19:42 +01:00
vabene1111
7b75e279b0
shopping list ui somewhat bearable
2021-01-26 18:21:45 +01:00
vabene1111
15c758b24a
update food after changing category
2021-01-26 18:08:41 +01:00
vabene1111
26ec1724a5
updating food working
2021-01-26 17:56:43 +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
138a29770a
added supermarket categories to shopping
2021-01-25 21:20:40 +01:00
vabene1111
36584346cb
fixed merging and added shopping ignored ingredients
2021-01-25 20:46:19 +01:00
vabene1111
c7dd5dd8bb
wip shopping list stuff
2021-01-25 18:21:55 +01:00
vabene1111
a16ad2c887
added ingredient merging to shopping list
2021-01-25 17:24:03 +01:00
vabene1111
ca728b45ca
made it possible to disable signup
2021-01-24 16:41:25 +01:00
vabene1111
9fd87dbf23
fixed misaligned check buttons
2021-01-24 16:14:56 +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
00875c0d8e
added help page linking
2021-01-22 21:32:29 +01:00
vabene1111
f1b7ed7d7a
added option to choose webdav path
2021-01-22 20:29:29 +01:00
vabene1111
fce293e722
fixed tests
2021-01-21 20:58:20 +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
6992bf83aa
added customizable Servings text
2021-01-21 20:05:46 +01:00
vabene1111
32044907bf
template hint
2021-01-21 19:58:18 +01:00
vabene1111
3fcd613ca8
fixed side buttons in recipe edit moving under sticky nav
2021-01-21 19:45:12 +01:00
vabene1111
5b8a22762b
fixed print for new recipe view
2021-01-21 19:40:47 +01:00
vabene1111
c41c319d25
added servings to url import
2021-01-21 19:39:06 +01:00
vabene1111
6690c3b206
fixed service worker caching problem
2021-01-21 19:08:36 +01:00
vabene1111
56bcd4f887
very basic offline page working
2021-01-21 18:39:24 +01:00
vabene1111
47c690526e
service worker stuff work in progress
2021-01-21 16:16:49 +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
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
