smilerz faf458e8ef Squashed commit of the following: ... commit 707d862e01a7497a1f22879d314b865a35e0e85b Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:35:00 2021 -0500 works now commit 3942a445ed4f2ccec57de25eacd86ea4e4dd6bdb Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:25:24 2021 -0500 updated serializer and api commit 10dc746eb175c7f805a8a8ffa7ce49977a7ce97e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 10:20:19 2021 -0500 fixed bookmarklet commit 9779104902d3be0258c95cd2eeebcba0d5d48892 Merge: bb8262c 0cb3928 Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:56:27 2021 -0500 Merge branch 'bookmarklet' into json_import commit 0cb39284bb835ffc6cfee3e4306aadc4a64a25be Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:42:53 2021 -0500 retrieve bookmarklet ID from get commit e89e0218de684d40b2e2bfb6ba833891206c828e Author: smilerz <smilerz@gmail.com> Date: Wed Apr 14 09:29:33 2021 -0500 Revert "fixed broken tab" This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6. commit bb8262ccabb93c56fbc18c407d5a0653b8b3ca79 Merge: b1e73aa 35a7f62 Author: smilerz <smilerz@gmail.com> Date: Sun Apr 11 20:35:57 2021 -0500 Merge branch 'main_fork' into json_import		2021-05-01 16:30:22 -05:00
..
fixtures	cleanup and dependency updates + new nav	2019-11-19 19:59:53 +01:00
helper	Squashed commit of the following:	2021-05-01 16:30:22 -05:00
integration	Merge pull request #585 from TimPansino/develop	2021-05-01 22:18:27 +02:00
locale	Translated using Weblate (German)	2021-05-01 13:01:55 +00:00
migrations	updated migration	2021-05-01 16:30:22 -05:00
provider	delete model check fixes + sync log	2021-03-17 00:27:53 +01:00
static	removed console message	2021-05-01 16:30:21 -05:00
templates	Squashed commit of the following:	2021-05-01 16:30:22 -05:00
templatetags	Squashed commit of the following:	2021-05-01 16:30:22 -05:00
tests	Squashed commit of the following:	2021-05-01 16:30:22 -05:00
views	Squashed commit of the following:	2021-05-01 16:30:22 -05:00
__init__.py	basic stuff	2018-01-31 23:40:16 +01:00
admin.py	Squashed commit of the following:	2021-05-01 16:30:22 -05:00
apps.py	basic stuff	2018-01-31 23:40:16 +01:00
filters.py	Squashed commit of the following:	2021-05-01 16:30:22 -05:00
forms.py	added meal master import	2021-03-28 21:50:52 +02:00
models.py	Squashed commit of the following:	2021-05-01 16:30:22 -05:00
serializer.py	Squashed commit of the following:	2021-05-01 16:30:22 -05:00
tables.py	added description to search and recipe view	2021-03-06 16:32:59 -06:00
urls.py	simplified url import	2021-05-01 16:30:21 -05:00