Commit Graph

522 Commits

Author SHA1 Message Date
vabene1111
086570ce90 using new import/export module 2021-02-08 11:38:38 +01:00
vabene1111
e0acd1de83 importing with image files working 2021-02-07 14:50:43 +01:00
vabene1111
d45adc1688 wip on new import/export system 2021-02-07 13:27:15 +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
vabene1111
8d65d20d1f account linking and docs update 2021-01-28 16:10:26 +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
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
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
00875c0d8e added help page linking 2021-01-22 21:32:29 +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
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
b563447674 ingredient linking fixed + tests fixed 2021-01-19 21:26:20 +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
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
50829dce47 fixed access for shared recipes 2021-01-13 22:59:19 +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
f9059f636c update docs + removed old import 2021-01-13 15:25:34 +01:00