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

1300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
74e731e334 inject space context into serializer writes 2021-02-25 16:45:47 +01:00
vabene1111
d01f7409bf removed django-random-queryset 
the looping strategy is not efficient when using spacing as ids for a single user might be spaced far apart. A single user also only has a few hundred recipes so using the order by ? method should be more efficient and also automatically be compatible with spaces
 2021-02-25 16:44:42 +01:00
vabene1111
29ab6cfb2d Merge branch 'develop' into feature/spaces 
# Conflicts:
#	cookbook/views/data.py
#	cookbook/views/views.py
 2021-02-25 15:59:32 +01:00
vabene1111
59b2da933d fixed tests 2021-02-25 08:27:22 +01:00
vabene1111
99b5f9a3ec
Merge pull request #457 from ProfessorSalty/height-bugfix 
Fix height issues in Safari by removing height rules
 2021-02-25 08:18:37 +01:00
vabene1111
9057eac42c
Merge pull request #460 from vabene1111/dependabot/pip/markdown-3.3.4 
Bump markdown from 3.3.3 to 3.3.4
 2021-02-25 08:18:27 +01:00
vabene1111
24b5cdff85
Merge pull request #459 from smilerz/fix-456 
Fix 456
 2021-02-25 08:14:55 +01:00
dependabot[bot]
f2630c3ba0
Bump markdown from 3.3.3 to 3.3.4 
Bumps [markdown](https://github.com/Python-Markdown/markdown) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/Python-Markdown/markdown/releases)
- [Commits](https://github.com/Python-Markdown/markdown/compare/3.3.3...3.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-25 06:02:05 +00:00
smilerz
21740522bc
fixed URL import when ingredient is a string 2021-02-24 20:13:06 -06:00
smilerz
47090ce863 added tests for add keyword and add duplicate keyword 2021-02-24 18:52:43 -06:00
smilerz
3ac22c08ff fixed duplicate keyword handling 2021-02-24 18:52:04 -06:00
smilerz
cc62b088fd fix URL import when recipeYield is a list 2021-02-24 17:52:40 -06:00
Greg Smith
2c34425135 Remove fixed height rule 2021-02-24 17:36:06 -05:00
vabene1111
205f76d128 fix that does not really fix anything 
see #453/454
 2021-02-23 21:43:14 +01:00
vabene1111
4147bc61c7
Merge pull request #390 from smilerz/develop 
Add keywords during edit & url import
 2021-02-23 21:12:45 +01:00
vabene1111
dfae453925
Merge pull request #450 from albcp/develop 
Add environment variable to include Sub-Path in resolve.js.
 2021-02-23 21:09:56 +01:00
vabene1111
7507cae44c added some info to .env for DB_OPTIONS 2021-02-23 20:56:53 +01:00
vabene1111
28312774bd
Merge pull request #434 from angelnu/develop 
Add DB_OPTIONS to enable DBs with SSL
 2021-02-23 20:55:23 +01:00
vabene1111
058723d583 compiled translations and added hy 2021-02-23 20:54:42 +01:00
vabene1111
db4abdd31d
Merge pull request #426 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_it 
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'it'
 2021-02-23 20:50:35 +01:00
vabene1111
727b0e9e61
Merge pull request #403 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_hy 
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'hy'
 2021-02-23 20:49:40 +01:00
vabene1111
aa41146735
Merge pull request #448 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_de 
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'de'
 2021-02-23 20:48:51 +01:00
vabene1111
670fc9bf35
Merge pull request #451 from vabene1111/dependabot/pip/django-autocomplete-light-3.8.2 
Bump django-autocomplete-light from 3.8.1 to 3.8.2
 2021-02-23 20:48:27 +01:00
vabene1111
d9a5649adc
Merge pull request #446 from vabene1111/dependabot/pip/django-3.1.7 
Bump django from 3.1.6 to 3.1.7
 2021-02-23 20:48:15 +01:00
vabene1111
5ed300a3ea
Merge pull request #445 from vabene1111/dependabot/pip/django-crispy-forms-1.11.1 
Bump django-crispy-forms from 1.11.0 to 1.11.1
 2021-02-23 20:48:04 +01:00
vabene1111
59cc22a877 wip serializer permission 2021-02-23 20:44:13 +01:00
Alberto
8dffc07072
get JS_REVERSE_SCRIPT_PREFIX from SCRIPT_NAME 2021-02-23 18:57:59 +01:00
dependabot[bot]
76c7ad1ff5
Bump django-autocomplete-light from 3.8.1 to 3.8.2 
Bumps [django-autocomplete-light](https://github.com/yourlabs/django-autocomplete-light) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/yourlabs/django-autocomplete-light/releases)
- [Changelog](https://github.com/yourlabs/django-autocomplete-light/blob/master/CHANGELOG)
- [Commits](https://github.com/yourlabs/django-autocomplete-light/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-23 06:02:25 +00:00
vabene1111
7f391c25a4 fixed test 2021-02-22 19:59:43 +01:00
Alberto
bccc41d177 Add environment variable to include Sub-Path in resolve.js. 2021-02-22 19:56:33 +01:00
transifex-integration[bot]
cc882082d2
Apply translations in de 
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'de' language.
 2021-02-22 15:41:54 +00:00
dependabot[bot]
689918c1ac
Bump django from 3.1.6 to 3.1.7 
Bumps [django](https://github.com/django/django) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.1.6...3.1.7)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-22 07:00:34 +00:00
dependabot[bot]
1c43be3899
Bump django-crispy-forms from 1.11.0 to 1.11.1 
Bumps [django-crispy-forms](https://github.com/django-crispy-forms/django-crispy-forms) from 1.11.0 to 1.11.1.
- [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.11.0...1.11.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-22 07:00:29 +00:00
vabene1111
40387428e7 recipe filter 2021-02-21 16:49:34 +01:00
vabene1111
46fb02376e recipe share basics 2021-02-21 16:37:04 +01:00
vabene1111
24e43e3e2e updated migrations + setup process update 2021-02-21 15:34:35 +01:00
vabene1111
846c660811 usr signup and more 2021-02-21 15:08:43 +01:00
vabene1111
beb4aa634f forms 2021-02-20 23:42:44 +01:00
vabene1111
58c6077925 basic test stuff 2021-02-20 22:56:29 +01:00
vabene1111
d7675d4b80 ingredients and helpers 2021-02-20 21:26:16 +01:00
vabene1111
e2b1115b3b fixed servings blank 2021-02-20 18:50:28 +01:00
vabene1111
96c963795e more spaces work 2021-02-20 18:47:14 +01:00
Vegetto
804adde964
Parse DB_OPTIONS dict 2021-02-20 16:54:42 +01:00
Vegetto
5aa918f478
Document DB_OPTIONS env 2021-02-20 16:53:02 +01:00
Vegetto
a44f72a030
Add DB_OPTIONS to enable DBs with SSL 2021-02-20 16:42:48 +01:00
vabene1111
ad163509b4 updated edit and added space find methods 2021-02-19 18:09:42 +01:00
vabene1111
fb58d35029 space stuff partially working 2021-02-19 15:50:55 +01:00
transifex-integration[bot]
79f823cd62
Apply translations in it 
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
 2021-02-19 13:42:50 +00:00
vabene1111
c42266b82c basic space stuff 2021-02-19 11:53:30 +01:00
smilerz
c60c3f1876 Revert "minor edit" 
This reverts commit 35f3ecc7eb.
 2021-02-18 07:28:26 -06:00