mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-02 04:39:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,333 Commits 21 Branches 170 Tags
bc7208691203e37d3f8cb612befbc0806fd0eb7d
Commit Graph

3333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Wolschon
8f08ba7114 #1093 conditional receipt link in plan 2022-01-12 16:15:55 +01:00
Marcus Wolschon
8a4f35e592 #1093 Recipe link in plan 
#1093 add a recipe link into meal plan
 2022-01-12 11:37:08 +01:00
Marcus Wolschon
80de87d459 #1275 
#1275 readable receipt file names in default export
 2022-01-11 21:31:02 +01:00
smilerz
f9b04a3f1e bug fix 2022-01-11 08:33:42 -06:00
smilerz
f7cb067b52 construct values in queryset instead of serializer methods 2022-01-11 07:24:59 -06:00
smilerz
25ccea90e0 WIP 2022-01-10 15:05:56 -06:00
vabene1111
93b868bc69 fixed valid filter on invite link counter 2022-01-09 18:25:38 +01:00
MaxJa4
acfb02cc0e Extension and hopefully simplification of bug template 
To get more information about bugs and prohibit having to ask one by one for specific information, I extended and redesigned the bug template.
Fell free to change parts or suggest changes.
Please note, that all explanatory parts are hidden as comments in the markdown (which the user will see when creating a bug ticket) so they don't unnecessarily clutter the finished bug report.
 2022-01-09 14:21:45 +01:00
MaxJa4
79c8edd354 Some additional info for reverse proxy setups. 
Since there have been quite some people with basic docker setup issues when using a reverse proxy and very basic reverse proxies like a nginx running locally as a proxy or Caddy, I figured these added sentences might clear things up for some people.
Feel free to suggest additional topics which should be added or refined.
 2022-01-07 20:14:49 +01:00
vabene1111
e1e53d12f8 playing around with the reciupe switcher 2022-01-07 16:19:25 +01:00
vabene1111
30683fe455 Merge pull request #1252 from smilerz/sw_at_ScriptName 
change manifest paths to be relative
 2022-01-07 15:39:49 +01:00
vabene1111
c20aae3efc fixed markdown issue 2022-01-07 11:13:13 +01:00
vabene1111
5e2ca250b0 fixed nav and export required recipe 2022-01-07 11:01:53 +01:00
vabene1111
d506952602 small PDF export tweaks 2022-01-07 10:55:27 +01:00
vabene1111
0a6abf9688 Merge pull request #1211 from TiagoRascazzi/develop 
Added Saffron and PDF export format
 2022-01-07 10:31:13 +01:00
vabene1111
6c4b1e76eb Merge pull request #1251 from smilerz/fail_connection_gracefully 
ConnectError fail gracefully during URL import
 2022-01-07 10:19:00 +01:00
vabene1111
1f391b794b Merge pull request #1250 from TandoorRecipes/dependabot/npm_and_yarn/vue/mermaid-8.13.8 
Bump mermaid from 8.13.5 to 8.13.8 in /vue
 2022-01-07 10:18:45 +01:00
smilerz
983d66c197 change manifest paths to be relative 2022-01-06 15:11:24 -06:00
dependabot[bot]
ab2098151b Bump mermaid from 8.13.5 to 8.13.8 in /vue 
Bumps [mermaid](https://github.com/knsv/mermaid) from 8.13.5 to 8.13.8.
- [Release notes](https://github.com/knsv/mermaid/releases)
- [Changelog](https://github.com/mermaid-js/mermaid/blob/develop/docs/CHANGELOG.md)
- [Commits](https://github.com/knsv/mermaid/compare/8.13.5...8.13.8)

---
updated-dependencies:
- dependency-name: mermaid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-06 19:48:16 +00:00
vabene1111
6053b1419c fixed undefined var 2022-01-06 16:57:17 +01:00
vabene1111
5c98f06208 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-06 16:34:53 +01:00
vabene1111
c141dc850f Merge pull request #1245 from TandoorRecipes/fix_scopes_subfolder 
added prefix to request.path.startswith() conditionals
 2022-01-06 16:30:27 +01:00
vabene1111
0283835a96 Merge pull request #1240 from TandoorRecipes/feature/shopping_list_v2 
Feature/shopping list v2
 2022-01-06 16:27:44 +01:00
vabene1111
724217f142 Merge branch 'develop' into feature/shopping_list_v2 2022-01-06 16:27:39 +01:00
vabene1111
0094fd28e2 Merge pull request #1247 from TandoorRecipes/feature/related_recipe_switcher 
Feature/related recipe switcher
 2022-01-06 16:22:54 +01:00
vabene1111
54b57a8bcb Merge branch 'develop' into feature/related_recipe_switcher 2022-01-06 16:22:44 +01:00
vabene1111
0778025a0c Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-06 16:08:17 +01:00
vabene1111
063a0dec24 Merge branch 'master' into develop 
# Conflicts:
#	requirements.txt
 2022-01-06 16:08:06 +01:00
smilerz
b09acefa6a fix 1244 2022-01-06 07:49:53 -06:00
smilerz
6a1fcabae0 added prefix to request.path.startswith() conditionals 2022-01-06 07:37:02 -06:00
smilerz
13115a1e53 fixes 1176 2022-01-05 17:49:38 -06:00
smilerz
f65b5d0733 clear unit after adding shopping list item 2022-01-05 16:41:26 -06:00
smilerz
922eb7402b fix tess 2022-01-05 15:20:10 -06:00
smilerz
2c76fb7b69 make food onhand when complete shopping entry 2022-01-05 15:20:10 -06:00
smilerz
7c89117e04 make on_hand multiuser 2022-01-05 15:20:10 -06:00
smilerz
b919fb4ae8 quick add shoppinglist 2022-01-05 15:20:10 -06:00
smilerz
29aa52aa3d fix saving old list 2022-01-05 15:20:10 -06:00
smilerz
214db80dac add category context menu 2022-01-05 15:20:10 -06:00
Hrachya Kocharyan
25c1689ca0 Translated using Weblate (Armenian) 
Currently translated at 39.4% (82 of 208 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/hy/
 2022-01-05 07:00:36 +00:00
Tiago Rascazzi
10001dde7b Fix default export 2022-01-04 13:55:13 -05:00
Tiago Rascazzi
578154510b Merge shopping_list develop 2022-01-04 13:19:34 -05:00
vabene1111
8a99907a51 reverted some updates 2022-01-04 17:32:17 +01:00
vabene1111
636fa8f318 Merge pull request #1200 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue-simple-calendar-6.0.3 
Bump vue-simple-calendar from 5.0.1 to 6.0.3 in /vue
 2022-01-04 16:23:09 +01:00
vabene1111
7efbc9c42e Merge pull request #1197 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/eslint-config-typescript-10.0.0 
Bump @vue/eslint-config-typescript from 9.1.0 to 10.0.0 in /vue
 2022-01-04 16:23:03 +01:00
dependabot[bot]
b05639110a Bump vue-simple-calendar from 5.0.1 to 6.0.3 in /vue 
Bumps [vue-simple-calendar](https://github.com/richardtallent/vue-simple-calendar) from 5.0.1 to 6.0.3.
- [Release notes](https://github.com/richardtallent/vue-simple-calendar/releases)
- [Changelog](https://github.com/richardtallent/vue-simple-calendar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/richardtallent/vue-simple-calendar/commits/v6.0.3)

---
updated-dependencies:
- dependency-name: vue-simple-calendar
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 15:22:08 +00:00
vabene1111
1fe673ba1e Merge pull request #1230 from TandoorRecipes/dependabot/pip/django-cors-headers-3.10.1 
Bump django-cors-headers from 3.10.0 to 3.10.1
 2022-01-04 16:21:54 +01:00
vabene1111
0a89bf4a10 Merge pull request #1229 from TandoorRecipes/dependabot/pip/django-4.0.1 
Bump django from 3.2.10 to 4.0.1
 2022-01-04 16:21:49 +01:00
vabene1111
049d218f7b Merge pull request #1228 from TandoorRecipes/dependabot/pip/requests-2.27.0 
Bump requests from 2.26.0 to 2.27.0
 2022-01-04 16:21:45 +01:00
vabene1111
0030775e55 Merge pull request #1227 from TandoorRecipes/dependabot/pip/recipe-scrapers-13.10.1 
Bump recipe-scrapers from 13.7.0 to 13.10.1
 2022-01-04 16:21:40 +01:00
dependabot[bot]
cd49311cba Bump django from 3.2.10 to 4.0.1 
Bumps [django](https://github.com/django/django) from 3.2.10 to 4.0.1.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.10...4.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 15:21:11 +00:00