Commit Graph

116 Commits

Author SHA1 Message Date
vabene1111
50829dce47 fixed access for shared recipes 2021-01-13 22:59:19 +01:00
vabene1111
642015b368 testing docker stuff 2021-01-13 22:17:40 +01:00
vabene1111
99f06955dc corrected servings factor 2021-01-13 21:35:39 +01:00
vabene1111
9e5a7b2cc0 added loading spinner and made new view the main recipe view 2021-01-13 20:59:31 +01:00
vabene1111
ee707eba5c super basic templating working 2021-01-05 21:46:24 +01:00
vabene1111
8b2833f353 re added stuff 2020-12-28 14:14:34 +01:00
tourn
aa57b47d18 Use correct serving count from recipe view -> add to shopping 2020-12-24 11:28:59 +01:00
tourn
113e9ef1e3 Merge remote-tracking branch 'upstream/develop' into recipe-serving-count 2020-12-24 11:17:56 +01:00
vabene1111
7ca88f3c0a fixed scaling for fractions 2020-12-15 22:16:15 +01:00
vabene1111
89cd8bc2d2 fixed wrong translation 2020-12-14 15:49:32 +01:00
vabene1111
7732aa7646 added support for fractions 2020-12-14 14:08:11 +01:00
vabene1111
53b00cc4c8 Merge pull request #199 from sebimarkgraf/feature/nutrition
Add nutritional values
2020-12-14 12:29:56 +01:00
tourn
1e800889e4 Merge remote-tracking branch 'upstream/master' into recipe-serving-count 2020-11-20 14:44:09 +01:00
Sebastian Markgraf
2f038edf8c Fix missing string literals for translations. 2020-11-06 17:24:20 +01:00
Sebastian Markgraf
a754002f4e Revert approach to fixed nutritional values. 2020-11-06 17:22:21 +01:00
Sebastian Markgraf
31dabd4757 Add nutritions output 2020-10-18 17:31:56 +02:00
Sebastian Markgraf
7a89015ac5 Add migrations. 2020-10-16 23:59:19 +02:00
Sebastian Markgraf
2b1cde2efc Add basic output for nutritions. 2020-10-16 23:44:18 +02:00
vabene1111
3c21baf876 fixed create shopping list from recipe 2020-10-15 21:26:24 +02:00
vabene1111
2a0a85018a fixed import and validation errors 2020-09-01 13:26:58 +02:00
tourn
652b4bf2af Add serving count to recipe 2020-08-30 16:00:01 +02:00
Michael Kuckuk
f6fb07926e Show amounts even when unit is empty 2020-08-26 12:39:21 +02:00
vabene1111
82497c734a uniform button style in recipe view 2020-08-09 20:55:02 +02:00
vabene1111
968206a7ab compiled translations 2020-08-09 20:40:55 +02:00
vabene1111
c9f1576b24 several recipe view improvements 2020-07-15 18:05:12 +02:00
vabene1111
e0dac67b84 fixed recipe api permissions when using shared recipes 2020-07-14 00:22:39 +02:00
vabene1111
5b7ec37637 hotkeys, styling, step improvements 2020-07-13 22:55:09 +02:00
vabene1111
92341380bc actually fixed error 2020-07-08 22:14:22 +02:00
vabene1111
19df215bd2 external recipe view vue error fix 2020-07-08 22:03:41 +02:00
vabene1111
1d2976b687 create default step + view time improvement 2020-07-08 21:23:41 +02:00
vabene1111
6018101012 fixed step time calculation 2020-07-02 13:19:27 +02:00
vabene1111
ddaa9e6356 added step time calculation 2020-07-02 13:16:15 +02:00
vabene1111
98f9555ef6 check box linking 2020-07-02 12:15:30 +02:00
vabene1111
1619d4894c step header rendering 2020-07-02 12:12:17 +02:00
vabene1111
1e2d7f77af basic vue in recipe view 2020-07-02 11:20:11 +02:00
vabene1111
0005ca243c testing around 2020-07-01 23:22:29 +02:00
vabene1111
2c59302fe9 conditional header/no amount render 2020-06-29 22:01:42 +02:00
vabene1111
08f06fe1d8 fixed non fa-fw recipe view edit icon 2020-06-29 18:16:10 +02:00
vabene1111
06db7114ed basic view step design 2020-06-29 16:24:41 +02:00
vabene1111
db7f0d4988 fixed recipe edit button text 2020-06-26 08:53:46 +02:00
vabene1111
ae0928f85f added recipe steps 2020-06-25 22:38:17 +02:00
vabene1111
bda38f0647 changed recipe ingredient relation 2020-06-25 21:45:16 +02:00
vabene1111
df912b8865 renamed recipeingredient to ingredient 2020-06-25 21:37:18 +02:00
vabene1111
166833fe83 moved recipe edit button to dropdown menu 2020-06-23 19:01:35 +02:00
vabene1111
b558ba55b4 fixed mis-aligned menu in recipe view 2020-06-22 11:12:26 +02:00
vabene1111
8cd94d49e8 added comment system preference 2020-06-16 12:44:45 +02:00
vabene1111
ecac30136b no sharing external recipes + hide buttons for unauth 2020-06-16 12:07:18 +02:00
vabene1111
6e284f6ae8 moved all recipe button 2020-06-16 12:03:42 +02:00
vabene1111
62c049a6de fixed unauthenticated recipe viewing 2020-06-16 11:49:02 +02:00
vabene1111
dee7249347 added sharing links and appropriate tests 2020-06-16 11:23:58 +02:00