smilerz
|
4e8bbefc17
|
minor cleanup
|
2022-02-15 06:42:57 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
MaxJa4
|
2471bb21f6
|
Fixed dep. position and used smaller package
|
2022-02-08 19:00:54 +01:00 |
|
smilerz
|
b3a830c319
|
fix missing pill when loading CustomFilter
|
2022-02-08 11:41:57 -06:00 |
|
MaxJa4
|
45942dfa7f
|
Fixed indentation
|
2022-02-08 18:20:19 +01:00 |
|
MaxJa4
|
cb755a47bc
|
Remove wrong code comment
|
2022-02-08 18:19:32 +01:00 |
|
MaxJa4
|
a35aa953b4
|
Ping DB instead of trying migration
|
2022-02-08 18:15:04 +01:00 |
|
smilerz
|
62adc5a91f
|
make +/- search fields not clickable
|
2022-02-08 09:57:23 -06:00 |
|
smilerz
|
dc71260baa
|
Merge branch 'additional_fixes' into feature/custom_filters
|
2022-02-08 09:05:07 -06:00 |
|
smilerz
|
88b3ba1427
|
various fixes
|
2022-02-08 08:13:16 -06:00 |
|
smilerz
|
93b7e5790d
|
merge clashing commits
|
2022-02-07 18:11:38 -06:00 |
|
smilerz
|
286c6344ec
|
Merge branch 'feature/custom_filters' into feature/custom_filtersv2
|
2022-02-07 17:47:53 -06:00 |
|
smilerz
|
1be5889923
|
tests for makenow filter
|
2022-02-07 17:46:04 -06:00 |
|
Marcel Märtens
|
542b656bea
|
fix python-ldap bugs according to https://github.com/TandoorRecipes/recipes/pull/1499\#issuecomment-1031627178
|
2022-02-07 19:21:35 +01:00 |
|
vabene1111
|
4c5994ee7f
|
Merge branch 'develop' into feature/custom_filters
# Conflicts:
# cookbook/serializer.py
# cookbook/views/api.py
# vue/src/utils/openapi/api.ts
|
2022-02-07 18:56:19 +01:00 |
|
vabene1111
|
f1bbe16606
|
Merge pull request #1498 from MaxJa4/improvement/retry_migrations
Moved DB-waiting from docker-level to container-level
|
2022-02-07 18:42:41 +01:00 |
|
MaxJa4
|
d28a2f81a2
|
Remove always-restart so the container doesn't boot-loop on error
|
2022-02-07 18:14:03 +01:00 |
|
MaxJa4
|
855f1e4ee7
|
Remove always-restart so the container doesn't boot-loop on error
|
2022-02-07 18:13:58 +01:00 |
|
MaxJa4
|
b53a9a1c07
|
Remove always-restart so the container doesn't boot-loop on error
|
2022-02-07 18:13:50 +01:00 |
|
MaxJa4
|
20cc4b93a9
|
Add max amount of retries for web container boot
|
2022-02-07 18:13:19 +01:00 |
|
vabene1111
|
c92c3e7d85
|
improved comment formatting
|
2022-02-07 17:43:57 +01:00 |
|
smilerz
|
d6af318c21
|
tests for single food reset inherit and additional inheritted fields
|
2022-02-07 09:16:48 -06:00 |
|
vabene1111
|
969df37e28
|
fixed sharing and added additional tests
|
2022-02-07 15:43:06 +01:00 |
|