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
2,833 Commits 21 Branches 170 Tags
a972a757b2b5806b4fe0de8d11aab4e1deb54dbe
Commit Graph

2833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smilerz
a972a757b2 WIP 2021-12-15 12:37:03 -06:00
smilerz
7c0d1236c2 Fix after rebase 2021-12-15 12:37:03 -06:00
smilerz
09b0dcb136 pre-merge 2021-12-15 12:37:03 -06:00
smilerz
5b4867d172 undo move 2021-12-15 12:37:03 -06:00
smilerz
d3d4c210c1 yarn build 2021-12-15 12:37:03 -06:00
smilerz
6cffee57fe Fix after rebase 2021-12-15 12:36:33 -06:00
smilerz
286595e03d WIP 2021-12-15 12:36:33 -06:00
smilerz
0d1c55d2e4 RecipeFactory and all related models 2021-12-15 12:36:33 -06:00
smilerz
fd8ca2e9ac food inherit tests 2021-12-15 12:36:33 -06:00
smilerz
9ef4c88d02 finish refactoring test_api_food to use factoryboy 2021-12-15 12:36:33 -06:00
smilerz
08d3c40200 refactor Food tests to use factory_boy fixture factories 2021-12-15 12:36:33 -06:00
smilerz
e229a70360 more fixes after rebase 2021-12-15 12:36:33 -06:00
smilerz
06b7ba809b minor updates 2021-12-15 12:36:06 -06:00
smilerz
099a5420d6 update migrations 2021-12-15 12:36:06 -06:00
smilerz
5a9543b4d8 Fix after rebase 2021-12-15 12:36:06 -06:00
smilerz
60d7e63da8 add to shopping from card context menu 2021-12-15 12:36:06 -06:00
smilerz
867e2d4fbf add new unit/food from shopping list 2021-12-15 12:36:06 -06:00
smilerz
757fa5e49c edit supermarket categories 2021-12-15 12:36:06 -06:00
smilerz
8b682c33f3 related recipes included when adding mealplan to shopping list 2021-12-15 12:35:48 -06:00
smilerz
27f358dd03 fix apis 2021-12-15 12:35:48 -06:00
smilerz
7c6a7ef6a4 alpha shopping list 2021-12-15 12:35:48 -06:00
smilerz
4c506750de autosync 2021-12-15 12:35:48 -06:00
smilerz
b84d77be15 WIP 2021-12-15 12:35:48 -06:00
smilerz
247dd30b20 fade-enter-active 2021-12-15 12:35:48 -06:00
smilerz
5e4e203dfb shopping line item 2021-12-15 12:35:48 -06:00
smilerz
79b6d4817e inheritance works with object moves 2021-12-15 12:35:48 -06:00
smilerz
6075ce50e7 food inherit attributes 2021-12-15 12:35:48 -06:00
smilerz
2ca7722afb Fix after rebase 2021-12-15 12:35:48 -06:00
smilerz
7a9e5b1e3f getUserPreference available for all UserPreferences 2021-12-15 12:35:48 -06:00
smilerz
7f87a9efed Fix after rebase 2021-12-15 12:35:48 -06:00
smilerz
3d674cfca6 model changes and GenericAutoSchema 2021-12-15 12:35:48 -06:00
smilerz
1642224205 model migrations 2021-12-15 12:35:48 -06:00
smilerz
3d359f844f WIP 2021-12-15 12:35:48 -06:00
smilerz
94c69271d3 WIP 2021-12-15 12:35:48 -06:00
smilerz
9827c3ffd5 Fix after rebase 2021-12-15 12:35:48 -06:00
vabene1111
4a747f5cd4 Revert "Revert "fixed vue build"" 
This reverts commit edde015b71.
 2021-12-15 18:02:37 +01:00
vabene1111
0623a8ebc7 clear package cache in build 2021-12-15 17:59:22 +01:00
vabene1111
5941022b5e fixed markdown table extension 2021-12-15 17:46:01 +01:00
vabene1111
2559905a78 fixed empty fields breaking recipe update 2021-12-15 17:45:53 +01:00
vabene1111
edde015b71 Revert "fixed vue build" 
This reverts commit 7e07508a31.
 2021-12-15 17:26:06 +01:00
vabene1111
9b7b8beea4 addeed yarn lock 2021-12-15 17:22:24 +01:00
vabene1111
2eae8e5eeb Merge pull request #1141 from TandoorRecipes/dependabot/pip/django-3.2.10 
Bump django from 3.2.9 to 3.2.10
 2021-12-14 16:35:09 +01:00
dependabot[bot]
6d8bc396f8 Bump django from 3.2.9 to 3.2.10 
Bumps [django](https://github.com/django/django) from 3.2.9 to 3.2.10.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.9...3.2.10)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-14 15:33:48 +00:00
vabene1111
4118c8d9e3 Merge pull request #1138 from TandoorRecipes/dependabot/pip/lxml-4.6.5 
Bump lxml from 4.6.4 to 4.6.5
 2021-12-14 16:27:23 +01:00
dependabot[bot]
78c2eacbd8 Bump lxml from 4.6.4 to 4.6.5 
Bumps [lxml](https://github.com/lxml/lxml) from 4.6.4 to 4.6.5.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.6.4...lxml-4.6.5)

---
updated-dependencies:
- dependency-name: lxml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-13 20:26:37 +00:00
vabene1111
01510f39e5 Merge pull request #1119 from TandoorRecipes/user_prefs_fix 
fix package.json
 2021-12-08 14:59:32 +01:00
smilerz
09cc5aafe9 fix package.json 2021-12-07 15:38:03 -06:00
vabene1111
e8b2f57812 Merge pull request #1111 from TandoorRecipes/dependabot/pip/simplejson-3.17.6 
Bump simplejson from 3.17.5 to 3.17.6
 2021-12-03 17:40:07 +01:00
vabene1111
664e83143f Merge pull request #1112 from TandoorRecipes/dependabot/pip/pytest-django-4.5.1 
Bump pytest-django from 4.4.0 to 4.5.1
 2021-12-03 17:39:56 +01:00
dependabot[bot]
f1309cc624 Bump simplejson from 3.17.5 to 3.17.6 
Bumps [simplejson](https://github.com/simplejson/simplejson) from 3.17.5 to 3.17.6.
- [Release notes](https://github.com/simplejson/simplejson/releases)
- [Changelog](https://github.com/simplejson/simplejson/blob/master/CHANGES.txt)
- [Commits](https://github.com/simplejson/simplejson/compare/v3.17.5...v3.17.6)

---
updated-dependencies:
- dependency-name: simplejson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-03 16:39:51 +00:00