Commit Graph

888 Commits

Author SHA1 Message Date
smilerz
fc5455a0f2 Revert "added new keyword management page"
This reverts commit 6962b0e218.
2021-02-18 07:27:43 -06:00
smilerz
28d8f62af7 Revert "add filter to new keywords page"
This reverts commit c6dd55df4e.
2021-02-18 07:25:31 -06:00
smilerz
c6dd55df4e add filter to new keywords page 2021-02-17 10:45:31 -06:00
smilerz
6962b0e218 added new keyword management page 2021-02-17 07:09:19 -06:00
smilerz
505650518e Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-02-16 07:45:22 -06:00
vabene1111
f2765c75c6 favicon path in markdown docs 2021-02-15 21:16:31 +01:00
vabene1111
150d4c7309 refactor assset and paths 2021-02-15 21:01:54 +01:00
vabene1111
ac9922ff61 manifest fixes 2021-02-15 16:08:18 +01:00
vabene1111
ff0cd6fa93 fixed import log 2021-02-15 15:30:19 +01:00
vabene1111
777f4518be servings default to 1 on import 2021-02-15 15:16:15 +01:00
vabene1111
84591fd17a fixed issue with shopping list saving 2021-02-15 15:13:59 +01:00
vabene1111
7536425e39 added czech locale 2021-02-15 15:13:40 +01:00
vabene1111
9d28ce48fe
Merge pull request #397 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_cs
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'cs'
2021-02-15 15:11:50 +01:00
Aaron
87d6ca0200
Fix ingredient parsing for fractions using '/'
Even though ingredients like '1 1/2 something' already worked fine and got converted to 1.5 something
I just came across a recipe using '1/2' as the whole amount without any whole number before that.
Apparently I overlooked that case before so I now also fixed that.
2021-02-14 18:43:38 +01:00
transifex-integration[bot]
bcda57a4fa
Apply translations in cs
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'cs' language.
2021-02-14 13:12:22 +00:00
vabene1111
3e55207a8d fixed path 2021-02-13 18:19:38 +01:00
vabene1111
20e9d4a990 new style and icon 2021-02-13 18:04:33 +01:00
smilerz
e0a0eeeecc add keyword during url import 2021-02-09 12:55:40 -06:00
smilerz
4a4dafd69c add keyword during recipe edit 2021-02-09 11:17:31 -06:00
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