Commit Graph

2842 Commits

Author SHA1 Message Date
vabene1111
1d562452df changed behavior of delete original 2020-03-17 18:54:44 +01:00
vabene1111
4c90664aa2 fixed translation mistaek 2020-03-17 18:47:24 +01:00
vabene1111
90dbc36402 added ability to link recipes to ingredients 2020-03-17 18:44:11 +01:00
vabene1111
a60b09e491 fixed confirm message on unit/ingredeitn merge 2020-03-17 18:28:53 +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
eb25a9163f fixed import log badge 2020-03-17 17:31:26 +01:00
vabene1111
17b9519fa9 refactor generic url creation 2020-03-17 17:23:39 +01:00
vabene1111
09ff7e82f1 django admin cleanup 2020-03-17 16:16:04 +01:00
vabene1111
47072763ee cleand up search ui 2020-03-17 15:34:17 +01:00
vabene1111
86f2c9d89c cleand up and fixed ingredient edit table 2020-03-16 23:08:52 +01:00
vabene1111
c8eaa2a349 removed js test code 2020-03-16 22:50:52 +01:00
vabene1111
9853cecabb fixed keywords without icons 2020-03-16 14:48:04 +01:00
vabene1111
abd655ce62 moved delete to seperate file 2020-03-01 12:34:59 +01:00
vabene1111
e755068a31 added test for png's 2020-03-01 12:13:36 +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
8c7a171d56 added more tests and test structure 2020-02-28 23:17:04 +01:00
vabene1111
df62717806 removed non internal recipes from shopping 2020-02-28 22:21:03 +01:00
vabene1111
a1e6bd5441 fixed text outside of colum 2020-02-28 22:12:18 +01:00
vabene1111
034e2c612b added internal recipe filter 2020-02-28 22:12:02 +01:00
vabene1111
45c85b9de8 fixed markdown blockquotes not really rendering 2020-02-28 22:09:16 +01:00
vabene1111
a9952b8f57 improved markdown rendering of tables and images 2020-02-28 21:53:27 +01:00
vabene1111
b8f16b50a7 simplified viewer + fixed characters escaping 2020-02-19 20:19:08 +01:00
vabene1111
752df5a1d2 cleaned up viewer 2020-02-19 19:39:32 +01:00
vabene1111
fe6e351349 testing pdf viewerr 2020-02-19 19:12:11 +01:00
vabene1111
8cc9273268 basic viewer working 2020-02-19 19:02:47 +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
fc1cc70870 basic pdf embedding 2020-02-19 00:08:32 +01:00
vabene1111
42e09fcae9 updated translations 2020-02-18 23:26:14 +01:00
vabene1111
4843568d10 added searching for ingredients 2020-02-18 23:16:05 +01:00
vabene1111
2e7e4b23dd highlight active tab 2020-02-18 23:03:37 +01:00
vabene1111
8192a8dc8f improved shopping list ui 2020-02-18 23:00:23 +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
8ba34414a1 added shoping to nav 2020-02-18 22:28:22 +01:00
vabene1111
46dffe2f63 added ingredient merging 2020-02-18 22:25:21 +01:00
vabene1111
04cbe6cb2c removed empty script tag when no default is given 2020-02-18 22:17:27 +01:00
vabene1111
8fd6dcc81c updated translations 2020-02-17 23:34:17 +01:00
vabene1111
67b4ec8215 fixed shopping ingredient list 2020-02-17 00:24:33 +01:00
vabene1111
db2e67dd71 incresed instruction font size 2020-02-17 00:22:36 +01:00
vabene1111
de355abd19 fixed tests to reflect new name 2020-02-17 00:17:51 +01:00
vabene1111
41bfa95cb2 nav color theming 2020-02-17 00:11:15 +01:00
vabene1111
ad9944dd01 fixed broken tabulator on default theme 2020-02-16 23:59:16 +01:00
vabene1111
a1160c310c fixed fix of migration 2020-02-16 23:54:45 +01:00
vabene1111
0444286d11 hotkeys for recipe editing 2020-02-16 23:50:58 +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
81677a74bb made flatly default theme + fixed preview image 2020-02-16 22:58:24 +01:00
vabene1111
b4cdc92207 catch non existing relation 2020-02-14 00:40:17 +01:00
vabene1111
ffdcbff540 dark theming tabulator + select 2020-02-14 00:35:52 +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
c08e30c5a9 case insensitive filter 2020-02-12 23:38:05 +01:00
vabene1111
60477cdb9e settings button 2020-02-04 22:26:40 +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
2d70680214 recipe buttons wip 2020-02-03 11:33:44 +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
56e841879b login template enhancements 2020-02-02 22:12:04 +01:00
vabene1111
19f5b44e50 some basic tests 2020-02-02 22:09:30 +01:00
vabene1111
305a4949fb cleanup recipe edit 2020-02-02 16:06:24 +01:00
vabene1111
07502fecc0 fixed possible markdown xss 2020-02-02 16:06:12 +01:00
vabene1111
4da1293898 fixed it 2020-02-01 21:11:26 +01:00
vabene1111
ab2ce26d9d nearly working 2020-01-30 12:45:55 +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
becdcdc6a4 small meal plan fixes 2020-01-17 18:31:46 +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
51fc05dda2 fixed and added german translations 2020-01-13 12:14:05 +01:00
vabene1111
3d695e3d0f added support for ingredients with 0 amout 2020-01-13 11:51:22 +01:00
vabene1111
22b8a4ac18 added help texts to storage form 2020-01-13 11:44:27 +01:00
vabene1111
2e26f9c84b Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
merge
2020-01-13 11:31:03 +01:00
vabene1111
78105e28c8 improved ingredient table 2020-01-13 11:30:59 +01:00
vabene1111
e22d71152b cleaned up form buttons 2020-01-01 21:00:44 +01:00
vabene1111
2956a34aa6 print view 2019-12-26 12:17:51 +01:00
vabene1111
38bfb96b46 various image related fixes 2019-12-26 12:06:18 +01:00
vabene1111
b6a04b9dbd added missing translations 2019-12-26 11:38:01 +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
6a010587bf tweaked compression and upload limit 2019-12-25 19:41:25 +01:00
vabene1111
3fbd2ef032 image display improvements 2019-12-25 17:09:07 +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
efabed8b2a linebreak for mobile 2019-12-24 10:54:52 +01:00
vabene1111
4748eb0b4c multiply ingredients 2019-12-24 10:53:49 +01:00
vabene1111
3428e75b86 nice checkboxes 2019-12-24 09:39:53 +01:00
vabene1111
6c6264ce4d testing with chekcboxes 2019-12-24 00:09:07 +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
a5cc38ecbd testing safari 2019-12-23 18:33:45 +01:00
vabene1111
2a54099187 possible fix for safari 2019-12-23 18:26:16 +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
c2a5f2b2e3 tweaked filter 2019-12-09 10:37:21 +01:00
vabene1111
f2e4467a32 enable different backends again 2019-12-08 18:49:30 +01:00
vabene1111
4cc6a98a2b increased filter 2019-12-08 18:35:00 +01:00
vabene1111
647f4c94cb add deps 2019-12-08 18:33:46 +01:00
vabene1111
1bf5ab2425 rename 2019-12-08 18:32:54 +01:00
vabene1111
3945c6bd1b testing extensions 2019-12-08 18:31:56 +01:00
vabene1111
a4f715997e testing similarity 2019-12-08 17:42:12 +01:00
vabene1111
9446f97ede Revert "test trigram filter"
This reverts commit 516b6039f7.
2019-12-08 17:28:02 +01:00
vabene1111
516b6039f7 test trigram filter 2019-12-08 17:27:36 +01:00
vabene1111
77b1089b7f added favicon 2019-12-08 17:09:25 +01:00
vabene1111
79679c105a refactor search ui 2019-12-08 16:12:55 +01:00
vabene1111
a0a9a93888 updated bootstrap 2019-12-08 13:59:31 +01:00
vabene1111
82986f21f4 updated tabulator + added auto focus 2019-12-08 13:56:24 +01:00
vabene1111
88ce2b9495 updated to django 3 2019-12-08 13:07:02 +01:00
vabene1111
07904d31a7 ingredient styling 2019-12-02 00:01:59 +01:00
vabene1111
bd30606cff recipe view id links directly to edit view 2019-12-01 23:25:17 +01:00
vabene1111
22b6c3baa2 auto convert decimal seperator in ingredients 2019-12-01 23:24:31 +01:00
vabene1111
fb267b662c tabular view 2019-12-01 23:17:58 +01:00
vabene1111
95993c087b case insensitive batch edit 2019-12-01 23:07:13 +01:00
vabene1111
7a6030d090 case insensitive filter 2019-12-01 23:04:14 +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
07f29140be translations 2019-11-20 10:58:34 +01:00
vabene1111
1b292c4dcb fixed ingredient displa 2019-11-19 21:18:28 +01:00
vabene1111
d1b2fd28b4 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2019-11-19 21:16:39 +01:00
vabene1111
53ee5b8124 dal ingredient endpoint 2019-11-19 21:16:31 +01:00
Kaibu
ba2f1458af label and tabulator fixes 2019-11-19 21:13:49 +01:00
vabene1111
78157cb359 table label 2019-11-19 21:04:15 +01:00
vabene1111
f8d0724daf manual form render order 2019-11-19 21:02:33 +01:00
vabene1111
8281bb52e8 hidden field for movement 2019-11-19 20:57:42 +01:00
vabene1111
e62219f031 ingredients saving 2019-11-19 20:42:10 +01:00
vabene1111
ca7d0ccef4 stuff 2019-11-19 20:22:35 +01:00
Kaibu
6209586419 Merge remote-tracking branch 'origin/develop' into develop 2019-11-19 20:21:37 +01:00
Kaibu
dd9091007f tabulator loading ingredients 2019-11-19 20:21:29 +01:00
vabene1111
3b4b486a3c icons 2019-11-19 20:13:21 +01:00
vabene1111
ec23e431ea pass ingredients to template 2019-11-19 20:03:34 +01:00
vabene1111
8eca629410 cleanup and dependency updates + new nav 2019-11-19 19:59:53 +01:00
Kaibu
52b9cba93c tabulator editor 2019-11-19 19:57:33 +01:00
vabene1111
af11b83472 reset broken migrations 2019-11-19 19:43:38 +01:00
vabene1111
9872301f03 merged migrations 2019-11-19 19:37:36 +01:00
vabene1111
e140645810 Merge branch 'refs/heads/master' into develop 2019-11-19 19:18:15 +01:00
vabene1111
48d1b8d952 changed ingredient field typ 2019-11-18 13:28:31 +01:00
vabene1111
cb35666f0e various fixes 2019-11-18 13:26:56 +01:00
vabene1111
9a93458dc7 changed default 2019-11-15 15:04:38 +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
613f1e626e workin 2019-11-14 22:50:10 +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
a6ce4edc93 external recipe form update 2019-11-14 09:40:38 +01:00
vabene1111
16cf81ab4a view local recipes 2019-11-14 08:57:50 +01:00
vabene1111
76bf49eaad Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2019-11-14 01:13:58 +01:00
vabene1111
eb10473e63 basic recipe view 2019-11-14 01:13:42 +01:00
Kaibu
a1e72c897c tabulator for internal recipes wip 2019-11-14 01:04:15 +01:00
vabene1111
b725ee6b6a recipes view 2019-11-14 01:01:14 +01:00
vabene1111
ffc5b3347e title 2019-11-14 00:48:51 +01:00
vabene1111
e4ec84b86e moved import button 2019-11-14 00:38:15 +01:00
Kaibu
6b81ad0e6b Merge remote-tracking branch 'origin/develop' into develop 2019-11-14 00:34:42 +01:00
Kaibu
c3f62dd469 import all button, migration 2019-11-14 00:34:35 +01:00
vabene1111
00e01f665b nav reorganisation 2019-11-14 00:33:47 +01:00
vabene1111
3d3e598e2c mroe cleanup 2019-11-14 00:23:16 +01:00
Kaibu
97ab231231 fixed decimalfield 2019-11-14 00:12:07 +01:00
Kaibu
3ea37b217d added amount to ingredients 2019-11-14 00:09:13 +01:00
vabene1111
4afe965f2d Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2019-11-14 00:00:47 +01:00
vabene1111
a6d412eae7 removed new tab 2019-11-14 00:00:38 +01:00
Kaibu
271431a724 changed new button, fixed mobile scaling 2019-11-13 23:54:08 +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
b9994e6a45 fixed wrong changed path 2018-06-07 00:01:11 +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
vabene1111
cb246a33d8 some cleanup 2018-06-06 22:48:50 +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
7bc102f8df improved search filter 2018-05-25 12:57:12 +02:00
vabene1111
6590bec117 finished up form media 2018-05-17 21:47:22 +02:00
vabene1111
062d00c474 added TODO 2018-05-16 00:16:14 +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
0acecba367 visual improvements 2018-05-15 22:58:29 +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
bc287364ac a bit of localization 2018-05-03 21:46:41 +02:00
vabene1111
9713c602df stuff 2018-05-03 21:29:38 +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
b3a45d8069 fontawesome 2018-05-02 21:50:14 +02:00
vabene1111
eac41d6869 basic multiselect working 2018-03-31 11:29:18 +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
df576a20ba refactor app name (typo) 2018-02-05 20:01:11 +01:00
vabene1111
35d8d50861 dropbox integration stuff 2018-02-05 19:57:32 +01:00
vabene1111
6a93e9d28e basic api 2018-02-05 11:45:09 +01:00
Unknown
9a5a0aa617 edit start 2018-02-01 15:59:59 +01:00
Unknown
e9dc2dc48f edit + tables 2018-02-01 15:34:43 +01:00
Unknown
4d3e8e6b53 forms 2018-02-01 15:05:53 +01:00
Unknown
1476a88d88 fixed non login index page 2018-02-01 14:37:40 +01:00
vabene1111
a935a2899b crispy forms :) 2018-02-01 12:53:41 +01:00
vabene1111
2b3e1a5243 search working 2018-02-01 12:43:17 +01:00
vabene1111
901ae9053a lots of things working 2018-02-01 12:16:39 +01:00
vabene1111
572e0b5fc9 locale stuff 2018-02-01 00:42:37 +01:00
vabene1111
a183b53ae7 cleanup 2018-02-01 00:28:15 +01:00
vabene1111
9bdc303f0e overview + center 2018-02-01 00:20:47 +01:00
vabene1111
c382e9df24 basic stuff 2018-01-31 23:40:16 +01:00