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

..

account

allauth working and integrated

2021-01-28 13:40:07 +01:00

batch

fixed some english translations

2020-12-26 13:46:55 +01:00

forms

added description to search and recipe view

2021-03-06 16:32:59 -06:00

generic

finishes shopping lists

2020-09-29 14:15:18 +02:00

include

actually fixed error

2020-07-08 22:14:22 +02:00

rest_framework

documentation update api

2020-06-17 10:29:01 +02:00

socialaccount

account linking and docs update

2021-01-28 16:10:26 +01:00

404.html

added custom 404 page

2020-06-16 16:21:15 +02:00

api_info.html

api documentation basics

2020-06-16 17:21:50 +02:00

base.html

Squashed commit of the following:

2021-05-01 16:30:21 -05:00

books.html

recipe book improvements

2020-05-02 21:59:32 +02:00

export.html

using new import/export module

2021-02-08 11:38:38 +01:00

history.html

added history page

2020-05-11 12:59:54 +02:00

import_response.html

updated webpack loader and lots of javscript stuff

2021-04-28 09:41:06 +02:00

import.html

using new import/export module

2021-02-08 11:38:38 +01:00

index.html

updated links to import recipes

2021-04-16 09:02:02 -05:00

javascript_urls.html

recipe stuff

2021-01-12 20:51:28 +01:00

manifest.json

refactor assset and paths

2021-02-15 21:01:54 +01:00

markdown_info.html

favicon path in markdown docs

2021-02-15 21:16:31 +01:00

meal_plan_entry.html

basic vue stuff working

2020-06-02 12:47:36 +02:00

meal_plan.html

fixed meal plan notes and recipe links

2021-04-29 17:15:06 +02:00

no_groups_info.html

recipe share basics

2021-02-21 16:37:04 +01:00

no_perm_info.html

recipe share basics

2021-02-21 16:37:04 +01:00

no_space_info.html

recipe share basics

2021-02-21 16:37:04 +01:00

offline.html

updated webpack loader and lots of javscript stuff

2021-04-28 09:41:06 +02:00

recipe_view.html

removed one more old bundle render

2021-04-28 09:46:52 +02:00

recipes_table.html

limit description in search to 2 lines

2021-03-06 17:36:51 -06:00

search.html

updated webpack loader and lots of javscript stuff

2021-04-28 09:41:06 +02:00

settings.html

account linking and docs update

2021-01-28 16:10:26 +01:00

setup.html

made and compiled messages + fixed lots of typos

2020-12-31 12:56:18 +01:00

shopping_list.html

meal plan in search

2021-04-18 17:19:11 +02:00

stats.html

new search design basics + Boostrap fixes

2020-05-02 00:49:29 +02:00

sw.js

updated webpack loader and lots of javscript stuff

2021-04-28 09:41:06 +02:00

system.html

space stuff partially working

2021-02-19 15:50:55 +01:00

test2.html

wip on new import/export system

2021-02-07 13:27:15 +01:00

test.html

importing with image files working

2021-02-07 14:50:43 +01:00

url_import.html

Squashed commit of the following:

2021-05-01 16:30:22 -05:00