smilerz
|
f7cb067b52
|
construct values in queryset instead of serializer methods
|
2022-01-11 07:24:59 -06: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
|
5c98f06208
|
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
|
2022-01-06 16:34:53 +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
|
13115a1e53
|
fixes 1176
|
2022-01-05 17:49:38 -06:00 |
|
smilerz
|
2c76fb7b69
|
make food onhand when complete shopping entry
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
214db80dac
|
add category context menu
|
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
|
582e145a9f
|
Fix after rebase
|
2021-12-30 13:55:38 -06:00 |
|
smilerz
|
79b4bc387e
|
change ingore_inherit to inherit_fields
|
2021-12-30 12:54:39 -06:00 |
|
vabene1111
|
bddaa77f71
|
fixed space not honourd in invite link
|
2021-12-30 17:37:10 +01:00 |
|
smilerz
|
e257a8d29b
|
fix responsive display of shopping list
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
453b1eb5b9
|
rebase and fixes
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
ee4ab41c1c
|
test shoppingFood API
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
1364f75f21
|
test userpreference food_inherit defaults
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
a51eb7a2cb
|
pytest edit shopping list recipes
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
262387da3e
|
pytest shopping list from recipe methods
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
ab968f225b
|
test recent shopping list
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
24b0643765
|
copy shopping as markdown
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
0693d31550
|
WIP
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
1d224d8658
|
yarn build
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
2b41fbc9f8
|
Fix after rebase
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
b92c027919
|
food inherit tests
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
94b2e9b01c
|
minor updates
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
f245aa8b4f
|
add to shopping from card context menu
|
2021-12-28 12:03:32 -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
|
c5c76cadea
|
getUserPreference available for all UserPreferences
|
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 |
|
smilerz
|
3516505dd1
|
fix bug in get_facet_api
|
2021-12-16 09:08:32 -06:00 |
|
vabene1111
|
3bc1daa72e
|
fixed import
|
2021-11-30 18:48:07 +01:00 |
|
vabene1111
|
4d2e7eadb6
|
Merge branch 'develop' into generic_modal_v2
|
2021-11-30 17:23:27 +01:00 |
|
vabene1111
|
7c985cec23
|
Merge pull request #1088 from smilerz/search_troubleshooting
add search debug
|
2021-11-30 17:21:40 +01:00 |
|
vabene1111
|
7f22e0a275
|
fixed duplicate results on cook book view api
|
2021-11-27 16:03:08 +01:00 |
|
smilerz
|
55a0304700
|
add search debug
|
2021-11-24 12:10:15 -06:00 |
|
smilerz
|
5b6dd62f8e
|
generic modal refactored
|
2021-11-23 19:18:10 -06:00 |
|
vabene1111
|
695cab29a1
|
fixed book sharing and added step page
|
2021-11-14 15:33:25 +01:00 |
|
vabene1111
|
5ae440d5c9
|
fixed image on url importer
|
2021-11-13 12:30:23 +01:00 |
|
vabene1111
|
dda2529f6f
|
fixed plan share space filter
|
2021-11-05 19:42:41 +01:00 |
|
vabene1111
|
d681e3ced3
|
disable external recipes in hosted version
|
2021-11-04 15:56:22 +01:00 |
|
vabene1111
|
1fad1d2b8f
|
improved deletion of recipes
|
2021-11-04 12:27:21 +01:00 |
|