Commit Graph

860 Commits

Author SHA1 Message Date
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