Commit Graph

2565 Commits

Author SHA1 Message Date
d510b521af updated nav 2021-10-01 18:45:59 +02:00
4e78b21ee4 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-10-01 18:39:54 +02:00
0de87cf38d compiled translations IT and PL 2021-10-01 18:39:50 +02:00
3c567a318a Merge pull request #940 from vabene1111/feature/fix-modellist-error
fixed model list error
2021-10-01 18:35:45 +02:00
b6d878e885 fixed model list error 2021-10-01 18:34:30 +02:00
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
26ef66f4e1 moved fix tree to apps ready hook and wrapped in catch for non existing models 2021-10-01 15:58:16 +02:00
32657949e2 Merge pull request #937 from vabene1111/feature/fix-ci
fixed ci and rebuild files
2021-10-01 12:45:15 +02:00
4ba4eec238 fixed ci and rebuild files 2021-10-01 12:44:37 +02:00
e58c38db51 Merge pull request #936 from vabene1111/develop
Update Beta
2021-10-01 11:54:23 +02:00
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
ad8a6c9792 Merge pull request #923 from smilerz/draggable_pill_update
Draggable pill update
2021-10-01 07:54:44 +00:00
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
64b2e21747 Merge branch 'develop' into draggable_pill_update 2021-10-01 07:53:35 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
bd8a764bbb Merge pull request #934 from vabene1111/dependabot/npm_and_yarn/vue/typescript-eslint/parser-4.32.0
Bump @typescript-eslint/parser from 4.31.0 to 4.32.0 in /vue
2021-10-01 07:48:58 +00:00
e8ce040df6 Merge pull request #920 from smilerz/sort_tree
Sort tree enhancements
2021-10-01 07:48:47 +00:00
22bde489d2 Merge pull request #924 from smilerz/fix_automation_url_import
fix automation in url_import
2021-10-01 09:39:36 +02:00
c302e0b68b Bump @typescript-eslint/parser from 4.31.0 to 4.32.0 in /vue
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.31.0 to 4.32.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.32.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 00:05:27 +00:00
7d8bc2fd9b Bump axios from 0.21.1 to 0.21.4 in /vue
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.4.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 00:04:41 +00:00
c7bcbd02c9 Bump workbox-expiration from 6.1.5 to 6.3.0 in /vue
Bumps [workbox-expiration](https://github.com/googlechrome/workbox) from 6.1.5 to 6.3.0.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.1.5...v6.3.0)

---
updated-dependencies:
- dependency-name: workbox-expiration
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 00:04:10 +00:00
a577b05404 Bump prismjs from 1.24.1 to 1.25.0 in /vue
Bumps [prismjs](https://github.com/PrismJS/prism) from 1.24.1 to 1.25.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PrismJS/prism/compare/v1.24.1...v1.25.0)

---
updated-dependencies:
- dependency-name: prismjs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 00:03:32 +00:00
7a566b183d Bump core-js from 3.14.0 to 3.18.1 in /vue
Bumps [core-js](https://github.com/zloirock/core-js) from 3.14.0 to 3.18.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.14.0...v3.18.1)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 00:03:06 +00:00
6322b97a69 Bump django-crispy-forms from 1.12.0 to 1.13.0
Bumps [django-crispy-forms](https://github.com/django-crispy-forms/django-crispy-forms) from 1.12.0 to 1.13.0.
- [Release notes](https://github.com/django-crispy-forms/django-crispy-forms/releases)
- [Changelog](https://github.com/django-crispy-forms/django-crispy-forms/blob/main/CHANGELOG.md)
- [Commits](https://github.com/django-crispy-forms/django-crispy-forms/compare/1.12.0...1.13.0)

---
updated-dependencies:
- dependency-name: django-crispy-forms
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 00:01:06 +00:00
38f3b4bf64 Bump django-webpack-loader from 1.3.0 to 1.4.0
Bumps [django-webpack-loader](https://github.com/django-webpack/django-webpack-loader) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/django-webpack/django-webpack-loader/releases)
- [Changelog](https://github.com/django-webpack/django-webpack-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/django-webpack/django-webpack-loader/compare/1.3.0...1.4.0)

---
updated-dependencies:
- dependency-name: django-webpack-loader
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 00:01:03 +00:00
067ab18f16 Bump boto3 from 1.18.38 to 1.18.52
Bumps [boto3](https://github.com/boto/boto3) from 1.18.38 to 1.18.52.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](https://github.com/boto/boto3/compare/1.18.38...1.18.52)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 00:00:58 +00:00
9bbbd72285 catch IntegrityError caused by mis-sorted tree 2021-09-30 16:17:08 -05:00
96d7cc42a5 fix automation in url_import 2021-09-30 15:34:28 -05:00
09140454a2 force SQL_DEBUG to boolean 2021-09-30 15:06:44 -05:00
17cedf17b5 stubbed out new shopping list 2021-09-30 14:56:59 -05:00
a140813a67 made add button on ModelList larger 2021-09-30 10:33:47 -05:00
20db5cfd74 search presets 2021-09-30 13:46:49 +02:00
b61512da77 meal plan refactor progress
- added paginated loading
- tab panes
- default meal type selection
- image placeholder
- drang and drop delete area
2021-09-30 02:33:40 +02:00
bbe20d9656 Added translation using Weblate (Polish) 2021-09-29 22:29:39 +00:00
d1bed45eb6 added grip indication to supermarket category pills 2021-09-29 16:42:19 -05:00
6b41eeb064 Merge branch 'develop' into beta 2021-09-29 15:39:40 +02:00
71a13d33fe update javascript 2021-09-29 15:39:34 +02:00
4d8a6e0b84 updated beta workflow 2021-09-29 15:38:33 +02:00
12afb3eaa6 added search defaults mimicing old search behavior 2021-09-29 09:04:46 +02:00