Commit Graph

699 Commits

Author SHA1 Message Date
vabene1111
5aadb66013 Merge pull request #321 from neferin12/develop
Sticky Navbar
2021-01-07 22:29:54 +01:00
Julian Pollinger
6225648e3a Minor formatting 2021-01-07 21:50:26 +01:00
Julian Pollinger
251bd88f70 Make the sticky navbar an option 2021-01-07 18:49:11 +01:00
vabene1111
2d82fc1ddd fixed meal plan settings cookie expiring 2021-01-07 15:42:34 +01:00
Julian Pollinger
19df1cf65d Sticky Navbar 2021-01-06 19:09:41 +01:00
Julian Pollinger
ebdd8fc053 Update base.html 2021-01-06 18:57:25 +01:00
vabene1111
320d94a223 fixed incorrect redirects for unauthenticated users 2021-01-05 23:24:58 +01:00
vabene1111
43ccc351c7 added changes typo fix 2021-01-05 22:54:57 +01:00
vabene1111
d36e4c6e0a fixed another typoe 2021-01-05 22:54:46 +01:00
vabene1111
fdeede5717 updated vue and vue bootrap + template improvements 2021-01-05 22:53:08 +01:00
vabene1111
738b601462 templating working 2021-01-05 22:07:46 +01:00
vabene1111
2c93a2f177 Merge branch 'develop' into feature/templating 2021-01-05 21:48:50 +01:00
vabene1111
6b2d164585 fixed broken import chain 2021-01-05 21:48:44 +01:00
vabene1111
ee707eba5c super basic templating working 2021-01-05 21:46:24 +01:00
vabene1111
f26b09cc0a fixed broken translations in help_texts 2021-01-05 21:26:42 +01:00
transifex-integration[bot]
6a1d892e8b Apply translations in it
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
2021-01-05 11:44:52 +00:00
vabene1111
2b9ad2feed removed fixture based backup
many different things can lead to this method of backing up failing both on backup and on restore.
to not give the user a false sense of security this feature was removed for the time being.
once i have time i will add a proper backup system.
2021-01-04 00:30:39 +01:00
melkypie
ace7ee4274 Add latvian language 2020-12-31 18:47:07 +02:00
vabene1111
5a7c914fe7 added lots of user information 2020-12-31 13:38:16 +01:00
vabene1111
1bdf14dbf9 made and compiled messages + fixed lots of typos 2020-12-31 12:56:18 +01:00
vabene1111
6ef173d82d fixed and cleand up a lot of servings related stuff 2020-12-31 12:44:19 +01:00
vabene1111
1e471ad40d removed all trans tags from javascript code
replaced by django recommended javascript catalog
still need to sort out the different translation domains
2020-12-31 12:30:31 +01:00
vabene1111
4ff1a6bc93 Merge pull request #297 from lipschultz/created-by
Assign authenticated user to created_by
2020-12-31 12:16:16 +01:00
transifex-integration[bot]
9692e2386b Apply translations in es
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'es' language.
2020-12-28 13:34:59 +00:00
vabene1111
93b2e2d7e4 fixed small issues 2020-12-28 14:18:51 +01:00
vabene1111
8b2833f353 re added stuff 2020-12-28 14:14:34 +01:00
vabene1111
c4273a4c3f Merge branch 'develop' into recipe-serving-count 2020-12-28 10:19:52 +01:00
vabene1111
95461316a5 prevent creation of empty string units 2020-12-27 23:12:24 +01:00
vabene1111
1775b64ba4 better migration for unit fix 2020-12-27 23:10:22 +01:00
vabene1111
5a9270373f Merge branch 'translations_cookbook-locale-en-lc-messages-django-po--develop_it' into develop
# Conflicts:
#	cookbook/locale/it/LC_MESSAGES/django.po
2020-12-27 16:57:35 +01:00
transifex-integration[bot]
37f98ce9fe Apply translations in it
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
2020-12-27 12:46:39 +00:00
vabene1111
fa556c9a7f added migration to fix emtpy units
set all units to none for all recipes containing empty named units and delete them
2020-12-26 17:20:17 +01:00
vabene1111
29e1d1286c fixed importer empty units 2020-12-26 15:17:37 +01:00
Michael Lipschultz
f489043077 Assign authenticated user to created_by 2020-12-26 09:09:47 -05:00
vabene1111
bdd004518c verified and updated importer tests 2020-12-26 14:50:54 +01:00
vabene1111
840f5ec60d added ingredient parser test 2020-12-26 13:57:51 +01:00
vabene1111
566eea1d75 Merge pull request #277 from l0c4lh057/master
Improve text to ingredient parsing
2020-12-26 13:52:24 +01:00
vabene1111
bb48655acb Merge pull request #279 from l0c4lh057/improve
Minor improvements
2020-12-26 13:48:54 +01:00
vabene1111
d723165b1c updated base translations 2020-12-26 13:48:33 +01:00
vabene1111
592bd4f11e fixed some english translations 2020-12-26 13:46:55 +01:00
vabene1111
0aec23fcdd added tests for recipe view permissions 2020-12-26 13:28:49 +01:00
vabene1111
d364994ed7 compiled messages 2020-12-26 13:14:36 +01:00
vabene1111
1f5c02bcc3 Merge branch 'develop' into translations_cookbook-locale-en-lc-messages-django-po--develop_nl 2020-12-26 10:52:27 +01:00
transifex-integration[bot]
f753b63b13 Apply translations in es
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'es' language.
2020-12-25 22:47:41 +00:00
tourn
6f3068a28c Show default serving count in meal planner 2020-12-24 11:51:51 +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
transifex-integration[bot]
5899527621 Apply translations in nl
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
2020-12-23 15:13:42 +00:00
Aaron
0a40de0f14 Add min/max to servings spinner 2020-12-22 23:52:40 +01:00
Aaron
bc31f013c0 Fix 'All Keywords' label in website import 2020-12-22 23:51:55 +01:00