mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 12:18:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,970 Commits 21 Branches 170 Tags
0ed9225c0503fc01b583c876ad309dbe26cd89ce
Commit Graph

3970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smilerz
501f56ffd5 copy to new recipe 2022-02-16 09:16:51 -06:00
smilerz
ad6d99800e include note from ingredient API 2022-02-16 08:35:04 -06:00
smilerz
bd973ec3a9 always sort count attributes to end 2022-02-15 16:19:41 -06:00
smilerz
b5c6c7cf2b sort cooked date fix 2022-02-15 12:00:59 -06:00
smilerz
f9ae48e23c fix Vue cookedon sort 2022-02-15 09:14:27 -06:00
smilerz
4e8bbefc17 minor cleanup 2022-02-15 06:42:57 -06:00
dependabot[bot]
90b4ecb599 Bump follow-redirects from 1.14.7 to 1.14.8 in /vue 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-15 02:38:12 +00:00
smilerz
57658e76f5 fix duplicate shopping recipes when auto-add enabled 2022-02-14 17:47:17 -06:00
smilerz
19708dbc64 paste list of ingredients 2022-02-14 17:28:16 -06:00
smilerz
444e0c1918 include new filters in ResetSearch() 2022-02-14 15:35:56 -06:00
smilerz
8fa00b50b1 added update_at filter 2022-02-14 15:13:34 -06:00
MaxJa4
b9f16c3f66 Inverted truth check for GUNICORN_MEDIA 2022-02-14 16:45:37 +01:00
MaxJa4
c90de725b0 Only show warning if not using gunicorn 2022-02-14 16:16:45 +01:00
MaxJa4
c0b43987dd Added extistence check for nginx config file. 2022-02-14 16:13:16 +01:00
smilerz
c2fa86e388 fixed typo 2022-02-13 14:35:38 -06:00
smilerz
3b8be24630 merge RecipeSearch with upstream 2022-02-13 14:15:01 -06:00
smilerz
e72f6e4ac4 Merge remote-tracking branch 'upstream/feature/custom_filters' into feature/custom_filters 2022-02-13 14:14:28 -06:00
smilerz
ef81700c05 add created filter, viewed filter and viewed sort 2022-02-13 14:07:43 -06:00
smilerz
bf54680178 more recipe search tests 2022-02-13 13:53:07 -06:00
A. L
a522f9879f Translated using Weblate (German) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-12 21:31:35 +00:00
Dirk
4ee32b3263 Translated using Weblate (German) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-12 21:31:35 +00:00
Ghostfighter
c339b4fef8 Translated using Weblate (German) 
Currently translated at 99.6% (566 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-02-12 21:31:35 +00:00
Dirk
9ff981f34f Translated using Weblate (German) 
Currently translated at 99.6% (566 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-02-12 21:31:35 +00:00
vabene1111
3db55cd82b added sub path nginx example 2022-02-11 14:16:22 +01:00
vabene1111
f4bfcdab2e improved on explain and some tweaks 2022-02-11 14:15:46 +01:00
vabene1111
f320651cf8 Merge branch 'develop' into feature/custom_filters 2022-02-11 09:31:59 +01:00
vabene1111
3e9de4c392 compiled translations 2022-02-11 09:31:37 +01:00
vabene1111
1e9f7af017 updated translations and django version 2022-02-11 09:29:28 +01:00
vabene1111
cd99b9dc34 Merge pull request #849 from cschmatzler/develop 
Allow specifying port through TANDOOR_PORT environment variable
 2022-02-11 09:17:46 +01:00
vabene1111
b182a9962c Merge branch 'develop' into develop 2022-02-11 09:17:31 +01:00
vabene1111
9b5cc3deaa Merge pull request #1496 from poggenpower/develop 
K8s deployment: Small fix for dupplicate entries.
 2022-02-11 09:05:36 +01:00
vabene1111
7e7c7a3841 Merge pull request #1499 from xMAC94x/update_base_image 
Update the baseimage of dockerfile as alpine 3.12 has some security v…
 2022-02-11 09:04:29 +01:00
vabene1111
6ae1365505 Merge pull request #1512 from smilerz/additional_fixes 
various fixes
 2022-02-11 09:01:56 +01:00
vabene1111
dd2f27cfd4 Merge pull request #1513 from MaxJa4/improvement/ping_db 
Ping DB instead of trying migration
 2022-02-11 08:59:51 +01:00
vabene1111
1a38b54e4f Merge pull request #1520 from smilerz/LDAP-debug-logging 
enable logging for LDAP
 2022-02-11 08:59:04 +01:00
vabene1111
fffb0e0d07 Merge pull request #1525 from TandoorRecipes/revert-1516-patch-2 
Revert "Update de.json"
 2022-02-11 08:54:31 +01:00
vabene1111
de505dc8cc Revert "Update de.json" 2022-02-11 08:53:37 +01:00
vabene1111
9a735b75dc Merge pull request #1516 from hyperbit00/patch-2 
Update de.json
 2022-02-11 08:53:31 +01:00
smilerz
f933226c5d enable logging for LDAP 2022-02-09 16:19:51 -06:00
smilerz
baa2aa51da more recipe search tests 2022-02-09 16:18:45 -06:00
vabene1111
32a8cc9a69 proof of concept for recipe search explain 2022-02-09 18:44:29 +01:00
smilerz
c2961eede4 stub out receip search tests 2022-02-08 20:23:49 -06:00
Marion Kämpfer
13ed297fb9 Translated using Weblate (French) 
Currently translated at 95.9% (286 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2022-02-09 01:31:35 +00:00
Jesse
4c259e6b9c Translated using Weblate (Dutch) 
Currently translated at 95.2% (541 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2022-02-09 01:31:35 +00:00
Marion Kämpfer
faf51d0455 Translated using Weblate (French) 
Currently translated at 94.7% (538 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2022-02-09 01:31:35 +00:00
hyperbit00
ed1585caed Update de.json 
typo
 2022-02-08 23:00:57 +01:00
hyperbit00
3917521ed6 Update de.json 
typo in ressource
 2022-02-08 22:56:33 +01:00
smilerz
924ffc473b fix recipe sharing 2022-02-08 14:59:54 -06:00
smilerz
0e258a49fb reload book recipes when adding filter 2022-02-08 12:30:11 -06:00
MaxJa4
a1063ce922 Merge branch 'improvement/ping_db' of https://github.com/MaxJa4/recipes into improvement/ping_db 2022-02-08 19:00:56 +01:00