vabene1111
|
fa12d02a3d
|
fixed tests
|
2021-06-12 20:22:30 +02:00 |
|
vabene1111
|
061aefd233
|
new file system updates
|
2021-06-09 14:02:33 +02:00 |
|
vabene1111
|
9eb17df575
|
added basic support for files
|
2021-06-08 20:17:48 +02:00 |
|
vabene1111
|
3aade540c1
|
file view
|
2021-06-08 13:12:04 +02:00 |
|
vabene1111
|
d67bb9de25
|
fixed mealplan update non recipe entries
|
2021-05-19 13:12:12 +02:00 |
|
vabene1111
|
bbd4d20210
|
uniqueness fixes
|
2021-05-18 18:20:08 +02:00 |
|
smilerz
|
faf458e8ef
|
Squashed commit of the following:
commit 707d862e01a7497a1f22879d314b865a35e0e85b
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 10:35:00 2021 -0500
works now
commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 10:25:24 2021 -0500
updated serializer and api
commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 10:20:19 2021 -0500
fixed bookmarklet
commit 9779104902d3be0258c95cd2eeebcba0d5d48892
Merge: bb8262c 0cb3928
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 09:56:27 2021 -0500
Merge branch 'bookmarklet' into json_import
commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 09:42:53 2021 -0500
retrieve bookmarklet ID from get
commit e89e0218de684d40b2e2bfb6ba833891206c828e
Author: smilerz <smilerz@gmail.com>
Date: Wed Apr 14 09:29:33 2021 -0500
Revert "fixed broken tab"
This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6.
commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79
Merge: b1e73aa 35a7f62
Author: smilerz <smilerz@gmail.com>
Date: Sun Apr 11 20:35:57 2021 -0500
Merge branch 'main_fork' into json_import
|
2021-05-01 16:30:22 -05:00 |
|
smilerz
|
6acbd6d308
|
added hack to fix scopes & CORS for bookmarklet
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
30a357e27f
|
added CORS middleware
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
7bc3292301
|
added bookmarklet model and api
|
2021-05-01 16:30:21 -05:00 |
|
vabene1111
|
3daebc4170
|
Merge branch 'develop' into json_import
|
2021-05-01 22:39:20 +02:00 |
|
vabene1111
|
239ba5f861
|
fixed meal plan notes and recipe links
|
2021-04-29 17:15:06 +02:00 |
|
smilerz
|
66bb5b4328
|
strip spaces from food, keywords and units
|
2021-04-19 17:35:53 -05:00 |
|
vabene1111
|
058d705170
|
meal plan in search
|
2021-04-18 17:19:11 +02:00 |
|
smilerz
|
987be4b04d
|
Fix after rebase
|
2021-04-16 09:02:27 -05:00 |
|
smilerz
|
5e27cd606e
|
added hack to fix scopes & CORS for bookmarklet
|
2021-04-16 09:02:02 -05:00 |
|
smilerz
|
a341fd8ebe
|
added CORS middleware
|
2021-04-16 09:02:02 -05:00 |
|
smilerz
|
9a62b6e4e7
|
added bookmarklet model and api
|
2021-04-16 09:02:02 -05:00 |
|
vabene1111
|
661f7ae789
|
fixed slice fix again
|
2021-03-18 20:34:37 +01:00 |
|
vabene1111
|
8bfbd96398
|
fixed slicing issue
|
2021-03-18 20:24:42 +01:00 |
|
vabene1111
|
de9456e3d7
|
import log api
|
2021-03-18 18:48:29 +01:00 |
|
vabene1111
|
e968a57c06
|
shopping list api tests and refactors
|
2021-03-17 20:42:17 +01:00 |
|
vabene1111
|
641feede74
|
space nested serializers
|
2021-03-17 19:55:34 +01:00 |
|
vabene1111
|
c2addc1121
|
storage api test
|
2021-03-17 00:14:54 +01:00 |
|
vabene1111
|
4d6d84bf5b
|
fixed some tests + added user pref tests
|
2021-03-16 23:46:54 +01:00 |
|
vabene1111
|
a8a132e2a1
|
fixed recipe book entry api and added test
|
2021-03-12 12:33:20 +01:00 |
|
vabene1111
|
3b0413c30e
|
add test for recipe book
|
2021-03-12 10:50:08 +01:00 |
|
vabene1111
|
d7402f60c5
|
meal plan api tests
|
2021-03-12 09:44:16 +01:00 |
|
vabene1111
|
e7f8d58a7d
|
added test for cook log
|
2021-03-10 21:25:18 +01:00 |
|
vabene1111
|
74e731e334
|
inject space context into serializer writes
|
2021-02-25 16:45:47 +01:00 |
|
vabene1111
|
59cc22a877
|
wip serializer permission
|
2021-02-23 20:44:13 +01:00 |
|
vabene1111
|
846c660811
|
usr signup and more
|
2021-02-21 15:08:43 +01:00 |
|
vabene1111
|
d45adc1688
|
wip on new import/export system
|
2021-02-07 13:27:15 +01:00 |
|
vabene1111
|
bcd2e44493
|
added simple entry mode to shopping
|
2021-02-03 19:38:09 +01:00 |
|
vabene1111
|
148324b37f
|
fixed nutrition value database duplication
|
2021-01-28 14:44:23 +01:00 |
|
vabene1111
|
935dee853e
|
added ordering of supermarket categories
|
2021-01-26 19:19:42 +01:00 |
|
vabene1111
|
7b75e279b0
|
shopping list ui somewhat bearable
|
2021-01-26 18:21:45 +01:00 |
|
vabene1111
|
15c758b24a
|
update food after changing category
|
2021-01-26 18:08:41 +01:00 |
|
vabene1111
|
26ec1724a5
|
updating food working
|
2021-01-26 17:56:43 +01:00 |
|
vabene1111
|
96c4823664
|
supermarket shopping list relation
|
2021-01-26 16:53:05 +01:00 |
|
vabene1111
|
5ab19b7958
|
supermarket category api working
|
2021-01-26 16:16:45 +01:00 |
|
vabene1111
|
09716f2b00
|
wip supermarket categories
|
2021-01-25 21:58:24 +01:00 |
|
vabene1111
|
36584346cb
|
fixed merging and added shopping ignored ingredients
|
2021-01-25 20:46:19 +01:00 |
|
vabene1111
|
c7dd5dd8bb
|
wip shopping list stuff
|
2021-01-25 18:21:55 +01:00 |
|
vabene1111
|
a16ad2c887
|
added ingredient merging to shopping list
|
2021-01-25 17:24:03 +01:00 |
|
vabene1111
|
6992bf83aa
|
added customizable Servings text
|
2021-01-21 20:05:46 +01:00 |
|
vabene1111
|
e5b7cf5f30
|
further improvised import/export feature
|
2021-01-19 21:41:52 +01:00 |
|
vabene1111
|
08733751aa
|
add to book reimplemented
|
2021-01-14 01:21:15 +01:00 |
|
vabene1111
|
95aff5c998
|
cook log
|
2021-01-13 15:21:51 +01:00 |
|
vabene1111
|
ddc484562b
|
recipe description
|
2021-01-13 13:26:48 +01:00 |
|