Commit Graph

6037 Commits

Author SHA1 Message Date
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
524ba4dced long live the session
since most recipes aren't that sensitive .. mighte make this a setting later, permissions for storage backends will come later
2019-11-15 15:13:51 +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
80a122919d delete workflow for now 2019-11-15 13:51:55 +01:00
vabene1111
bd209c362c
fixed secret 2019-11-15 11:24:24 +01:00
vabene1111
63bf26371c
Merge pull request #1 from vabene1111/develop
test
2019-11-15 11:19:12 +01:00
vabene1111
38f6ca3fcc
test 2019-11-15 11:17:56 +01:00
vabene1111
567754caa8
testing actions autobuild 2019-11-15 11:15:48 +01:00
vabene1111
9ee33fb380 removed untrack 2019-11-15 10:31:47 +01:00
vabene1111
613f1e626e workin 2019-11-14 22:50:10 +01:00
vabene1111
63ef8a6092 dependency hell 2019-11-14 21:24:06 +01:00
vabene1111
0245c38976 more ? 2019-11-14 20:04:19 +01:00
vabene1111
0c2d50d8c3 order relevant 2019-11-14 20:02:55 +01:00
vabene1111
400066641c this ? 2019-11-14 19:59:43 +01:00
vabene1111
d11db353aa dependencies 2019-11-14 19:57:07 +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