Commit Graph

173 Commits

Author SHA1 Message Date
Bruno BELANYI
6b04c92297 Fix multiple file field
Due to [1], the previous solution does not work on recent Django releases.

See [2] for the documented work-around, as applied in this commit.

Closes #2457.

[1]: https://docs.djangoproject.com/en/4.2/releases/4.2.1/
[2]: https://docs.djangoproject.com/en/4.2/topics/http/file-uploads/#uploading-multiple-files
2023-05-04 22:41:19 +01:00
vabene1111
f47470a9ad wip rezeptsuitede importer 2023-01-29 22:06:08 +01:00
Niklas Schwarz
b1ad5ef205 Add option to space to enable plural name usage
* Add option to space to enable usage of plural name
  for food and unit per space

* Respect option per space to use the plural name
2022-11-11 18:15:57 +01:00
vabene1111
da09602834 removed old search pages 2022-07-12 20:05:59 +02:00
vabene1111
007b7294d9 join and leave spaces 2022-05-31 20:38:53 +02:00
vabene1111
2ddb0c719a Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
#	vue/src/apps/RecipeEditView/RecipeEditView.vue
#	vue/src/utils/openapi/api.ts
2022-04-22 16:41:13 +02:00
Kaibu
45a86a22e3 recipe switcher and navbar fixes
also added left_hand to global preferences
2022-04-18 14:13:23 +02:00
vabene1111
48e9f3f8a9 added cookmate importer 2022-04-04 22:49:50 +02:00
vabene1111
85aad42529 added mela recipes importer 2022-04-04 21:09:47 +02:00
smilerz
c8dcca8630
fix recipe search in export form (converted to change safe genericAPI) 2022-02-23 17:24:06 -06:00
smilerz
a7d66fa850
export recipes from saved filter 2022-02-22 15:18:39 -06:00
Sebastian Weber
c20e982fb1
Fix typos 2022-01-20 00:50:41 +01:00
smilerz
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
vabene1111
d4242a244d Merge branch 'master' into develop
# Conflicts:
#	cookbook/forms.py
2022-01-17 15:16:37 +01:00
vabene1111
8a7c4e11c9 fixed invite link counting 2022-01-17 15:16:13 +01:00
vabene1111
745bb58c7e fixed valid filter on invite link counter 2022-01-17 15:02:41 +01:00
vabene1111
93b868bc69 fixed valid filter on invite link counter 2022-01-09 18:25:38 +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
smilerz
2c76fb7b69 make food onhand when complete shopping entry 2022-01-05 15:20:10 -06:00
Tiago Rascazzi
578154510b Merge shopping_list develop 2022-01-04 13:19:34 -05:00
Tiago Rascazzi
0aafd8d8b2 Added Saffron export format 2022-01-03 13:28:21 -05:00
Tiago Rascazzi
ba032e9353 Added PDF export format 2022-01-03 00:58:02 -05:00
smilerz
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
vabene1111
c961909342 fixed import 2021-12-29 15:54:20 +01:00
smilerz
24bef756e8 fix filter_to_supermarket setting 2021-12-28 12:03:35 -06:00
smilerz
b0705da1fe filter fields available to inherit in space settings 2021-12-28 12:03:35 -06:00
smilerz
453b1eb5b9 rebase and fixes 2021-12-28 12:03:34 -06:00
smilerz
24b0643765 copy shopping as markdown 2021-12-28 12:03:34 -06:00
smilerz
df54b10610 download as CSV 2021-12-28 12:03:33 -06:00
smilerz
2b41fbc9f8 Fix after rebase 2021-12-28 12:03:33 -06:00
smilerz
a217db5822 add new unit/food from shopping list 2021-12-28 12:03:32 -06:00
smilerz
ecac3f3c2d related recipes included when adding mealplan to shopping list 2021-12-28 12:03:32 -06:00
smilerz
7a0b395107 alpha shopping list 2021-12-28 12:03:32 -06:00
smilerz
7c598720d0 WIP 2021-12-28 12:03:32 -06:00
smilerz
fbe748db62 food inherit attributes 2021-12-28 12:03:32 -06:00
smilerz
e243e089cc WIP 2021-12-28 12:03:31 -06:00
smilerz
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
vabene1111
3ff15b6766 added copy me that importer 2021-12-23 15:54:48 +01:00
vabene1111
086f8b4d62 made messages 2021-11-08 17:10:03 +01:00
Kaibu
4288d76afd added more translations 2021-11-07 17:32:43 +01:00
vabene1111
dda2529f6f fixed plan share space filter 2021-11-05 19:42:41 +01:00
xeals
34d9f5a1d8
Correct capitalization for KJ in preference form 2021-10-25 17:46:05 +11:00
xeals
b1b770c9e5
Add KJ user preference 2021-10-25 17:25:35 +11:00
vabene1111
20db5cfd74 search presets 2021-09-30 13:46:49 +02:00
vabene1111
856c34a3bf fixed and expanded on trigram search 2021-09-28 19:12:51 +02:00
vabene1111
b949fe6a90 removed some deprecated stuff 2021-09-23 15:19:10 +02:00
vabene1111
94e357f4f6 cookbookapp importer 2021-09-15 10:26:31 +02:00
vabene1111
70f96d3fe6 plan to eat importer 2021-09-14 22:47:26 +02:00