Commit Graph

1097 Commits

Author SHA1 Message Date
vabene1111
df0cfc3677 Merge branch 'develop' into feature/vue 2021-01-11 16:20:49 +01:00
vabene1111
16e2af8c5d remove debug code from service worker 2021-01-11 16:20:32 +01:00
vabene1111
02aec7d6d6 very WIP 2021-01-11 16:19:37 +01:00
vabene1111
cb913f6cea some test code and playing around 2021-01-11 15:04:35 +01:00
vabene1111
5bb20bd479 Merge branch 'develop' into feature/vue 2021-01-11 10:04:55 +01:00
vabene1111
c561ddc08c fixed share link 2021-01-11 10:04:45 +01:00
vabene1111
fd3743377b
Merge pull request #328 from bloomcake/small-cleanup
Small cleanup
2021-01-11 09:55:14 +01:00
vabene1111
381c3bf3fa
Merge pull request #329 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_it
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'it'
2021-01-11 09:43:43 +01:00
vabene1111
5d37a1dc0b
Merge pull request #330 from vabene1111/dependabot/pip/django-tables2-2.3.4
Bump django-tables2 from 2.3.3 to 2.3.4
2021-01-11 09:43:34 +01:00
dependabot[bot]
cf07040ece
Bump django-tables2 from 2.3.3 to 2.3.4
Bumps [django-tables2](https://github.com/jieter/django-tables2) from 2.3.3 to 2.3.4.
- [Release notes](https://github.com/jieter/django-tables2/releases)
- [Changelog](https://github.com/jieter/django-tables2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jieter/django-tables2/compare/v2.3.3...v2.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-11 07:06:07 +00:00
transifex-integration[bot]
f2028ee928
Apply translations in it
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
2021-01-10 23:01:06 +00:00
enrico-kaack
0c39ddcf66
Fixed: inconsistent volume naming as mentioned in #317 2021-01-10 22:56:18 +01:00
Tobias Lindenberg
8ddbc34017 resolve conflicts
Signed-off-by: Tobias Lindenberg <tobias@lindenberg.pm>
2021-01-10 14:44:20 +01:00
Tobias Lindenberg
6ef06b2650 recipes 2021-01-10 14:36:10 +01:00
Tobias Lindenberg
67581c7fa4 tests/api 2021-01-10 14:32:41 +01:00
Tobias Lindenberg
bc1f28eda6 tests/edits 2021-01-10 14:23:52 +01:00
Tobias Lindenberg
61daf9d5c9 tests/other 2021-01-10 14:16:28 +01:00
Tobias Lindenberg
a37c77bb84 tests/views 2021-01-10 14:14:27 +01:00
Tobias Lindenberg
6d2c48a1c8 tests/test_setup 2021-01-10 14:11:29 +01:00
Tobias Lindenberg
bed5b72864 templatetags/theming_tags 2021-01-10 14:10:21 +01:00
Tobias Lindenberg
325d6e4326 templatetags/custom_tags 2021-01-10 14:08:23 +01:00
Tobias Lindenberg
f7ff700c7a provider/nextcloud 2021-01-10 14:06:58 +01:00
Tobias Lindenberg
41c8e53569 provider/dropbox 2021-01-10 14:03:57 +01:00
Tobias Lindenberg
ff8e431630 helper/init 2021-01-10 13:59:27 +01:00
Tobias Lindenberg
eb9b2ac6fe helper/template_helper 2021-01-10 13:57:51 +01:00
Tobias Lindenberg
1ad468e652 helper/recipe_url_import 2021-01-10 13:57:06 +01:00
Tobias Lindenberg
986bda0c81 helper/permission_helper 2021-01-10 13:51:55 +01:00
Tobias Lindenberg
bb361001b9 helper/permissions_config 2021-01-10 13:47:23 +01:00
Tobias Lindenberg
26aa0207aa helper/mdx_urlize 2021-01-10 13:46:53 +01:00
Tobias Lindenberg
8b1bd3c555 helper/ingredient_parser 2021-01-10 13:45:33 +01:00
Tobias Lindenberg
b59c7288b1 helper/ingredient_parser 2021-01-10 13:44:55 +01:00
Tobias Lindenberg
f5b456018d helper/dal 2021-01-10 13:41:09 +01:00
Tobias Lindenberg
4dad26102a fix recipeimport 2021-01-10 13:28:57 +01:00
Tobias Lindenberg
afc7718c95 urls 2021-01-10 13:28:18 +01:00
Tobias Lindenberg
e5ef19ffe4 tables 2021-01-10 13:15:01 +01:00
Tobias Lindenberg
ecf065db2b serializer 2021-01-10 13:12:06 +01:00
Tobias Lindenberg
4c03d1eb87 models 2021-01-10 13:09:23 +01:00
Tobias Lindenberg
b71e9fe57d forms 2021-01-10 13:05:04 +01:00
Tobias Lindenberg
7ab6276397 filters 2021-01-10 12:46:02 +01:00
Tobias Lindenberg
c7da37e7e7 admin 2021-01-10 12:44:42 +01:00
Tobias Lindenberg
00f9bc087c views/view 2021-01-10 12:42:24 +01:00
Tobias Lindenberg
f2c658cb2d views/new 2021-01-10 12:25:28 +01:00
Tobias Lindenberg
c35f71370e views/lists 2021-01-10 12:22:22 +01:00
Tobias Lindenberg
edb9c883f7 views/import_export 2021-01-10 12:19:39 +01:00
Tobias Lindenberg
0405c123f4 views/edit 2021-01-10 12:16:10 +01:00
Tobias Lindenberg
b84a330883 views/delete 2021-01-10 12:12:16 +01:00
Tobias Lindenberg
2d8c6ef44a views/data 2021-01-10 12:10:54 +01:00
Tobias Lindenberg
6af5f59c80 views/api 2021-01-10 12:06:49 +01:00
Tobias Lindenberg
3c4384e2f6 views/__init__ 2021-01-10 12:06:40 +01:00
vabene1111
e50239f067 added basic service worker 2021-01-10 12:00:16 +01:00