cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,196 Commits 2 Branches 0 Tags 57 MiB
086570ce90
Commit Graph

1196 Commits

This Branch
This Branch
All Branches
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
6c52b7bbd9 remove pre commit from build dependencies 2021-02-08 10:02:30 +01:00
vabene1111
900f1a6f7a
Merge pull request #389 from vabene1111/dependabot/pip/pre-commit-2.10.1 
Bump pre-commit from 2.10.0 to 2.10.1
 2021-02-08 08:46:06 +01:00
dependabot[bot]
ff0a7c5262
Bump pre-commit from 2.10.0 to 2.10.1 
Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.10.0 to 2.10.1.
- [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.10.0...v2.10.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-08 06:47:48 +00: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
vabene1111
3afd18ccdc
Merge pull request #378 from vabene1111/dependabot/pip/django-3.1.6 
Bump django from 3.1.5 to 3.1.6
 2021-02-02 08:47:50 +01:00
dependabot[bot]
24f1fb228e
Bump django from 3.1.5 to 3.1.6 
Bumps [django](https://github.com/django/django) from 3.1.5 to 3.1.6.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.1.5...3.1.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-02 07:47:36 +00:00
vabene1111
431e213514
Merge pull request #379 from vabene1111/dependabot/pip/bleach-3.3.0 
Bump bleach from 3.2.3 to 3.3.0
 2021-02-02 08:46:57 +01:00
dependabot[bot]
1e00fa16db
Bump bleach from 3.2.3 to 3.3.0 
Bumps [bleach](https://github.com/mozilla/bleach) from 3.2.3 to 3.3.0.
- [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.3...v3.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-02 06:06:55 +00:00
vabene1111
ac1c283efb
Merge pull request #373 from vabene1111/dependabot/pip/jinja2-2.11.3 
Bump jinja2 from 2.11.2 to 2.11.3
 2021-02-01 09:42:10 +01:00
vabene1111
0a6a8b760f
Merge pull request #374 from vabene1111/dependabot/pip/django-crispy-forms-1.11.0 
Bump django-crispy-forms from 1.10.0 to 1.11.0
 2021-02-01 09:42:01 +01:00
dependabot[bot]
4cdd784259
Bump django-crispy-forms from 1.10.0 to 1.11.0 
Bumps [django-crispy-forms](https://github.com/django-crispy-forms/django-crispy-forms) from 1.10.0 to 1.11.0.
- [Release notes](https://github.com/django-crispy-forms/django-crispy-forms/releases)
- [Changelog](https://github.com/django-crispy-forms/django-crispy-forms/blob/master/CHANGELOG.md)
- [Commits](https://github.com/django-crispy-forms/django-crispy-forms/compare/1.10.0...1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-01 07:31:37 +00:00
dependabot[bot]
461cb20a4f
Bump jinja2 from 2.11.2 to 2.11.3 
Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/2.11.2...2.11.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-01 07:31:33 +00:00
vabene1111
7ebf4d5e2a
Merge pull request #366 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_nl 
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'nl'
 2021-01-31 13:01:21 +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
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