Commit Graph

1164 Commits

Author SHA1 Message Date
vabene1111
a112824578 maybe fixed container build 2021-01-28 15:19:12 +01:00
vabene1111
6192277778 working on authentication 2021-01-28 15:11:38 +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
d2a0bb1ec1
Merge pull request #362 from vabene1111/dependabot/pip/pre-commit-2.10.0
Bump pre-commit from 2.9.3 to 2.10.0
2021-01-28 10:48:54 +01:00
dependabot[bot]
d826b9f38a
Bump pre-commit from 2.9.3 to 2.10.0
Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.9.3 to 2.10.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.9.3...v2.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-28 06:15:44 +00:00
vabene1111
e8d9cc6ad9 shopping list null entry 2021-01-27 17:48:08 +01:00
vabene1111
e9689d347c
Merge pull request #356 from vabene1111/dependabot/pip/bleach-3.2.3
Bump bleach from 3.2.2 to 3.2.3
2021-01-27 08:44:11 +01:00
dependabot[bot]
b275fdcf62
Bump bleach from 3.2.2 to 3.2.3
Bumps [bleach](https://github.com/mozilla/bleach) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/mozilla/bleach/releases)
- [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES)
- [Commits](https://github.com/mozilla/bleach/compare/v3.2.2...v3.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-27 06:17:50 +00: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
384a49b1c6 updated docs 2021-01-22 22:48:14 +01:00
vabene1111
477236009c disable settings in demo 2021-01-22 22:38:16 +01:00
vabene1111
93cff8873e docs type 2021-01-22 22:12:17 +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
bf3fe1c716
Merge pull request #351 from vabene1111/dependabot/pip/pyyaml-5.4.1
Bump pyyaml from 5.4 to 5.4.1
2021-01-21 09:39:47 +01:00
vabene1111
fede79fc04
Merge pull request #352 from vabene1111/dependabot/pip/bleach-3.2.2
Bump bleach from 3.2.1 to 3.2.2
2021-01-21 09:39:34 +01:00