mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,432 Commits 21 Branches 170 Tags
a8434ce745442cfc91c174498dac0024c1452113
Commit Graph

1432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
a7b7272bec view log api test 2021-03-12 09:50:20 +01:00
vabene1111
d7402f60c5 meal plan api tests 2021-03-12 09:44:16 +01:00
vabene1111
d049cf6d3d ingredient test finished 2021-03-11 21:50:54 +01:00
vabene1111
fdcdf6a026 added food test 2021-03-11 18:23:00 +01:00
vabene1111
7e38e946a5 fixed various space related bugs 2021-03-11 16:41:05 +01:00
vabene1111
b552badff7 fixed limit random recipe 2021-03-11 15:37:37 +01:00
transifex-integration[bot]
d10c84b66e Apply translations in es 
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'es' language.
 2021-03-10 23:51:17 +00:00
vabene1111
e7f8d58a7d added test for cook log 2021-03-10 21:25:18 +01:00
vabene1111
528f329ebb new keyword api test working 2021-03-10 20:31:00 +01:00
vabene1111
b9b7a125f0 more tests working but scopes broken 2021-03-10 19:46:08 +01:00
vabene1111
4742056223 tests basically working 2021-03-10 18:18:19 +01:00
vabene1111
ba4c3b95e5 removed deprecated functions/packages 2021-03-10 18:17:31 +01:00
dependabot[bot]
4c03520371 Bump pillow from 8.1.0 to 8.1.2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.0 to 8.1.2.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.1.0...8.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-08 06:58:23 +00:00
smilerz
1f5ddd9af7 limit description in search to 2 lines 2021-03-06 17:36:51 -06:00
smilerz
d3e6b34a63 added description to search and recipe view 2021-03-06 16:32:59 -06:00
Oliver Cervera
323f424630 Update Italian Translation 
Italian translation updates.
Manual PR since Transifex doesn't do it.
 2021-03-06 13:03:03 +01:00
smilerz
eed6e9d3a5 catch index error 2021-03-04 15:30:20 -06:00
smilerz
f4af7ffb0b except do it right this time 2021-03-04 15:03:33 -06:00
smilerz
3b072d5dd9 check for scrape.schema before using it 2021-03-04 14:59:56 -06:00
smilerz
11240dcf48 Merge branch 'recipe_description' of github.com:smilerz/recipes into recipe_description 2021-03-04 09:30:27 -06:00
smilerz
0b5fc1a9f4 added description to url_import 2021-03-04 09:20:26 -06:00
smilerz
049449bda3 removed recipe description from url_import template 2021-03-04 09:19:25 -06:00
smilerz
e5a19302f0 added description to url_import 2021-03-04 08:38:01 -06:00
smilerz
e1fa939757 pulled description field from url_import template 2021-03-04 08:33:02 -06:00
smilerz
3da33e364e fixed test 2021-03-03 21:15:12 -06:00
smilerz
bfaed434cc refactored url_import to use recipe-scraper 2021-03-03 21:08:34 -06:00
vabene1111
b6acc17e5a Create url_import.md 2021-02-26 10:02:14 +01:00
vabene1111
5fd03e7cdc basics of pytest 2021-02-25 22:36:20 +01:00
vabene1111
54e71f2910 last commit 2021-02-25 22:20:06 +01:00
vabene1111
c99c944130 fixed normal django test running with scopes 2021-02-25 22:19:51 +01:00
transifex-integration[bot]
94c9185bcf Apply translations in nl 
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
 2021-02-25 18:59:22 +00:00
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 0.14.5 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
0.14.4 		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