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,438 Commits 21 Branches 170 Tags
88a2255ed20537ad186fdf48b7abd5171b75f0ca
Commit Graph

2438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
88a2255ed2 fixes 
translation
disabled note rendering when less than 15 characters
fixed step header rendering
fixed image in recipe edit on mobile layout
 2021-10-11 16:29:32 +02:00
Oliver Cervera
d032055c62 Translated using Weblate (Italian) 
Currently translated at 98.9% (181 of 183 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-10-10 18:06:16 +00:00
Oliver Cervera
44c8ff057f Translated using Weblate (Italian) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-10-09 00:25:37 +00:00
Kaibu
37e45bea76 meal plan fixes 
- added translations
- form validation & tagging support for meal types
 2021-10-09 02:25:31 +02:00
vabene1111
f845acded7 Merge pull request #945 from wisdomkhan/wisdomkhan-tandoor-translate-link 
Added link for Tandoor Translate
 2021-10-08 19:11:46 +02:00
vabene1111
15b722345b importer tweaks and default tree sort setting 2021-10-08 10:20:42 +02:00
vabene1111
2c27e528ae Translated using Weblate (German) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2021-10-07 19:06:21 +00:00
vabene1111
08ea6268e4 Translated using Weblate (German) 
Currently translated at 82.2% (408 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-10-07 19:06:15 +00:00
vabene1111
053508821f rebuild again 2021-10-06 20:16:29 +02:00
vabene1111
a870ff9325 Merge branch 'beta' into develop 
# Conflicts:
#	cookbook/static/vue/js/checklist_view.js
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/cookbook_view.js
#	cookbook/static/vue/js/edit_internal_recipe.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/meal_plan_view.js
#	cookbook/static/vue/js/model_list_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	cookbook/templates/sw.js
 2021-10-06 20:14:35 +02:00
vabene1111
ede7925203 compiled javascript 2021-10-06 20:13:36 +02:00
vabene1111
f6a9d11e3f compiled translations 2021-10-06 20:10:41 +02:00
vabene1111
1fb1becfcf added translations to book view 2021-10-06 20:09:54 +02:00
vabene1111
e952313fec Merge pull request #948 from smilerz/new_user_fix 
minor change on recent recipe search
 2021-10-06 07:57:02 +02:00
smilerz
e14e812c2d a better fix 2021-10-04 16:18:21 -05:00
Tomasz Klimczak
2fc27d7c36 Translated using Weblate (Polish) 
Currently translated at 100.0% (161 of 161 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
 2021-10-04 00:06:13 +00:00
Tomasz Klimczak
493d553050 Translated using Weblate (Polish) 
Currently translated at 17.3% (28 of 161 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
 2021-10-02 12:25:52 +00:00
Jesse
371a895513 Translated using Weblate (Dutch) 
Currently translated at 100.0% (161 of 161 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
 2021-10-02 12:25:52 +00:00
Tomasz Klimczak
b25d1b648e Translated using Weblate (Polish) 
Currently translated at 100.0% (362 of 362 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pl/
 2021-10-02 12:25:51 +00:00
Jesse
85f0ae36cf Translated using Weblate (Dutch) 
Currently translated at 100.0% (496 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-10-02 12:25:51 +00:00
Mohammad Asim Khan
4f435748a7 Added link for Tandoor Translate 2021-10-02 17:24:46 +05:30
vabene1111
93550e2a61 Merge pull request #943 from smilerz/new_user_fix 
fix for #942
 2021-10-02 09:15:40 +02:00
smilerz
ff96e87168 fix for #942 2021-10-01 14:21:50 -05:00
vabene1111
823c5d3975 fixed model list view error for unpaginated lists 2021-10-01 18:55:16 +02:00
vabene1111
d510b521af updated nav 2021-10-01 18:45:59 +02:00
vabene1111
4e78b21ee4 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-10-01 18:39:54 +02:00
vabene1111
0de87cf38d compiled translations IT and PL 2021-10-01 18:39:50 +02:00
vabene1111
3c567a318a Merge pull request #940 from vabene1111/feature/fix-modellist-error 
fixed model list error
 2021-10-01 18:35:45 +02:00
vabene1111
b6d878e885 fixed model list error 2021-10-01 18:34:30 +02:00
vabene1111
5b2e14a5b7 Merge pull request #938 from vabene1111/feature/fix-sort-tree 
moved fix tree to apps ready hook and wrapped in catch for non existi…
 2021-10-01 15:58:41 +02:00
vabene1111
26ef66f4e1 moved fix tree to apps ready hook and wrapped in catch for non existing models 2021-10-01 15:58:16 +02:00
vabene1111
32657949e2 Merge pull request #937 from vabene1111/feature/fix-ci 
fixed ci and rebuild files
 2021-10-01 12:45:15 +02:00
vabene1111
4ba4eec238 fixed ci and rebuild files 2021-10-01 12:44:37 +02:00
vabene1111
e58c38db51 Merge pull request #936 from vabene1111/develop 
Update Beta
 2021-10-01 11:54:23 +02:00
Tomasz Klimczak
76ca27dc5a Translated using Weblate (Polish) 
Currently translated at 73.4% (266 of 362 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pl/
 2021-10-01 07:54:47 +00:00
vabene1111
ad8a6c9792 Merge pull request #923 from smilerz/draggable_pill_update 
Draggable pill update
 2021-10-01 07:54:44 +00:00
vabene1111
21ed2d02d2 Merge pull request #935 from vabene1111/dependabot/pip/django-filter-21.1 
Bump django-filter from 2.4.0 to 21.1
 2021-10-01 07:54:26 +00:00
vabene1111
64b2e21747 Merge branch 'develop' into draggable_pill_update 2021-10-01 07:53:35 +00:00
dependabot[bot]
98c42ea9c3 Bump django-filter from 2.4.0 to 21.1 
Bumps [django-filter](https://github.com/carltongibson/django-filter) from 2.4.0 to 21.1.
- [Release notes](https://github.com/carltongibson/django-filter/releases)
- [Changelog](https://github.com/carltongibson/django-filter/blob/main/CHANGES.rst)
- [Commits](https://github.com/carltongibson/django-filter/compare/2.4.0...21.1)

---
updated-dependencies:
- dependency-name: django-filter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-01 07:52:17 +00:00
vabene1111
4c3cea3189 Merge pull request #925 from vabene1111/dependabot/pip/cryptography-35.0.0 
Bump cryptography from 3.4.8 to 35.0.0
 2021-10-01 07:51:56 +00:00
vabene1111
03270484b0 Merge pull request #926 from vabene1111/dependabot/pip/django-cors-headers-3.9.0 
Bump django-cors-headers from 3.8.0 to 3.9.0
 2021-10-01 07:51:52 +00:00
dependabot[bot]
c224521598 Bump django-cors-headers from 3.8.0 to 3.9.0 
Bumps [django-cors-headers](https://github.com/adamchainz/django-cors-headers) from 3.8.0 to 3.9.0.
- [Release notes](https://github.com/adamchainz/django-cors-headers/releases)
- [Changelog](https://github.com/adamchainz/django-cors-headers/blob/main/HISTORY.rst)
- [Commits](https://github.com/adamchainz/django-cors-headers/compare/3.8.0...3.9.0)

---
updated-dependencies:
- dependency-name: django-cors-headers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-01 07:50:10 +00:00
dependabot[bot]
976c3adc9c Bump cryptography from 3.4.8 to 35.0.0 
Bumps [cryptography](https://github.com/pyca/cryptography) from 3.4.8 to 35.0.0.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/3.4.8...35.0.0)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-01 07:50:08 +00:00
vabene1111
22d4cd796a Merge pull request #927 from vabene1111/dependabot/pip/boto3-1.18.52 
Bump boto3 from 1.18.38 to 1.18.52
 2021-10-01 07:49:44 +00:00
vabene1111
0677bad89f Merge pull request #928 from vabene1111/dependabot/pip/django-webpack-loader-1.4.0 
Bump django-webpack-loader from 1.3.0 to 1.4.0
 2021-10-01 07:49:40 +00:00
vabene1111
8c3c756d91 Merge pull request #929 from vabene1111/dependabot/pip/django-crispy-forms-1.13.0 
Bump django-crispy-forms from 1.12.0 to 1.13.0
 2021-10-01 07:49:35 +00:00
vabene1111
b46f482ff0 Merge pull request #930 from vabene1111/dependabot/npm_and_yarn/vue/core-js-3.18.1 
Bump core-js from 3.14.0 to 3.18.1 in /vue
 2021-10-01 07:49:31 +00:00
vabene1111
4fc198728c Merge pull request #931 from vabene1111/dependabot/npm_and_yarn/vue/prismjs-1.25.0 
Bump prismjs from 1.24.1 to 1.25.0 in /vue
 2021-10-01 07:49:16 +00:00
vabene1111
807b2dfbca Merge pull request #932 from vabene1111/dependabot/npm_and_yarn/vue/workbox-expiration-6.3.0 
Bump workbox-expiration from 6.1.5 to 6.3.0 in /vue
 2021-10-01 07:49:11 +00:00
vabene1111
f3d000452f Merge pull request #933 from vabene1111/dependabot/npm_and_yarn/vue/axios-0.21.4 
Bump axios from 0.21.1 to 0.21.4 in /vue
 2021-10-01 07:49:07 +00:00