Commit Graph

310 Commits

Author SHA1 Message Date
vabene1111
12036b9972 fixes protect error on storage monitor delete #102 2020-06-10 11:45:52 +02:00
vabene1111
bffb260dfa fixed delete source permission 2020-06-10 11:42:44 +02:00
vabene1111
01b9022451 version script test 2020-06-10 10:07:33 +02:00
vabene1111
8cb6ed2f60 adding items to plan 2020-06-09 13:11:01 +02:00
vabene1111
a555906a32 fixed user setup staff permission 2020-06-06 11:31:19 +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
9179bde8f9 name images with uuid instead of recipe ids
in order to stil be able to manually map images to recipes the name consists of uuid_recipeId.png
2020-06-03 22:09:07 +02:00
vabene1111
d09c6dbfed added automatic redirect for setup 2020-06-03 10:51:39 +02:00
vabene1111
233f2a911f nothing working yet 2020-06-02 14:33:27 +02:00
vabene1111
989d8765d7 basic vue stuff working 2020-06-02 12:47:36 +02:00
vabene1111
2fcd207dc7 basic api 2020-06-02 12:04:14 +02:00
vabene1111
a3dc5f283a dynamic meal types 2020-06-02 11:46:16 +02:00
vabene1111
5706776002 added setting to disable recent viewed recipes 2020-06-02 10:53:32 +02:00
vabene1111
0df86b940f setup page 2020-06-02 10:40:21 +02:00
vabene1111
821136787d fixed shopping list headers #78 2020-06-01 23:23:46 +02:00
vabene1111
dfb1d80ca0 fixed duplicates in recent view 2020-05-27 09:38:57 +02:00
vabene1111
744fbc7a46 revert psql distinct change 2020-05-15 13:12:52 +02:00
vabene1111
cd11cc58cf possible duplicate fix 2020-05-15 12:49:31 +02:00
vabene1111
85e3155b50 added group required filter to history view 2020-05-11 13:08:00 +02:00
vabene1111
f6aa50bbfc added history page 2020-05-11 12:59:54 +02:00
vabene1111
4a68a99907 show last viewd recipes on search page 2020-05-11 12:42:55 +02:00
vabene1111
123dc1a74d meal plan entry view 2020-05-08 00:10:23 +02:00
vabene1111
2e23fcfd5d added sharing to meal plan + fixed meal plan visibility 2020-05-07 23:16:24 +02:00
vabene1111
22e403e0ff added basic markdown doc 2020-05-03 00:43:13 +02:00
vabene1111
4aa2983681 order recipe ingredients 2020-05-02 23:05:36 +02:00
vabene1111
598387efc8 fixed duplicate recipe books when sharing 2020-05-02 21:46:03 +02:00
vabene1111
6a963c26b2 recipe rating 2020-05-02 17:31:35 +02:00
vabene1111
4620c78f5a user preference fixes and improvements 2020-05-02 14:41:54 +02:00
vabene1111
349b9629f8 added sharing to recipe books 2020-05-02 14:15:56 +02:00
vabene1111
64ee18c4d8 improved recipe book design 2020-05-02 13:58:42 +02:00
vabene1111
3a9e5a80ba final style touches + settings 2020-05-02 12:48:22 +02:00
vabene1111
b53f83a76c improved stats page 2020-04-29 17:18:12 +02:00
vabene1111
16963c17dc add default roles to existing users 2020-04-27 18:22:29 +02:00
vabene1111
a9fe821067 added test for comments 2020-04-27 17:48:11 +02:00
vabene1111
1617fa7a3f fixed permissions comments, books 2020-04-27 16:50:05 +02:00
vabene1111
ad467fae28 added basic group permission system 2020-04-26 17:21:44 +02:00
vabene1111
379d5a5177 import export cleanup + features 2020-04-25 23:32:15 +02:00
vabene1111
85a4d5d432 basic import export working 2020-04-25 22:26:59 +02:00
vabene1111
43eb10e488 added basic exporting capability 2020-04-25 22:05:55 +02:00
vabene1111
dab77e8e4f imrpoved index redirect + fixed tests 2020-04-13 23:11:33 +02:00
vabene1111
4e9e628162 added ability to change default page 2020-04-13 22:52:02 +02:00
vabene1111
4f49b06704 user setting default ingredient unit 2020-04-13 22:37:50 +02:00
vabene1111
bdd092e5d3 fixed ingredient amount numeric 2020-04-07 20:13:20 +02:00
tourn
4e7c5f9495 Add buttons to add a meal plan to a specific point in time 2020-03-30 22:06:17 +02:00
vabene1111
d704ddacdd fixed shopping list format 2020-03-27 21:47:00 +01:00
vabene1111
97e2593f72 fixed single import 2020-03-18 16:50:28 +01:00
vabene1111
1cadb1e85e added password change form 2020-03-18 13:06:39 +01:00
vabene1111
9e524a8f22 added user name change 2020-03-18 12:51:13 +01:00
vabene1111
c2dc038ac9 note optional 2020-03-17 22:49:53 +01:00
vabene1111
0c2b3d2d03 added ingredient notes + removed null constraints 2020-03-17 22:47:17 +01: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
deeda425a8 added tests for storage edit 2020-03-17 18:22:13 +01:00
vabene1111
6fcbc9f0cd some basic testing for external recipe edits 2020-03-17 17:48:23 +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
b5e35115fa fixed png's not working in recipes 2020-03-01 12:13:06 +01:00
vabene1111
c8cc140a78 improved recipe edit tests and fixed bugs 2020-02-29 00:00:13 +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
c98dbd065e allow choosing output format of shopping list 2020-02-18 22:41:37 +01:00
vabene1111
43d03ed17d group ingredients in shopping list 2020-02-18 22:33:31 +01:00
vabene1111
46dffe2f63 added ingredient merging 2020-02-18 22:25:21 +01:00
vabene1111
41bfa95cb2 nav color theming 2020-02-17 00:11:15 +01:00
vabene1111
7d4630e3af normalized ingredients 2020-02-16 23:22:44 +01:00
vabene1111
f77aa7c8f0 migrating ingredients 2020-02-16 23:12:16 +01:00
vabene1111
b4cdc92207 catch non existing relation 2020-02-14 00:40:17 +01:00
vabene1111
cc7422a503 theming refactor
moved server side for a better page loading experience and less javascript mess
2020-02-13 23:47:24 +01:00
vabene1111
bc066d29f6 dark mode reverted + meal plan button 2020-02-04 22:18:10 +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
vabene1111
e7227f84ca some more recipe edit cleanup 2020-02-02 22:52:25 +01:00
vabene1111
6753a2c0b5 basic recipe edit test 2020-02-02 22:46:37 +01:00
vabene1111
a2348f531b basics of ingredient unit normalization 2020-01-30 12:26:47 +01:00
vabene1111
227d90d49d basic shopping view 2020-01-30 00:28:01 +01:00
vabene1111
6f4a40acdd meal plan prev+next week buttons 2020-01-19 14:34:50 +01:00
vabene1111
afa69c647d basic meal plan working 2020-01-17 17:47:23 +01:00
vabene1111
7449380434 meal plan WIP 2020-01-17 16:02:14 +01:00
vabene1111
38bfb96b46 various image related fixes 2019-12-26 12:06:18 +01:00
vabene1111
42faafef9f added waiting time 2019-12-26 11:32:04 +01:00
vabene1111
9d0a6e63f8 fixed not beeing able to open external recipes when internal exists 2019-12-25 19:47:11 +01:00
vabene1111
3cb01d6332 added recipe images 2019-12-25 16:46:16 +01:00
vabene1111
e2301c0c3a external delete button 2019-12-25 15:54:23 +01:00
vabene1111
49f7afd8d2 recipe books working 2019-12-25 13:11:18 +01:00
vabene1111
d90b012601 recipe books 2019-12-25 12:53:09 +01:00
vabene1111
8fcafcc25a bookmarks wip 2019-12-24 15:06:58 +01:00
vabene1111
417e372c42 changed emoji widget 2019-12-24 11:37:53 +01:00
vabene1111
3428e75b86 nice checkboxes 2019-12-24 09:39:53 +01:00
vabene1111
dbea9c80da added renaming for nextcloud/webdav backends 2019-12-24 00:04:41 +01:00
vabene1111
3b5dd7e51d added missing import 2019-12-23 23:42:04 +01:00
vabene1111
c985ada3d0 file renaming in provider testing 2019-12-23 23:22:00 +01:00
vabene1111
a4a62af3d2 storage permission 2019-12-09 11:34:44 +01:00
vabene1111
590e083b14 commment permission 2019-12-09 11:26:21 +01:00
vabene1111
ea8e708cb7 WIP comment object permission 2019-12-09 11:21:08 +01:00
vabene1111
22b6c3baa2 auto convert decimal seperator in ingredients 2019-12-01 23:24:31 +01:00
vabene1111
95993c087b case insensitive batch edit 2019-12-01 23:07:13 +01:00
vabene1111
8ce35dde0b translations in vcs + storage security 2019-11-21 15:01:48 +01:00
vabene1111
14130f4417 translations 2019-11-21 14:37:31 +01:00
vabene1111
e62219f031 ingredients saving 2019-11-19 20:42:10 +01:00
Kaibu
dd9091007f tabulator loading ingredients 2019-11-19 20:21:29 +01:00
vabene1111
ec23e431ea pass ingredients to template 2019-11-19 20:03:34 +01:00
vabene1111
cb35666f0e various fixes 2019-11-18 13:26:56 +01:00
vabene1111
404516d677 fixed missing user at import 2019-11-15 15:03:32 +01:00
vabene1111
ce27ae88f1 time 2019-11-15 15:00:25 +01:00
vabene1111
9bd5e737a9 recipe conversion + cleanup 2019-11-15 14:33:24 +01:00
vabene1111
49a60eddc6 custom recipes 2019-11-14 18:59:50 +01:00
vabene1111
a3da7c2ffd lots of cleanup and refactoring 2019-11-14 18:28:50 +01:00
vabene1111
2e313f6be4 nextcloud storage working 2019-11-14 17:38:31 +01:00
vabene1111
c8df93dd5f nextcloud links 90% working 2019-11-14 12:42:26 +01:00
vabene1111
2114ed037a refactored storage backend 2019-11-14 10:29:24 +01:00
vabene1111
9a22c37862 comments 2019-11-14 10:06:51 +01:00
vabene1111
16cf81ab4a view local recipes 2019-11-14 08:57:50 +01:00
vabene1111
eb10473e63 basic recipe view 2019-11-14 01:13:42 +01:00
vabene1111
b725ee6b6a recipes view 2019-11-14 01:01:14 +01:00
Kaibu
c3f62dd469 import all button, migration 2019-11-14 00:34:35 +01:00
Kaibu
aca9501307 fixed django-tables rendering 2019-11-13 23:44:52 +01:00
vabene1111
cead2fc45f internal / external 2019-11-13 23:44:23 +01:00
vabene1111
c688253144 Stuff 2019-11-13 23:41:54 +01:00
vabene1111
50cd44d13b internal recipe stuff 2019-11-13 23:22:26 +01:00
vabene1111
b54da49858 basic local recipes 2019-11-13 22:38:43 +01:00
vabene1111
b98f87499a removed categories 2019-11-13 21:46:03 +01:00
vabene1111
0fc4e129a6 fixed more templates 2018-11-07 14:41:41 +01:00
vabene1111
ec00626759 fixed linux template error 2018-11-07 14:35:32 +01:00
vabene1111
be32b3f63e share link fixed 2018-06-07 00:29:00 +02:00
vabene1111
8b6f7bd7cb fixed link creation and updated model 2018-06-06 23:31:47 +02:00
vabene1111
2e2144a9e3 added file id 2018-06-06 23:05:22 +02:00
Unknown
4ba39f03fb added some stats 2018-06-01 16:27:51 +02:00
Unknown
fb852b35a6 improvements and fixes 2018-06-01 15:53:06 +02:00
vabene1111
4871b6194c storage backend reworked 2018-05-25 16:49:10 +02:00
vabene1111
c5986c6e7f removed delete colums in favor of btn in edit view 2018-05-25 14:54:02 +02:00
vabene1111
f2edbbcdd6 cleand up form media 2018-05-16 00:14:54 +02:00
vabene1111
890956e8a1 basic custom media working 2018-05-15 23:57:53 +02:00
vabene1111
b92c6dd88f misc fixes and updates 2018-05-15 20:59:52 +02:00
vabene1111
87b7f0d204 emojis and migrations 2018-05-14 11:31:17 +02:00
vabene1111
8107e46b60 class filter tag 2018-05-07 00:38:37 +02:00
vabene1111
9b2d2bea4d renamed models + new migrations + initial data 2018-05-06 23:50:40 +02:00
vabene1111
c9f0192a2c import process 2018-05-06 22:12:40 +02:00
vabene1111
8d4506da54 revorked import 2018-05-06 21:47:40 +02:00
vabene1111
4be125353f import 2018-05-06 21:33:24 +02:00
vabene1111
05dc3924c4 cleand up new views 2018-05-03 20:54:27 +02:00
vabene1111
e722863093 list views 2018-05-03 20:43:47 +02:00
vabene1111
284beb47af generic forms ... 2018-05-03 00:09:03 +02:00
vabene1111
399f581d86 more generic views 2018-05-02 22:28:02 +02:00
vabene1111
69e22c743a import all 2018-03-31 00:17:50 +02:00
vabene1111
b7fb7e8e9b basic import management page 2018-03-30 23:56:49 +02:00
vabene1111
e09b4d3074 sync working 2018-03-30 23:37:31 +02:00
vabene1111
a155c0c522 delete views 2018-03-30 22:52:43 +02:00
vabene1111
37639ad4c7 generic views 2018-03-30 22:41:23 +02:00
vabene1111
8c6019756f a little more responsive 2018-02-09 17:04:54 +01:00
Unknown
d3a169a20d messages + misc 2018-02-09 12:59:28 +01:00
vabene1111
3499cb7994 cleanup 2018-02-08 23:29:24 +01:00
vabene1111
c73dcb3998 edit recipe 2018-02-08 23:18:56 +01:00
vabene1111
deb505d740 restructure 2018-02-08 22:29:10 +01:00
vabene1111
8413383e12 batch edit 2018-02-08 22:22:51 +01:00
vabene1111
59641e1af6 more nice things 2018-02-05 23:59:31 +01:00
vabene1111
ede7ddac0b modal + link caching 2018-02-05 23:18:57 +01:00
vabene1111
eea37b9af5 stuff working 2018-02-05 21:12:29 +01:00
vabene1111
35d8d50861 dropbox integration stuff 2018-02-05 19:57:32 +01:00