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 |
|
transifex-integration[bot]
|
ec31d251ea
|
Apply translations in it
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
|
2020-12-18 12:09:20 +00:00 |
|
transifex-integration[bot]
|
3f6a342026
|
Apply translations in fr
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'fr' language.
|
2020-12-16 14:47:47 +00:00 |
|
vabene1111
|
f72fc699f8
|
fixed import image error
|
2020-12-15 22:54:10 +01:00 |
|
vabene1111
|
7ca88f3c0a
|
fixed scaling for fractions
|
2020-12-15 22:16:15 +01:00 |
|
vabene1111
|
ac2e9dd6cb
|
updated german translation
|
2020-12-15 22:04:40 +01:00 |
|
transifex-integration[bot]
|
6124501f5a
|
Apply translations in de
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'de' language.
|
2020-12-15 21:03:40 +00:00 |
|
vabene1111
|
4ec313f752
|
fixed another importer issue
|
2020-12-15 21:59:34 +01:00 |
|
vabene1111
|
dd07c56ede
|
fixed issue with new fraction importer
|
2020-12-15 21:52:56 +01:00 |
|
vabene1111
|
77fae46aee
|
translation updates
|
2020-12-15 21:39:42 +01:00 |
|
transifex-integration[bot]
|
247eab2a4f
|
Apply translations in ca
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'ca' language.
|
2020-12-15 12:00:28 +00:00 |
|
vabene1111
|
9ea90f1c87
|
fraction import
|
2020-12-14 19:56:21 +01:00 |
|
vabene1111
|
e7922a7e47
|
nutirtion fix
|
2020-12-14 19:12:01 +01:00 |
|
vabene1111
|
d3bc440c83
|
meal plan quality of life stuff
|
2020-12-14 17:37:51 +01:00 |
|
vabene1111
|
910b28fe2d
|
meal plan date handling rewrite
|
2020-12-14 17:11:40 +01:00 |
|
vabene1111
|
89cd8bc2d2
|
fixed wrong translation
|
2020-12-14 15:49:32 +01:00 |
|
vabene1111
|
56c9edd328
|
removed deprecated psycopg2
|
2020-12-14 15:11:41 +01:00 |
|
vabene1111
|
7732aa7646
|
added support for fractions
|
2020-12-14 14:08:11 +01:00 |
|
vabene1111
|
9863447bac
|
small nutrition fixes
|
2020-12-14 12:56:18 +01:00 |
|
vabene1111
|
53b00cc4c8
|
Merge pull request #199 from sebimarkgraf/feature/nutrition
Add nutritional values
|
2020-12-14 12:29:56 +01:00 |
|
vabene1111
|
a5d2bd75d6
|
recompiled messages + added timezone setting
|
2020-12-14 12:03:43 +01:00 |
|
tourn
|
6fd9cf0d8c
|
Use serving count in shopping list
|
2020-11-20 15:22:58 +01:00 |
|
tourn
|
1e800889e4
|
Merge remote-tracking branch 'upstream/master' into recipe-serving-count
|
2020-11-20 14:44:09 +01:00 |
|
Sebastian Markgraf
|
422113a745
|
Finish editing of nutritional information
|
2020-11-17 22:27:01 +01:00 |
|
Sebastian Markgraf
|
c4fbad614e
|
Include random in filtermixin
|
2020-11-14 20:20:30 +01:00 |
|
vabene1111
|
4c92a4b39c
|
fixed shopping list recipe search
|
2020-11-14 11:20:43 +01:00 |
|
vabene1111
|
c413db5460
|
fixed english typo
|
2020-11-14 11:16:01 +01:00 |
|
vabene1111
|
0e319ff293
|
fixed typo in german transaltion
|
2020-11-14 11:15:21 +01:00 |
|
transifex-integration[bot]
|
19e2094ecd
|
Apply translations in nl
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
|
2020-11-13 22:21:02 +00: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 |
|
vabene1111
|
4dfda4439c
|
re added standard filter to recipe api
|
2020-11-04 16:53:49 +01:00 |
|
vabene1111
|
591d185b9d
|
improved random recipe queryset function
|
2020-11-04 15:09:35 +01:00 |
|
vabene1111
|
8d582548bd
|
Merge pull request #213 from tourn/random-recipes2
Show random recipes in meal planner
|
2020-11-04 15:06:50 +01:00 |
|
vabene1111
|
a1b15d46b8
|
fixed note only meal plan entries not working
|
2020-11-04 14:58:31 +01:00 |
|
tourn
|
69a6edee99
|
Show random recipes in meal planner
|
2020-11-03 16:46:31 +01:00 |
|
Tmaxxrox97
|
085e777ee0
|
Changed Username field label from "Name" to "Username"
|
2020-10-29 09:52:05 -05:00 |
|
vabene1111
|
e427d8b714
|
donst export checked items
|
2020-10-21 20:35:26 +02:00 |
|
vabene1111
|
89b8dbe57f
|
added online check to prevent message spam
|
2020-10-20 23:08:30 +02:00 |
|
vabene1111
|
f2a17fe3bb
|
fixed shopping list GET param regex
|
2020-10-20 22:51:19 +02:00 |
|
vabene1111
|
14e0dae6e3
|
compiled translations
|
2020-10-20 21:23:37 +02:00 |
|
transifex-integration[bot]
|
c542f3154e
|
Apply translations in de
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'de' language.
|
2020-10-20 19:22:06 +00:00 |
|
vabene1111
|
c6f40db7e3
|
shopping list tweaks
|
2020-10-20 20:54:15 +02: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
|
cb3b8c931e
|
fixed broken defautl share
|
2020-10-16 00:11:41 +02:00 |
|
vabene1111
|
72bea14c3a
|
added sharing
|
2020-10-16 00:01:14 +02:00 |
|
vabene1111
|
cd46203d55
|
added permission classes for sharing + tests
|
2020-10-15 23:41:38 +02:00 |
|