Commit Graph

191 Commits

Author SHA1 Message Date
3e641e4d28 Merge remote-tracking branch 'origin/develop' into HomeAssistantConnector
# Conflicts:
#	cookbook/forms.py
#	requirements.txt
2024-02-20 09:18:19 +01:00
33ac00e294 improved importer functions unit and category 2024-02-19 09:41:45 +01:00
f50bf39e60 merge 2024-02-17 00:34:16 +05:30
beb860acc6 Merge remote-tracking branch 'origin/develop' into HomeAssistantConnector
# Conflicts:
#	cookbook/views/api.py
#	recipes/settings.py
2024-02-17 00:29:29 +05:30
9506f2889a deprecate unused forms 2024-02-16 09:21:27 -06:00
0499745772 added captcha option to password reset form 2024-02-13 10:56:43 +01:00
8b5b063da6 Merge branch 'develop' into HomeAssistantConnector 2024-01-29 09:57:10 +01:00
6b4b2a8f87 removed use_plural space attribute and left over settings 2024-01-28 08:42:42 +01:00
409c0295ec convert example & homeassistant specific configs to a generic with all optional fields 2024-01-17 22:40:44 +01:00
245787b89e make the connectors form be able to display all types for connectors 2024-01-14 17:03:02 +01:00
a61f79507b add enabled field 2024-01-11 23:11:04 +01:00
e5f0c19cdc Add ConnectorManager component which allows for Connectors to listen to triggers and do actions on them. Also add HomeAssistantConfig which stores the configuration for the HomeAssistantConnector 2024-01-11 22:13:20 +01:00
3d8b1d6ccb lots of theming related changes
- upload a custom logo for your space
    - space settings can override user settings for theming
    - spaces can upload custom CSS overrides
    - allow users to disable showing the tandoor/space logo
    - allow changing navigation background color to any color desired
    - allow switching navigation text color between dark/light (different effects depending on theme)
2024-01-01 22:14:01 +01:00
fd70adf19d fixes recipe export 2023-10-27 14:43:48 -05:00
3f63eab68c Merge branch 'develop' into remove_facets 2023-09-12 15:36:14 +02:00
94f398a7f6 added multi day meal planning 2023-09-08 15:31:42 +02:00
9ee4be621b remove facets and treeselect 2023-09-07 13:20:51 -05:00
6785033a21 Add step-level configuration whether an ingredients table should be shown. User-level default added to settings 2023-08-23 21:46:09 -07:00
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
f47470a9ad wip rezeptsuitede importer 2023-01-29 22:06:08 +01:00
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
da09602834 removed old search pages 2022-07-12 20:05:59 +02:00
007b7294d9 join and leave spaces 2022-05-31 20:38:53 +02:00
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
45a86a22e3 recipe switcher and navbar fixes
also added left_hand to global preferences
2022-04-18 14:13:23 +02:00
48e9f3f8a9 added cookmate importer 2022-04-04 22:49:50 +02:00
85aad42529 added mela recipes importer 2022-04-04 21:09:47 +02:00
c8dcca8630 fix recipe search in export form (converted to change safe genericAPI) 2022-02-23 17:24:06 -06:00
a7d66fa850 export recipes from saved filter 2022-02-22 15:18:39 -06:00
c20e982fb1 Fix typos 2022-01-20 00:50:41 +01:00
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
d4242a244d Merge branch 'master' into develop
# Conflicts:
#	cookbook/forms.py
2022-01-17 15:16:37 +01:00
8a7c4e11c9 fixed invite link counting 2022-01-17 15:16:13 +01:00
745bb58c7e fixed valid filter on invite link counter 2022-01-17 15:02:41 +01:00
93b868bc69 fixed valid filter on invite link counter 2022-01-09 18:25:38 +01:00
5e2ca250b0 fixed nav and export required recipe 2022-01-07 11:01:53 +01:00
d506952602 small PDF export tweaks 2022-01-07 10:55:27 +01:00
0a6abf9688 Merge pull request #1211 from TiagoRascazzi/develop
Added Saffron and PDF export format
2022-01-07 10:31:13 +01:00
2c76fb7b69 make food onhand when complete shopping entry 2022-01-05 15:20:10 -06:00
578154510b Merge shopping_list develop 2022-01-04 13:19:34 -05:00
0aafd8d8b2 Added Saffron export format 2022-01-03 13:28:21 -05:00
ba032e9353 Added PDF export format 2022-01-03 00:58:02 -05:00
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
c961909342 fixed import 2021-12-29 15:54:20 +01:00
24bef756e8 fix filter_to_supermarket setting 2021-12-28 12:03:35 -06:00
b0705da1fe filter fields available to inherit in space settings 2021-12-28 12:03:35 -06:00
453b1eb5b9 rebase and fixes 2021-12-28 12:03:34 -06:00
24b0643765 copy shopping as markdown 2021-12-28 12:03:34 -06:00
df54b10610 download as CSV 2021-12-28 12:03:33 -06:00
2b41fbc9f8 Fix after rebase 2021-12-28 12:03:33 -06:00