Commit Graph

3676 Commits

Author SHA1 Message Date
MaxJa4
34f70e4ba7
Fixed formatting 2022-03-11 10:18:51 +01:00
MaxJa4
8bc361ee7c
Updated dependencies of manual setup
- apt install of nodejs installs an unsupported (V10.X) version
- dependencies for python-ldap were missing
2022-03-11 10:16:55 +01:00
vabene1111
091fab154a improved openid and social auth pages 2022-03-10 15:24:13 +01:00
vabene1111
c6e11f6ef2
Merge pull request #1640 from CameronJGrant/develop
Fixed typos and grammatical issues.
2022-03-10 14:43:16 +01:00
vabene1111
16b5cd75b1
Merge pull request #1641 from m42e/feature/markdown-img-tag
Allow img tag (including width/height attribute)
2022-03-10 14:41:31 +01:00
Matthias Bilger
f040b491d4 Allow img tag (including width/height attribute)
Allow using img tag in markdown and additionally allowing to specify
width and height attribute for elements.
2022-03-10 11:38:08 +01:00
karawedi
8174da31e8 Translated using Weblate (German)
Currently translated at 95.1% (535 of 562 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
2022-03-09 18:31:44 +00:00
Cameron Grant
53518f4c47 Fixed typos and grammatical issues. 2022-03-08 12:12:20 -08:00
Felipe Castro
693d829946 Translated using Weblate (Portuguese (Brazil))
Currently translated at 3.0% (17 of 562 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pt_BR/
2022-03-08 01:31:43 +00:00
Felipe Castro
5ab11eb1bc Translated using Weblate (Portuguese (Brazil))
Currently translated at 0.5% (2 of 378 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt_BR/
2022-03-08 01:31:43 +00:00
Felipe Castro
332f518774 Added translation using Weblate (Portuguese (Brazil)) 2022-03-07 01:00:09 +00:00
Felipe Castro
ed33114947 Added translation using Weblate (Portuguese (Brazil)) 2022-03-07 00:56:04 +00:00
Kaibu
aeb38cd2e9 Merge branch 'develop-weblate' into develop
# Conflicts:
#	cookbook/locale/de/LC_MESSAGES/django.po
#	cookbook/locale/hu_HU/LC_MESSAGES/django.po
#	vue/src/locales/de.json
2022-03-06 20:45:35 +01:00
Adrian M
17cf5f48a1 Translated using Weblate (Hungarian)
Currently translated at 2.9% (17 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/hu/
2022-03-06 19:35:42 +00:00
vabene1111
c950e6dabb
Merge pull request #1625 from TandoorRecipes/dependabot/pip/recipe-scrapers-13.19.0
Bump recipe-scrapers from 13.18.0 to 13.19.0
2022-03-04 14:29:18 +01:00
vabene1111
e27a64f52c
Merge pull request #1623 from gloriousDan/develop
Improve recipe import for non schema.org recipes
2022-03-04 14:28:34 +01:00
vabene1111
f02b6f29db
Merge pull request #1620 from ratheile/ratheile-patch-boot-nonstandard-ports
Update boot.sh
2022-03-04 14:27:31 +01:00
dependabot[bot]
a3ba516587
Bump recipe-scrapers from 13.18.0 to 13.19.0
Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 13.18.0 to 13.19.0.
- [Release notes](https://github.com/hhursev/recipe-scrapers/releases)
- [Commits](https://github.com/hhursev/recipe-scrapers/compare/13.18.0...13.19.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-04 13:27:30 +00:00
vabene1111
a15f5895f5
Merge pull request #1622 from MaxJa4/fix/ldap_dockerfile
Added ldap as runtime dependency to Dockerfile
2022-03-04 14:27:01 +01:00
vabene1111
c6e36b802c
Merge pull request #1617 from smilerz/fix_sqlite_search
remove unaccent from sqlite search
2022-03-04 14:26:32 +01:00
vabene1111
f91ca28638
Merge pull request #1611 from smilerz/missing_preptime
missing prepTime assignment
2022-03-04 14:26:21 +01:00
Daniel Schulz
cfcf354d59
Improve recipe import for non schema.org recipes 2022-03-03 23:47:50 +01:00
MaxJa4
6813077113 Added ldap as runtime dependency to Dockerfile 2022-03-03 22:27:41 +01:00
Raffael Theiler
581ee762b6
Update boot.sh
Add port to pg_isready to allow non-standard ports.
2022-03-03 19:27:51 +01:00
smilerz
08c1a8f2ab
fix loading children in treeselect 2022-03-02 14:56:33 -06:00
smilerz
ba25e463ad
added uritemplate requirement back 2022-03-02 10:13:40 -06:00
smilerz
f2211da9bb
remove unaccent from sqlite search 2022-03-02 09:42:10 -06:00
vabene1111
8d3419952c movbed pg password check 2022-03-02 13:11:52 +01:00
vabene1111
8010ee3dca logical fix 2022-03-02 12:22:54 +01:00
vabene1111
0f3d82a5e6 fixing boot script 2022-03-02 12:22:12 +01:00
vabene1111
5e67e735db Merge branch 'beta' into develop 2022-03-02 12:17:40 +01:00
vabene1111
f9f6ca05a4
Merge pull request #1612 from smilerz/mealplan_modal_shopping
trigger shopping modal
2022-03-02 09:43:46 +01:00
vabene1111
d7379d8ab6 testing with setuptools_rust 2022-03-02 09:39:54 +01:00
vabene1111
51f44e4926 testing with py dev 2022-03-02 09:37:11 +01:00
vabene1111
447a16dcd5 re enabled disabled architectures 2022-03-02 09:28:28 +01:00
vabene1111
f15922ceb5 testing cryptography builds with rustc 2022-03-02 09:25:29 +01:00
vabene1111
a5cc218b56 Merge branch 'develop' into beta 2022-03-02 09:24:09 +01:00
vabene1111
640d7305c7 Merge branch 'master' into develop 2022-03-02 09:24:02 +01:00
vabene1111
fdf98932e2 exchanged deprecated vars 2022-03-02 09:20:35 +01:00
vabene1111
29e44e7101 dont build arm v7 2022-03-02 08:38:42 +01:00
smilerz
2993c7e688
trigger shopping modal 2022-03-01 17:17:35 -06:00
smilerz
d6db3fe65b
missing prepTime assignment 2022-03-01 16:31:18 -06:00
vabene1111
36099b80ab docker dont pip install cryptography
dont install cryptography wheel in alpine docker build as py-cryptography already takes care of this.
2022-03-01 19:50:31 +01:00
vabene1111
9a795a7f60 docker dont pip install cryptography
dont install cryptography wheel in alpine docker build as py-cryptography already takes care of this.
2022-03-01 19:50:17 +01:00
vabene1111
7ef67cdadd Merge branch 'develop' 2022-03-01 16:37:03 +01:00
vabene1111
55539c83c9 fixed supermarket category creation 2022-03-01 16:26:36 +01:00
vabene1111
c5df241ec3
Merge pull request #1597 from MaxJa4/improvement/multiselect_localization
Multiselect controls are now fully localized in RecipeEditView
2022-03-01 15:55:35 +01:00
vabene1111
8ea882e5b3
Merge branch 'develop' into improvement/multiselect_localization 2022-03-01 15:55:27 +01:00
vabene1111
aaecd479ad
Merge pull request #1594 from MaxJa4/improvement/minor_translation_fixes
Added a few more strings to be localized and fixed one ui alignment
2022-03-01 15:54:48 +01:00
vabene1111
65432895ba
Merge branch 'develop' into improvement/minor_translation_fixes 2022-03-01 15:54:44 +01:00