vabene1111
|
3074d916dc
|
many signup and space management fixes
|
2021-06-07 16:46:28 +02:00 |
|
vabene1111
|
6fc0c02674
|
started work on supermarket edit view
|
2021-05-31 18:40:59 +02:00 |
|
vabene1111
|
71fdfe6acb
|
ugly space management hack - will be improved later
|
2021-05-28 18:19:53 +02:00 |
|
vabene1111
|
c8054349b2
|
reworked invite system
|
2021-05-28 16:49:03 +02:00 |
|
smilerz
|
2ecc0ab680
|
Fix after rebase
|
2021-05-01 16:30:22 -05:00 |
|
smilerz
|
5fff5b97da
|
simplified url import
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
7bc3292301
|
added bookmarklet model and api
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
7fb440a855
|
bookmarklet passing data to form
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
0e27ddab74
|
added bookmarklet that doesn't work yet
|
2021-05-01 16:30:21 -05:00 |
|
smilerz
|
9cc6a1dc79
|
combined json import and source import
|
2021-05-01 16:30:20 -05:00 |
|
smilerz
|
58e33ef31a
|
more cleanup from ugly merge
|
2021-05-01 16:30:20 -05:00 |
|
smilerz
|
25fb41baed
|
update urls.py
|
2021-05-01 16:30:20 -05:00 |
|
smilerz
|
55ba568f3c
|
import raw json/html
|
2021-05-01 16:30:20 -05:00 |
|
Patrick Pirker
|
7414033495
|
Allow recipes to be imported from json directly
|
2021-05-01 16:30:20 -05:00 |
|
smilerz
|
987be4b04d
|
Fix after rebase
|
2021-04-16 09:02:27 -05:00 |
|
smilerz
|
efe4c4043d
|
simplified url import
|
2021-04-16 09:02:03 -05:00 |
|
smilerz
|
9a62b6e4e7
|
added bookmarklet model and api
|
2021-04-16 09:02:02 -05:00 |
|
smilerz
|
f80c44bca3
|
bookmarklet passing data to form
|
2021-04-16 09:02:02 -05:00 |
|
smilerz
|
09d2e9f831
|
added bookmarklet that doesn't work yet
|
2021-04-16 09:02:02 -05:00 |
|
smilerz
|
40a2f7ff90
|
combined json import and source import
|
2021-04-16 09:02:01 -05:00 |
|
smilerz
|
7c8d41753c
|
more cleanup from ugly merge
|
2021-04-16 09:02:01 -05:00 |
|
smilerz
|
f8fedcac82
|
update urls.py
|
2021-04-16 09:02:01 -05:00 |
|
smilerz
|
83fce6461a
|
import raw json/html
|
2021-04-16 09:02:01 -05:00 |
|
Patrick Pirker
|
386834f409
|
Allow recipes to be imported from json directly
|
2021-04-16 09:02:01 -05:00 |
|
vabene1111
|
c1abff8da0
|
v2 search basics
|
2021-04-15 22:12:31 +02:00 |
|
vabene1111
|
fad40dab6c
|
client api generation
|
2021-04-08 22:05:05 +02:00 |
|
vabene1111
|
afadc61d5d
|
telegram bot
|
2021-03-18 22:34:53 +01:00 |
|
vabene1111
|
8a051b531d
|
import response view
|
2021-03-18 20:00:13 +01:00 |
|
vabene1111
|
de9456e3d7
|
import log api
|
2021-03-18 18:48:29 +01:00 |
|
vabene1111
|
48c90c483a
|
merged PR 474 adding manual json import
|
2021-03-18 12:36:00 +01:00 |
|
vabene1111
|
46fb02376e
|
recipe share basics
|
2021-02-21 16:37:04 +01:00 |
|
vabene1111
|
846c660811
|
usr signup and more
|
2021-02-21 15:08:43 +01:00 |
|
vabene1111
|
c42266b82c
|
basic space stuff
|
2021-02-19 11:53:30 +01:00 |
|
vabene1111
|
150d4c7309
|
refactor assset and paths
|
2021-02-15 21:01:54 +01:00 |
|
vabene1111
|
d45adc1688
|
wip on new import/export system
|
2021-02-07 13:27:15 +01:00 |
|
vabene1111
|
b0fe98c091
|
fixed shopping url
|
2021-02-03 23:50:33 +01:00 |
|
vabene1111
|
103878e107
|
shopping list shortcut link
|
2021-02-03 23:05:42 +01:00 |
|
vabene1111
|
bcd2e44493
|
added simple entry mode to shopping
|
2021-02-03 19:38:09 +01:00 |
|
vabene1111
|
63cfa14a21
|
allauth working and integrated
|
2021-01-28 13:40:07 +01:00 |
|
vabene1111
|
09716f2b00
|
wip supermarket categories
|
2021-01-25 21:58:24 +01:00 |
|
vabene1111
|
2e3e629406
|
actually decent service worker wip
|
2021-01-17 18:33:12 +01:00 |
|
vabene1111
|
f18980a9e2
|
workbox expirments
|
2021-01-14 13:31:56 +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
|
bb43ed203a
|
display of external recipes
|
2021-01-13 02:16:16 +01:00 |
|
Tobias Lindenberg
|
8ddbc34017
|
resolve conflicts
Signed-off-by: Tobias Lindenberg <tobias@lindenberg.pm>
|
2021-01-10 14:44:20 +01:00 |
|
Tobias Lindenberg
|
afc7718c95
|
urls
|
2021-01-10 13:28:18 +01:00 |
|
vabene1111
|
e50239f067
|
added basic service worker
|
2021-01-10 12:00:16 +01:00 |
|
vabene1111
|
910b28fe2d
|
meal plan date handling rewrite
|
2020-12-14 17:11:40 +01:00 |
|
vabene1111
|
148ce2faef
|
shopping list item checking
|
2020-09-21 22:55:52 +02:00 |
|
vabene1111
|
0ff65d35dc
|
partial shopping list saving
|
2020-09-07 13:09:03 +02:00 |
|
vabene1111
|
7f68bbd25d
|
added link based signup
|
2020-09-01 21:35:37 +02:00 |
|
vabene1111
|
392ee73719
|
basics of invite link creation
|
2020-09-01 14:57:20 +02:00 |
|
vabene1111
|
be55e034bf
|
first parts of shopping rework
|
2020-08-11 15:24:12 +02:00 |
|
vabene1111
|
8055754455
|
shopping list basics
|
2020-08-11 12:17:12 +02:00 |
|
vabene1111
|
a8b1ee9765
|
changed url import api call to post url
|
2020-08-09 20:13:05 +02:00 |
|
vabene1111
|
9510562576
|
backup basic fixture
|
2020-07-15 22:05:48 +02:00 |
|
vabene1111
|
9b9fbd5cab
|
added food api view tests
|
2020-07-09 22:19:24 +02:00 |
|
vabene1111
|
bfe9e794c5
|
added tests for unit api view
|
2020-07-09 22:13:33 +02:00 |
|
vabene1111
|
3e16361322
|
added keyword api tests
|
2020-07-09 22:00:14 +02:00 |
|
vabene1111
|
69d5e628c5
|
sync admin view + tests
|
2020-07-08 23:40:53 +02:00 |
|
vabene1111
|
e65c8436ef
|
sync api view + tests
|
2020-07-08 23:28:28 +02:00 |
|
vabene1111
|
e83565b1f2
|
added api endpoints and tests
|
2020-07-08 23:19:39 +02:00 |
|
vabene1111
|
4a6b32d9af
|
super basic edit view
|
2020-06-25 23:24:09 +02:00 |
|
vabene1111
|
df912b8865
|
renamed recipeingredient to ingredient
|
2020-06-25 21:37:18 +02:00 |
|
vabene1111
|
f685253645
|
renamed ingredient to food
|
2020-06-25 21:24:03 +02:00 |
|
vabene1111
|
dc91e1e8ed
|
fixed url router and added recipe import test ressources
|
2020-06-22 23:35:18 +02:00 |
|
vabene1111
|
976dd13a31
|
basic importing working
|
2020-06-22 23:23:06 +02:00 |
|
vabene1111
|
9e748552b2
|
recipe url import ld json
|
2020-06-22 21:16:31 +02:00 |
|
vabene1111
|
315b4521b6
|
test page
|
2020-06-22 12:14:24 +02:00 |
|
vabene1111
|
14a5d43dc8
|
added complete test for user preference api
|
2020-06-17 14:33:55 +02:00 |
|
vabene1111
|
18bfecb026
|
fixed DRF object permission
|
2020-06-17 12:12:42 +02:00 |
|
vabene1111
|
4ee5a4fd9f
|
testing with user permission
|
2020-06-17 11:06:08 +02:00 |
|
vabene1111
|
d012385088
|
WIP api stuff
|
2020-06-16 20:32:41 +02:00 |
|
vabene1111
|
0a8270e7cf
|
api documentation basics
|
2020-06-16 17:21:50 +02:00 |
|
vabene1111
|
dee7249347
|
added sharing links and appropriate tests
|
2020-06-16 11:23:58 +02:00 |
|
vabene1111
|
d1bf4d4bbb
|
added ical export support
|
2020-06-11 18:38:56 +02:00 |
|
vabene1111
|
729d573460
|
imrpoved detail view
|
2020-06-11 10:26:40 +02:00 |
|
vabene1111
|
8cb6ed2f60
|
adding items to plan
|
2020-06-09 13:11:01 +02:00 |
|
vabene1111
|
3aedbfbdc3
|
Merge branch 'develop' into feature/meal-planning
# Conflicts:
# requirements.txt
|
2020-06-04 13:12:52 +02:00 |
|
vabene1111
|
7140cb0f93
|
basic system information page
|
2020-06-03 23:07:19 +02:00 |
|
vabene1111
|
233f2a911f
|
nothing working yet
|
2020-06-02 14:33:27 +02:00 |
|
vabene1111
|
2fcd207dc7
|
basic api
|
2020-06-02 12:04:14 +02:00 |
|
vabene1111
|
0df86b940f
|
setup page
|
2020-06-02 10:40:21 +02:00 |
|
vabene1111
|
cd11cc58cf
|
possible duplicate fix
|
2020-05-15 12:49:31 +02:00 |
|
vabene1111
|
f6aa50bbfc
|
added history page
|
2020-05-11 12:59:54 +02:00 |
|
vabene1111
|
123dc1a74d
|
meal plan entry view
|
2020-05-08 00:10:23 +02:00 |
|
vabene1111
|
22e403e0ff
|
added basic markdown doc
|
2020-05-03 00:43:13 +02:00 |
|
vabene1111
|
6a963c26b2
|
recipe rating
|
2020-05-02 17:31:35 +02:00 |
|
vabene1111
|
43eb10e488
|
added basic exporting capability
|
2020-04-25 22:05:55 +02:00 |
|
vabene1111
|
4e9e628162
|
added ability to change default page
|
2020-04-13 22:52:02 +02:00 |
|
vabene1111
|
1d562452df
|
changed behavior of delete original
|
2020-03-17 18:54:44 +01:00 |
|
vabene1111
|
90dbc36402
|
added ability to link recipes to ingredients
|
2020-03-17 18:44:11 +01:00 |
|
vabene1111
|
7518d8c6b1
|
fixed several rewrite issues
|
2020-03-17 17:36:05 +01:00 |
|
vabene1111
|
17b9519fa9
|
refactor generic url creation
|
2020-03-17 17:23:39 +01:00 |
|
vabene1111
|
abd655ce62
|
moved delete to seperate file
|
2020-03-01 12:34:59 +01:00 |
|
vabene1111
|
0c1763b347
|
pdf display working
|
2020-02-19 18:13:11 +01:00 |
|
vabene1111
|
88dc713683
|
WIP pdf embedding
|
2020-02-19 16:55:13 +01:00 |
|
vabene1111
|
c96159e15c
|
dark mode
|
2020-02-04 22:00:47 +01:00 |
|
vabene1111
|
00fdab1678
|
unit merging
|
2020-02-03 11:00:11 +01:00 |
|