Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NGINX issues since 0.17 #959

Closed
auanasgheps opened this issue Oct 15, 2021 · 44 comments
Closed

NGINX issues since 0.17 #959

auanasgheps opened this issue Oct 15, 2021 · 44 comments
Labels
setup issue possibly or definitely an issue with the user setup

Comments

@auanasgheps
Copy link
Contributor

Version

Version: 0.17.2

Bug description

Since the update to 0.17, here's what looks like.

If I go to Space settings, it says I have 20 recipes (correct).

Something in the upgrade went wrong. What should I do? I can't access my recipes!

immagine

@smilerz
Copy link
Collaborator

smilerz commented Oct 15, 2021

@auanasgheps how is Tandoor setup (manual, docker, other)? can you share the logs? also if hit F12 the developer console might provide some additional context.

@auanasgheps
Copy link
Contributor Author

@smilerz I'm using docker.
Anyway I managed to do some troubleshooting and it's about the nginx config.
If I go straight to the container works fine.
I'll keep you posted

@auanasgheps auanasgheps changed the title Recipes have disappeared since 0.17 NGINX issues since 0.17 Oct 15, 2021
@smilerz
Copy link
Collaborator

smilerz commented Oct 15, 2021

check out #953 and see if that points you in the right direction.

@MaxJa4
Copy link
Contributor

MaxJa4 commented Oct 15, 2021

@auanasgheps I had the same exact issue since 0.17.0...
My nginx reverse proxy was the cause, I had to add the following lines inside the nginx site config (in the location region):
proxy_set_header X-Forwarded-Proto $scheme;
I also added proxy_set_header Host $Host;, but I don't know if that's necessary.
This is partially mentioned in the FAQs

@MaxJa4
Copy link
Contributor

MaxJa4 commented Oct 15, 2021

Seems like 0.17.0 got some new links which are not relative but absolute (just an assumption).
proxy_set_header Host $Host; fixed the issue for some kind of worker which had problems with that.
proxy_set_header X-Forwarded-Proto $scheme; fixed some 'mixed content' errors.
All of that can be seen in the web browser console (F12).

@smilerz
Copy link
Collaborator

smilerz commented Oct 15, 2021

@vabene1111 does the included nginx config need to be updated?

@auanasgheps
Copy link
Contributor Author

This is may config before it broke down (pre 0.17).

If I add proxy_set_header Host $Host; I get "Bad Request (400)" and the page doesn't load.
In the past I've already fought with Recipes and Nginx. Here we go again.

    location / {
        # enable the next two lines for http auth
        #auth_basic "Restricted";
        #auth_basic_user_file /config/nginx/.htpasswd;

        # enable the next two lines for ldap auth
        #auth_request /auth;
        #error_page 401 =200 /ldaplogin;

        # enable for Authelia
        #include /config/nginx/authelia-location.conf;

        include /config/nginx/proxy.conf;
        resolver 127.0.0.11 valid=30s;
        set $upstream_app recipes-app;
        set $upstream_port 8080;
        set $upstream_proto http;
        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
	proxy_set_header X-Forwarded-Proto $scheme;
    }
}

@MaxJa4
Copy link
Contributor

MaxJa4 commented Oct 15, 2021

Maybe proxy_set_header Host $http_host; works better like mentioned in the issue that @smilerz mentioned

@auanasgheps
Copy link
Contributor Author

@MaxJa4 tried and I still get 400.

In the meantime here's the browser console
immagine

@smilerz
Copy link
Collaborator

smilerz commented Oct 15, 2021

@auanasgheps after setting the host and scheme as mentioned above clear the cache on the page - some of the URLs are constructed from settings set in LOCAL_STORAGE. Maybe(?) those are not getting overridden correctly? I'd restart the docker as well to make sure that no information is cached anywhere.

@MaxJa4
Copy link
Contributor

MaxJa4 commented Oct 15, 2021

@auanasgheps That's the exact same errors I got.
Did you add both "proxy_set_header Host" and "proxy_set_header X-Forwarded-Proto"? If so, then maybe the caching is the issue here like smilerz said. After that, I'm out of ideas (other than restarting nginx once more just to be sure).

@auanasgheps
Copy link
Contributor Author

auanasgheps commented Oct 15, 2021

I added both "proxy_set_header Host $Host" and "proxy_set_header X-Forwarded-Proto $scheme"
Restarted nginx
Browed to Recipes
CTRL + F5 to clear cache

Bad Request (400)

@vabene1111
Copy link
Collaborator

So first of all the included nginx config and all recommended/documented setups have been tested and were working.

The paths are not absolute but django has several build in ways that manage constructing paths, if a proxy setup in front of django does not pass trough the correct headers than django is not able to determine where it is actually running from and thus cannot tell the frontend components the correct routes to make request to.

From what i can see @auanasgheps you are getting requests blocked because django thinks that its running on http but it actually is served over https. This can happen if the proxy enforces https for the main requests (which it is able to do since it passes trough it) but it cannot rewrite the urls that django determines it needs to use for making api requests.

Please make sure you set proxy_set_header Host $http_host; (http_host not host as stated in the docs and issue #953) the other header proxy_set_header X-Forwarded-Proto $scheme; looks correct. If that does not help please remove all configuration entries from your nginx config that are not clearly mentioned in the installation guide and verify the problem still exists. If it does please post detailed information about your setup (folder locations, OS versions, all relevant config files env/nginx/etc.)

@MaxJa4
Copy link
Contributor

MaxJa4 commented Oct 16, 2021

My nginx config (of the host system, as reverse proxy) looks like this:

server {
    if ($host = SUB.DOMAIN.TLD) {
        return 301 https://$host$request_uri;
    }

    server_name SUB.DOMAIN.TLD;
    listen 80;
    return 404;
}
server {
    server_name SUB.DOMAIN.TLD;
    listen 443 ssl;

    ssl_certificate /etc/letsencrypt/live/SUB.DOMAIN.TLD/fullchain.pem; # managed by Certbot
    ssl_certificate_key /etc/letsencrypt/live/SUB.DOMAIN.TLD/privkey.pem; # managed by Certbot
    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot

        location / {
                proxy_pass http://127.0.0.1:PORT;
                proxy_redirect http://127.0.0.1:PORT https://SUB.DOMAIN.TLD;
                proxy_set_header Host $Host;
                proxy_set_header X-Forwarded-Proto $scheme;
        }
}

Be sure to replace SUB.DOMAIN.TLD (6x) and PORT (2x) in all spots ofc. This is by far not a perfect config but it works for me. If you don't use certbot or letsencrypt, you might need to change some stuff.

@auanasgheps
Copy link
Contributor Author

So I confirm that if I use proxy_set_header Host $http_host; I get Bad Request 400. Before I was using proxy_set_header Host $Host; just fine.

My setup is: OS Debian 10, Docker 20.10.9

Network flow is:
nginx (swag lets encrypt) > recipes front-end. No dedicated nginx recipes container since I already have the main one that does the job for other containers.
nginx/swag has access to the /media/recipes folder to serve media.

Here's the proxy config (that doesn't work)

server {
    listen 8080 ssl;
    listen [::]:8080 ssl;

    server_name recipes.*;

    include /config/nginx/ssl.conf;

	#redirect http to https on same port
	error_page 497 301 =307 https://$host:$server_port$request_uri;

    client_max_body_size 0;

    # serve media files
    location /media/recipes {
		alias /recipes-media/;
	}
		
    location / {
        include /config/nginx/proxy.conf;
        resolver 127.0.0.11 valid=30s;
        set $upstream_app recipes-app;
        set $upstream_port 8080;
        set $upstream_proto http;
        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
	proxy_set_header X-Forwarded-Proto $scheme;
	proxy_set_header Host $http_host;
	#proxy_set_header Host $Host;
    }
}

Here's the relevant part of my .env file

# hosts the application can run under e.g. recipes.mydomain.com,cooking.mydomain.com,...
ALLOWED_HOSTS=recipes.mydomain.tld

# If mediafiles are stored at a different location uncomment and change accordingly
MEDIA_URL=https://recipes.mydomain.tld:8080/media/

CSRF_TRUSTED_ORIGINS=recipes.mydomain.tld

@vabene1111
Copy link
Collaborator

Hmm this is very weird. Can you also post the logs of the nginx/swag and django ? The main thing i want to understand if the requests actually get trough to django or not.

I know that quite a few people had problems with swag before and it was usually related to headers but yours look fine.

@auanasgheps
Copy link
Contributor Author

auanasgheps commented Oct 18, 2021

nginx log doesn't throw any error, here's the access.log

192.168.0.100 - - [19/Oct/2021:00:35:05 +0200] "GET /favicon.ico HTTP/2.0" 400 143 "https://recipes.mydomain.tld:8080/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0"
192.168.0.100 - - [19/Oct/2021:00:35:06 +0200] "GET /service-worker.js HTTP/2.0" 400 143 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0"
192.168.0.100 - - [19/Oct/2021:00:35:35 +0200] "GET / HTTP/2.0" 400 143 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0"
192.168.0.100 - - [19/Oct/2021:00:35:35 +0200] "GET /favicon.ico HTTP/2.0" 400 143 "https://recipes.mydomain.tld:8080/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0"

If I enable debug mode, here's what I get.

WTH? Looks like nginx is passing my domain twice (first hostname then hostname and port), therefore causing this error.

immagine

@vabene1111
Copy link
Collaborator

ok so the fix for django would be to simple use ALLOWED_HOSTS=* which is not perfect but acceptable for a proxied server.

Other than that i am not sure which line causes this as i am not familiar with swag but might it be that the $upstream_app in proxy_pass $upstream_proto://$upstream_app:$upstream_port; contains the sub domain twice?

@auanasgheps
Copy link
Contributor Author

ok so the fix for django would be to simple use ALLOWED_HOSTS=* which is not perfect but acceptable for a proxied server.

Yeah. I mean I should only access the frontend via the proxy. I've kept the frontend port bind in case something goes wrong, but it's just for LAN.

I'll test the change and report back.

Other than that i am not sure which line causes this as i am not familiar with swag but might it be that the $upstream_app in proxy_pass $upstream_proto://$upstream_app:$upstream_port; contains the sub domain twice?

It can't be otherwise I would not be able to connect at all. That's the part that actually does the proxy job.

@auanasgheps
Copy link
Contributor Author

auanasgheps commented Oct 19, 2021

So I used the option ALLOWED_HOSTS=* but it still doesn't work.
The error is always the same The domain name provided is not valid according to RFC 1034/1035.
Possibly because the header can't be parsed and is something like recipes.mydomain.tld,recipes.mydomain.tld:8080

I'll try to understand why this is happening.

EDIT
Okay, there's a /config/nginx/proxy.conf which by default sets the following parameters, so it's not required to specify again proxy_set_header Host $http_host;

# Proxy Header Settings
proxy_set_header Connection $connection_upgrade;
proxy_set_header Early-Data $ssl_early_data;				
proxy_set_header Host $host;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Proto https;		
proxy_set_header X-Forwarded-Ssl on;
proxy_set_header X-Real-IP $remote_addr;

So definitely needs to be removed from the recipes config. If I remove it I can "access" Recipes, but recipes don't load.

Is any of these parameters interfering with Django?

@auanasgheps
Copy link
Contributor Author

auanasgheps commented Oct 19, 2021

With the "correct" config, my browser in the developer console says

Mixed Content: The page at 'https://recipes.mydomain.tld:8080/search/' was loaded over HTTPS, but requested an insecure XMLHttpRequest endpoint 'http://recipes.mydomain.tld/api/recipe/?query=&keywords_or=true&foods_or=true&books_or=true&internal=false&random=false&new=true&page=1&page_size=25&last_viewed=5'. This request has been blocked; the content must be served over HTTPS.

What the heck is this? The proxy is sending all sort of HTTPS requests/upgrades, there's no request from the client done in HTTP.

EDIT:
I've forced several page updates and this error has disappeared, now I get a generic network error.
image

Here's django debug logs for a page load

172.18.0.5 - - [19/Oct/2021:11:47:30 +0200] "GET /search/ HTTP/1.1" 200 16711 "https://recipes.mydomain.tld:8080/accounts/login/?next=/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/themes/flatly.min.css HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/css/app.min.css HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/js/jquery-3.5.1.min.js HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/js/popper.min.js HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/js/bootstrap.min.js HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/css/select2.min.css HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/js/select2.min.js HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/css/select2-bootstrap.css HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/themes/select2-bootstrap-theme.css HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/fontawesome/fontawesome_all.min.css HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/django_js_reverse/reverse.js HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/vue/css/chunk-vendors.css HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/vue/js/chunk-vendors.js HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/vue/css/recipe_search_view.css HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/vue/js/recipe_search_view.js HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/js/popper.min.js.map HTTP/1.1" 200 0 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/js/bootstrap.min.js.map HTTP/1.1" 200 0 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:31 +0200] "GET /static/webfonts/fa-solid-900.woff2 HTTP/1.1" 304 0 "https://recipes.mydomain.tld:8080/static/fontawesome/fontawesome_all.min.css" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
172.18.0.5 - - [19/Oct/2021:11:47:32 +0200] "GET /manifest.json HTTP/1.1" 200 1117 "https://recipes.mydomain.tld:8080/search/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36"

@vabene1111
Copy link
Collaborator

Ok to from djangos side of things everything looks correct but in the requests you send i cannot see any of the frontend javascript files being requested.

The mixed content warning, even tough it is gone now, is understandable because if django thinks that it is running under http (which it might if some header breaks) it will render the html containing http links. Even if your proxy would upgrade them when they are executed the browser would think that its mixed content and thus block the requests / show errors.

One thing the django log shows for sure is that the connection refused response that you are seeing in your console comes somewhere from your proxy stack as the requests dont actually make its way to django but get canceled somewhere in front. You could try to visit the /api/xyz url manually and see if the connection refused happens there as well and try to debug which part of your proxy kills that request.

What i see is that your default config uses proxy_set_header Host $host; and not proxy_set_header Host $http_host;. I am not sure if this is a problem but i remember that we added this parameter for a reason, just not which reason.

@vabene1111 vabene1111 added the setup issue possibly or definitely an issue with the user setup label Oct 19, 2021
@auanasgheps
Copy link
Contributor Author

auanasgheps commented Oct 19, 2021

First of all, I see that proxy_set_header X-Forwarded-Proto $scheme; doesn't work properly alone.

It doesn't make much sense but if I use $scheme or https alone I can't login in a new session with a stupid CSRF error.
. If I set both, it works.

So I've ignored the proxy.conf, using this config

        #include /config/nginx/proxy.conf;
        resolver 127.0.0.11 valid=30s;
        set $upstream_app recipes-app;
        set $upstream_port 8080;
        set $upstream_proto http;
        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
        proxy_set_header X-Forwarded-Proto https;
        proxy_set_header X-Forwarded-Proto $scheme;
        proxy_set_header Host $http_host;
    }
}

I can login but obviously nothing loads. The browser shows an error about mixed content, identical to this error.
I can reach apis like
api/recipe/?query=&keywords_or=true&foods_or=true&books_or=true&internal=false&random=false&new=true&page=1&page_size=25&last_viewed=5
or
/api/recipe-book/

immagine

@vabene1111
Copy link
Collaborator

Ok i am kind of lost. setting the X-Forwarded-Proto header twice does, as you stated, make no sense and its super weird that this even works.

The fact that the api call alone works but not inside the view makes sense, django thinks its not secure and thus renders http links instead of https but i have no idea why the request isnt getting trough with the correct headers.

Now i dont think we are getting anywhere with this issue, i have some other user with setup issues with whom i chatted on discord today and i will do some remote debugging via anydesk/teamviewer/whatever tomorrow afternoon (european time). If you want i can take a look at your setup as well to determine what is wrong with it, other than that i can just say that everything indicates that your error is caused by django not receiving the correct headers and that something in your request chain must be breaking it but i have no idea which part it is.

@auanasgheps
Copy link
Contributor Author

I could open an issue to the linuxserver/swag guys, they might know more about Nginx... but not about Django. The problem is we still don't know why it's failing.

To be extra safe I'll create a new linuxserver/swag container with absolutely clean configs. If still doesn't work, I'll open an issue to them referencing this one. If that's the case means you could also easily replicate the issue.

Thanks for offering your help, I'm in EU too, but I want to dig a bit deeper and try to find more. I'll keep you posted!

@vabene1111
Copy link
Collaborator

ok, since headers have been a problem for a few users i will try to add some kind of debug section to the system page that maybe just prints out all the headers django receives, that would ease debugging a little

@auanasgheps
Copy link
Contributor Author

I can replicate the issue with a clean linuxserver/swag istance.

  • I've copied my current nginx/swag stack and adjusted the configuration to bind the test istance to another folder
  • Made some basic changes to run the proxy (SSL generation)
  • Rename recipes.subdomain.conf.sample to recipes.subdomain.conf and make the changes to work (port and container name)

1st error: CSFR login failure
2nd error (if I'm already logged in): nothing loads, but I might have spotted where the problem is: the error below does not list the port. My reverse proxy is not running on 443 but 8080!
Might this be related to Django? The service is exposed on 8080 from both the proxy and the recipes front end.

Additionally, are you willing to try this setup? You should be able to replicate. In the meantime I'll open an issue with the linuxserver guys.

image

@vabene1111
Copy link
Collaborator

Ok now that i read your post again and the swag post as well: You are saying your server runs under 8080 and django makes requests to 443 which obviously get refused.

This means that the headers required for django to know under which port it runs are not set correctly thus it returns the wrong api urls. There are two options i see here, either run tandoor on 443 (which is see no reason why not to do this since you are using a reverse proxy with proper domains and having non default ports is annoying anyway) or find out which headers are required for django to know the port of your request.

I know people run tandoor on non default ports and my dev setup does this as well so it should not be a problem but i could also probably implement that you can set the port from the reverse proxcy using a header like detailed here https://docs.djangoproject.com/en/dev/ref/settings/#use-x-forwarded-port

@auanasgheps
Copy link
Contributor Author

auanasgheps commented Oct 20, 2021

Ok now that i read your post again and the swag post as well: You are saying your server runs under 8080 and django makes requests to 443 which obviously get refused.

This means that the headers required for django to know under which port it runs are not set correctly thus it returns the wrong api urls. There are two options i see here, either run tandoor on 443 (which is see no reason why not to do this since you are using a reverse proxy with proper domains and having non default ports is annoying anyway) or find out which headers are required for django to know the port of your request.

I know people run tandoor on non default ports and my dev setup does this as well so it should not be a problem but i could also probably implement that you can set the port from the reverse proxcy using a header like detailed here https://docs.djangoproject.com/en/dev/ref/settings/#use-x-forwarded-port

Tandoor runs internally 8080 which is the default (I guess)
My swag proxy server runs on 8080 instead of 443 (both the host and container) but it's making API calls to the 443 port which isn't listening. The calls I see are done to the FQDN, so they must be on 8080, regardless of which port Django is running.

My reverse proxy is instructed to serve 8080 and I can technically reach Django (ignoring all the problems now) but then Django is providing the API calls which are then made on the wrong port.
Given this, do you know if it's happeniong because of Nginx (missing some weird port header) or Django (not being aware of the port)?

@smilerz
Copy link
Collaborator

smilerz commented Oct 20, 2021

The API calls are constructed based on what scheme, domain, port and path that Django sees in the headers. If Django is providing wrong absolute paths it is because there is information missing and/or wrong in the headers.

@vabene1111
Copy link
Collaborator

Ok so i added a view on the system page that shows the header that django receives, you can update to the develop tag since i dont have time to update master right now. The output of that text field would be really interesting in debugging this issue

@auanasgheps
Copy link
Contributor Author

I wanted to do a step back but Django really doesn't like the Swag container.

I adopted the full stack as per your documentation, by adding a "dummy" nginx that only serves Recipes. Works great but I'll never expose that container to the internet.

So I though to place my main swag in front of the dummy nginx. Not an elegant solution but still viable.

Well, the page errors out because the browser tries to reach recipes-nginx which is the name of the dummy nginx, but I'm connected to the swag nginx with my full domain name, so django is messing up with whatever swag is trying to do.

I still haven't found the time to update to develop branch, I won't do it before Saturday. I hope will help us understand this behaviour.

immagine

@auanasgheps
Copy link
Contributor Author

@vabene1111 sorry for the delay, I got carried by other things. Do I still need the develop branch to see the headers?

@vabene1111
Copy link
Collaborator

No this has since been released. There have also been some fixes so your problems might even be resolved.

@auanasgheps
Copy link
Contributor Author

eheh the problem is still here!

So here are the headers. They look correct to me...

HTTP_CONNECTION:close
HTTP_HOST:recipes.mydomain.tld
HTTP_X_FORWARDED_FOR:10.8.0.2
HTTP_X_FORWARDED_HOST:recipes.mydomain.tld
HTTP_X_FORWARDED_PROTO:https,https
HTTP_X_FORWARDED_SSL:on
HTTP_X_REAL_IP:10.8.0.2
HTTP_SEC_CH_UA:"Google Chrome";v="95", "Chromium";v="95", ";Not A Brand";v="99"
HTTP_SEC_CH_UA_MOBILE:?0
HTTP_SEC_CH_UA_PLATFORM:"Windows"
HTTP_UPGRADE_INSECURE_REQUESTS:1
HTTP_DNT:1
HTTP_USER_AGENT:Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36
HTTP_ACCEPT:text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9
HTTP_SEC_FETCH_SITE:same-origin
HTTP_SEC_FETCH_MODE:navigate
HTTP_SEC_FETCH_USER:?1
HTTP_SEC_FETCH_DEST:document
HTTP_REFERER:https://recipes.mydomain.tld:8080/search/
HTTP_ACCEPT_ENCODING:gzip, deflate, br
HTTP_ACCEPT_LANGUAGE:it-IT,it;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6
HTTP_SEC_GPC:1
HTTP_COOKIE:csrftoken=blablabla sessionid=blablabla

@vabene1111
Copy link
Collaborator

is this maybe the problem HTTP_X_FORWARDED_PROTO:https,https ? i dont think its correct for https to be in there twice ? in my instance it looks like this HTTP_X_FORWARDED_PROTO:https i think one of the proxies does not remove the header and just appends the https.

Maybe try in you proxy to set and not append it to just https ? Other than that i am at a loss here, no idea on how to help you further. If you want we can shedule a meeting next week were i would look at your setup with anydesk, teamviewer or something similar to help you fix the issue.

@auanasgheps
Copy link
Contributor Author

is this maybe the problem HTTP_X_FORWARDED_PROTO:https,https ? i dont think its correct for https to be in there twice ? in my instance it looks like this HTTP_X_FORWARDED_PROTO:https i think one of the proxies does not remove the header and just appends the https.

Correct, this was my mistake, I may have added this header when playing around with settings.

So I finally found the time to play around a little bit and I FIXED IT!!!!

Give me some time to wrap it up and explain. As you suspected, the issue is in Swag configurations that don't pass the headers that Django wants (but to be fair with them, they work correctly with all other sites).

I'll post updates soon.

@auanasgheps
Copy link
Contributor Author

auanasgheps commented Nov 7, 2021

First of all, this problem only affects you if you're using linuxserver/swag and you are hosting it on a port that is not 443 (nginx port, not Recipes). The default config works when using 443!

Analysis
By default, linuxserver/swag sets two headers that Django doesn't like:

  • proxy_set_header X-Forwarded-Host $host;
  • proxy_set_header Host $host;

If I change these two headers from $host to $http_host, Recipes works perfectly!

The Problem
linuxserver/swag has a file with generic headers that are required by many apps, including the aforementioned headers, called proxy.conf. We can't get rid of this file, because includes a lot of configs that are also required for Recipes.

I'm not super expert in Nginx, but looks like there's no way to override a config: if I set it in the config file, it gets declared twice.

Solution
There are different ways to approach the issue, the one that suits my mental order is:

  • Create a copy of proxy.conf
  • Replace proxy_set_header X-Forwarded-Host $host; and proxy_set_header Host $host; to
    • proxy_set_header X-Forwarded-Host $http_host; and proxy_set_header Host $http_host;
  • Update recipes.subdomain.conf to use the new file
  • Restart the linuxserver/swag container and Recipes will work again

You could also copy the whole content of proxy.conf to recipes.subdomain.conf and set the correct values, but the file will look messy.

linuxserver/swag talks directly to Django front end, without the dedicated nginx instance.

Final words
I cannot make a PR to linuxserver/swag because their default config works if using standard ports.
Can we add this information to your wiki? I can make the PR if you don't have the time.

@auanasgheps
Copy link
Contributor Author

@smilerz shall we document what I've discovered in the official doc?

@smilerz
Copy link
Collaborator

smilerz commented Dec 18, 2021

That would be great if you can submit a PR

@vabene1111
Copy link
Collaborator

Possibly the FAQ or some other section you find fitting

@auanasgheps
Copy link
Contributor Author

done :)

smilerz added a commit that referenced this issue Dec 20, 2021
commit 7837467
Merge: aaaae5b 8475938
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Dec 18 23:14:24 2021 +0100

    Merge pull request #1146 from auanasgheps/patch-1

    Add documentation about swag by linuxserver

commit 8475938
Author: Oliver Cervera <cervera93-19@yahoo.it>
Date:   Sat Dec 18 13:49:09 2021 +0100

    Add documentation about swag by linuxserver

    Documents behaviour in #959

commit aaaae5b
Merge: 4a747f5 ea62c10
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Thu Dec 16 18:10:48 2021 +0100

    Merge pull request #1143 from smilerz/fix_get_facet_api

    fix bug in get_facet_api

commit ea62c10
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:20:56 2021 -0600

    remove console message

commit 3516505
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:08:32 2021 -0600

    fix bug in get_facet_api
smilerz added a commit to smilerz/recipes that referenced this issue Dec 20, 2021
commit 75b45ba
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 15:26:31 2021 -0600

    Squashed commit of the following:

    commit 7837467
    Merge: aaaae5b 8475938
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Sat Dec 18 23:14:24 2021 +0100

        Merge pull request TandoorRecipes#1146 from auanasgheps/patch-1

        Add documentation about swag by linuxserver

    commit 8475938
    Author: Oliver Cervera <cervera93-19@yahoo.it>
    Date:   Sat Dec 18 13:49:09 2021 +0100

        Add documentation about swag by linuxserver

        Documents behaviour in TandoorRecipes#959

    commit aaaae5b
    Merge: 4a747f5 ea62c10
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Thu Dec 16 18:10:48 2021 +0100

        Merge pull request TandoorRecipes#1143 from smilerz/fix_get_facet_api

        fix bug in get_facet_api

    commit ea62c10
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:20:56 2021 -0600

        remove console message

    commit 3516505
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:08:32 2021 -0600

        fix bug in get_facet_api

commit bf9e59d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 14:59:56 2021 -0600

    fix Shopping Modal to filter onhand from initial list

commit 132c48a
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 12:27:25 2021 -0600

    fix shopping list api

commit d4553c0
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 08:13:10 2021 -0600

    fix get_facets_API

commit edc670e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 16:59:33 2021 -0600

    filter fields available to inherit in space settings

commit a313039
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 15:48:55 2021 -0600

    fix after rebase

commit 963dad3
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 14:42:12 2021 -0600

    fix rounding on new shopping list

commit 8f19ab6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:29:08 2021 -0600

    Update settings.py

commit 0e20f67
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:23:22 2021 -0600

    fix post_save signal for sqlite

commit 46b83c8
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 12:33:25 2021 -0600

    delete yarn lock

commit 8b28a47
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 09:39:20 2021 -0600

    rebase and fixes

commit e7e3a30
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 07:24:12 2021 -0600

    test shoppingFood API

commit ea7d34c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 11:29:54 2021 -0600

    test userpreference food_inherit defaults

commit 7e081d4
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 07:54:45 2021 -0600

    test rest food inheritance

commit 2edb455
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 17:34:57 2021 -0600

    pytest shopping user preferences

commit c32a96f
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 15:06:04 2021 -0600

    update

commit 6d1476b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 10:30:53 2021 -0600

    pytest edit shopping list recipes

commit 5d79e4d
Author: smilerz <smilerz@gmail.com>
Date:   Sun Dec 12 10:39:01 2021 -0600

    pytest shopping list from recipe methods

commit 0866d21
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 16:41:20 2021 -0600

    test recent shopping list

commit 6448c06
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 11:09:11 2021 -0600

    test shopping list sharing

commit b146e75
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 09:01:20 2021 -0600

    basic tests with new factories

commit 68927d1
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 16:31:01 2021 -0600

    fixed userpref serializer

commit 1e36e6c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:25:32 2021 -0600

    WIP

commit 4877d69
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 09:02:18 2021 -0600

    fix package.json

commit f2f187a
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 12:16:28 2021 -0600

    minor cleanup

commit c2e84c1
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 09:50:01 2021 -0600

    visual indicator meal plan in shopping

commit ca93920
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 08:19:41 2021 -0600

    copy shopping as markdown

commit 903a721
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 16:33:14 2021 -0600

    download as CSV

commit 44e513f
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 14:33:13 2021 -0600

    fix after rebase

commit 2d7d160
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 12:04:27 2021 -0600

    download shopping list PDF

commit 54ca8b2
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 08:53:06 2021 -0600

    refresh shopping list when item is delayed

commit a972a75
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 13:13:01 2021 -0600

    WIP

commit 7c0d123
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 11:37:29 2021 -0600

    Fix after rebase

commit 09b0dcb
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 10:38:13 2021 -0600

    pre-merge

commit 5b4867d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 09:16:47 2021 -0600

    undo move

commit d3d4c21
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 11:11:51 2021 -0600

    yarn build

commit 6cffee5
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 10:59:11 2021 -0600

    Fix after rebase

commit 286595e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 09:02:20 2021 -0600

    WIP

commit 0d1c55d
Author: smilerz <smilerz@gmail.com>
Date:   Fri Nov 5 12:01:36 2021 -0500

    RecipeFactory and all related models

commit fd8ca2e
Author: smilerz <smilerz@gmail.com>
Date:   Thu Nov 4 16:00:45 2021 -0500

    food inherit tests

commit 9ef4c88
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 21:39:17 2021 -0500

    finish refactoring test_api_food to use factoryboy

commit 08d3c40
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 13:43:41 2021 -0500

    refactor Food tests to use factory_boy fixture factories

commit e229a70
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 16:34:53 2021 -0500

    more fixes after rebase

commit 06b7ba8
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:43:10 2021 -0500

    minor updates

commit 099a542
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:45 2021 -0500

    update migrations

commit 5a9543b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:19 2021 -0500

    Fix after rebase

commit 60d7e63
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 15:18:00 2021 -0500

    add to shopping from card context menu

commit 867e2d4
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 13:33:15 2021 -0500

    add new unit/food from shopping list

commit 757fa5e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 11:18:36 2021 -0500

    edit supermarket categories

commit 8b682c3
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 20:40:56 2021 -0500

    related recipes included when adding mealplan to shopping list

commit 27f358d
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 12:05:29 2021 -0500

    fix apis

commit 7c6a7ef
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 27 11:51:14 2021 -0500

    alpha shopping list

commit 4c50675
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 21:58:06 2021 -0500

    autosync

commit b84d77b
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 19:56:44 2021 -0500

    WIP

commit 247dd30
Author: smilerz <smilerz@gmail.com>
Date:   Mon Oct 25 11:55:36 2021 -0500

    fade-enter-active

commit 5e4e203
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 21 17:44:45 2021 -0500

    shopping line item

commit 79b6d48
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 13:14:22 2021 -0500

    inheritance works with object moves

commit 6075ce5
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 08:35:33 2021 -0500

    food inherit attributes

commit 2ca7722
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 14:44:42 2021 -0500

    Fix after rebase

commit 7a9e5b1
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 13:32:27 2021 -0500

    getUserPreference available for all UserPreferences

commit 7f87a9e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 13 07:42:59 2021 -0500

    Fix after rebase

commit 3d674cf
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 7 12:35:46 2021 -0500

    model changes and GenericAutoSchema

commit 1642224
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 2 12:47:59 2021 -0500

    model migrations

commit 3d359f8
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 15:59:21 2021 -0500

    WIP

commit 94c6927
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 14:20:41 2021 -0500

    WIP

commit 9827c3f
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 07:35:30 2021 -0500

    Fix after rebase

commit 4a747f5
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 18:02:37 2021 +0100

    Revert "Revert "fixed vue build""

    This reverts commit edde015.

commit 0623a8e
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:59:22 2021 +0100

    clear package cache in build

commit 5941022
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:46:01 2021 +0100

    fixed markdown table extension

commit 2559905
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:45:53 2021 +0100

    fixed empty fields breaking recipe update

commit edde015
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:26:06 2021 +0100

    Revert "fixed vue build"

    This reverts commit 7e07508.

commit 9b7b8be
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:22:24 2021 +0100

    addeed yarn lock

commit 2eae8e5
Merge: 4118c8d 6d8bc39
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:35:09 2021 +0100

    Merge pull request TandoorRecipes#1141 from TandoorRecipes/dependabot/pip/django-3.2.10

    Bump django from 3.2.9 to 3.2.10

commit 6d8bc39
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Dec 14 15:33:48 2021 +0000

    Bump django from 3.2.9 to 3.2.10

    Bumps [django](https://github.com/django/django) from 3.2.9 to 3.2.10.
    - [Release notes](https://github.com/django/django/releases)
    - [Commits](django/django@3.2.9...3.2.10)

    ---
    updated-dependencies:
    - dependency-name: django
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 4118c8d
Merge: 01510f3 78c2eac
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:27:23 2021 +0100

    Merge pull request TandoorRecipes#1138 from TandoorRecipes/dependabot/pip/lxml-4.6.5

    Bump lxml from 4.6.4 to 4.6.5

commit 78c2eac
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Dec 13 20:26:37 2021 +0000

    Bump lxml from 4.6.4 to 4.6.5

    Bumps [lxml](https://github.com/lxml/lxml) from 4.6.4 to 4.6.5.
    - [Release notes](https://github.com/lxml/lxml/releases)
    - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
    - [Commits](lxml/lxml@lxml-4.6.4...lxml-4.6.5)

    ---
    updated-dependencies:
    - dependency-name: lxml
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 01510f3
Merge: e8b2f57 09cc5aa
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Wed Dec 8 14:59:32 2021 +0100

    Merge pull request TandoorRecipes#1119 from TandoorRecipes/user_prefs_fix

    fix package.json

commit 09cc5aa
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:38:03 2021 -0600

    fix package.json
smilerz added a commit to smilerz/recipes that referenced this issue Dec 21, 2021
commit 421ade7
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 13:53:40 2021 -0600

    WIP

commit c785b59
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 13:53:16 2021 -0600

    fix filter_to_supermarket setting

commit 4213256
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 13:40:50 2021 -0600

    fix categories in supermarket edit modal

commit dfe4149
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 11:35:35 2021 -0600

    fix add to shopping from MealPlan Modal

commit ee52092
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 11:05:24 2021 -0600

    delete supermarkets and categories from shopping list view

commit 75b45ba
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 15:26:31 2021 -0600

    Squashed commit of the following:

    commit 7837467
    Merge: aaaae5b 8475938
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Sat Dec 18 23:14:24 2021 +0100

        Merge pull request TandoorRecipes#1146 from auanasgheps/patch-1

        Add documentation about swag by linuxserver

    commit 8475938
    Author: Oliver Cervera <cervera93-19@yahoo.it>
    Date:   Sat Dec 18 13:49:09 2021 +0100

        Add documentation about swag by linuxserver

        Documents behaviour in TandoorRecipes#959

    commit aaaae5b
    Merge: 4a747f5 ea62c10
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Thu Dec 16 18:10:48 2021 +0100

        Merge pull request TandoorRecipes#1143 from smilerz/fix_get_facet_api

        fix bug in get_facet_api

    commit ea62c10
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:20:56 2021 -0600

        remove console message

    commit 3516505
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:08:32 2021 -0600

        fix bug in get_facet_api

commit bf9e59d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 14:59:56 2021 -0600

    fix Shopping Modal to filter onhand from initial list

commit 132c48a
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 12:27:25 2021 -0600

    fix shopping list api

commit d4553c0
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 08:13:10 2021 -0600

    fix get_facets_API

commit edc670e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 16:59:33 2021 -0600

    filter fields available to inherit in space settings

commit a313039
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 15:48:55 2021 -0600

    fix after rebase

commit 963dad3
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 14:42:12 2021 -0600

    fix rounding on new shopping list

commit 8f19ab6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:29:08 2021 -0600

    Update settings.py

commit 0e20f67
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:23:22 2021 -0600

    fix post_save signal for sqlite

commit 46b83c8
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 12:33:25 2021 -0600

    delete yarn lock

commit 8b28a47
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 09:39:20 2021 -0600

    rebase and fixes

commit e7e3a30
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 07:24:12 2021 -0600

    test shoppingFood API

commit ea7d34c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 11:29:54 2021 -0600

    test userpreference food_inherit defaults

commit 7e081d4
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 07:54:45 2021 -0600

    test rest food inheritance

commit 2edb455
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 17:34:57 2021 -0600

    pytest shopping user preferences

commit c32a96f
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 15:06:04 2021 -0600

    update

commit 6d1476b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 10:30:53 2021 -0600

    pytest edit shopping list recipes

commit 5d79e4d
Author: smilerz <smilerz@gmail.com>
Date:   Sun Dec 12 10:39:01 2021 -0600

    pytest shopping list from recipe methods

commit 0866d21
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 16:41:20 2021 -0600

    test recent shopping list

commit 6448c06
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 11:09:11 2021 -0600

    test shopping list sharing

commit b146e75
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 09:01:20 2021 -0600

    basic tests with new factories

commit 68927d1
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 16:31:01 2021 -0600

    fixed userpref serializer

commit 1e36e6c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:25:32 2021 -0600

    WIP

commit 4877d69
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 09:02:18 2021 -0600

    fix package.json

commit f2f187a
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 12:16:28 2021 -0600

    minor cleanup

commit c2e84c1
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 09:50:01 2021 -0600

    visual indicator meal plan in shopping

commit ca93920
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 08:19:41 2021 -0600

    copy shopping as markdown

commit 903a721
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 16:33:14 2021 -0600

    download as CSV

commit 44e513f
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 14:33:13 2021 -0600

    fix after rebase

commit 2d7d160
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 12:04:27 2021 -0600

    download shopping list PDF

commit 54ca8b2
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 08:53:06 2021 -0600

    refresh shopping list when item is delayed

commit a972a75
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 13:13:01 2021 -0600

    WIP

commit 7c0d123
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 11:37:29 2021 -0600

    Fix after rebase

commit 09b0dcb
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 10:38:13 2021 -0600

    pre-merge

commit 5b4867d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 09:16:47 2021 -0600

    undo move

commit d3d4c21
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 11:11:51 2021 -0600

    yarn build

commit 6cffee5
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 10:59:11 2021 -0600

    Fix after rebase

commit 286595e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 09:02:20 2021 -0600

    WIP

commit 0d1c55d
Author: smilerz <smilerz@gmail.com>
Date:   Fri Nov 5 12:01:36 2021 -0500

    RecipeFactory and all related models

commit fd8ca2e
Author: smilerz <smilerz@gmail.com>
Date:   Thu Nov 4 16:00:45 2021 -0500

    food inherit tests

commit 9ef4c88
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 21:39:17 2021 -0500

    finish refactoring test_api_food to use factoryboy

commit 08d3c40
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 13:43:41 2021 -0500

    refactor Food tests to use factory_boy fixture factories

commit e229a70
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 16:34:53 2021 -0500

    more fixes after rebase

commit 06b7ba8
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:43:10 2021 -0500

    minor updates

commit 099a542
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:45 2021 -0500

    update migrations

commit 5a9543b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:19 2021 -0500

    Fix after rebase

commit 60d7e63
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 15:18:00 2021 -0500

    add to shopping from card context menu

commit 867e2d4
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 13:33:15 2021 -0500

    add new unit/food from shopping list

commit 757fa5e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 11:18:36 2021 -0500

    edit supermarket categories

commit 8b682c3
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 20:40:56 2021 -0500

    related recipes included when adding mealplan to shopping list

commit 27f358d
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 12:05:29 2021 -0500

    fix apis

commit 7c6a7ef
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 27 11:51:14 2021 -0500

    alpha shopping list

commit 4c50675
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 21:58:06 2021 -0500

    autosync

commit b84d77b
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 19:56:44 2021 -0500

    WIP

commit 247dd30
Author: smilerz <smilerz@gmail.com>
Date:   Mon Oct 25 11:55:36 2021 -0500

    fade-enter-active

commit 5e4e203
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 21 17:44:45 2021 -0500

    shopping line item

commit 79b6d48
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 13:14:22 2021 -0500

    inheritance works with object moves

commit 6075ce5
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 08:35:33 2021 -0500

    food inherit attributes

commit 2ca7722
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 14:44:42 2021 -0500

    Fix after rebase

commit 7a9e5b1
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 13:32:27 2021 -0500

    getUserPreference available for all UserPreferences

commit 7f87a9e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 13 07:42:59 2021 -0500

    Fix after rebase

commit 3d674cf
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 7 12:35:46 2021 -0500

    model changes and GenericAutoSchema

commit 1642224
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 2 12:47:59 2021 -0500

    model migrations

commit 3d359f8
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 15:59:21 2021 -0500

    WIP

commit 94c6927
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 14:20:41 2021 -0500

    WIP

commit 9827c3f
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 07:35:30 2021 -0500

    Fix after rebase

commit 4a747f5
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 18:02:37 2021 +0100

    Revert "Revert "fixed vue build""

    This reverts commit edde015.

commit 0623a8e
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:59:22 2021 +0100

    clear package cache in build

commit 5941022
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:46:01 2021 +0100

    fixed markdown table extension

commit 2559905
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:45:53 2021 +0100

    fixed empty fields breaking recipe update

commit edde015
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:26:06 2021 +0100

    Revert "fixed vue build"

    This reverts commit 7e07508.

commit 9b7b8be
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:22:24 2021 +0100

    addeed yarn lock

commit 2eae8e5
Merge: 4118c8d 6d8bc39
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:35:09 2021 +0100

    Merge pull request TandoorRecipes#1141 from TandoorRecipes/dependabot/pip/django-3.2.10

    Bump django from 3.2.9 to 3.2.10

commit 6d8bc39
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Dec 14 15:33:48 2021 +0000

    Bump django from 3.2.9 to 3.2.10

    Bumps [django](https://github.com/django/django) from 3.2.9 to 3.2.10.
    - [Release notes](https://github.com/django/django/releases)
    - [Commits](django/django@3.2.9...3.2.10)

    ---
    updated-dependencies:
    - dependency-name: django
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 4118c8d
Merge: 01510f3 78c2eac
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:27:23 2021 +0100

    Merge pull request TandoorRecipes#1138 from TandoorRecipes/dependabot/pip/lxml-4.6.5

    Bump lxml from 4.6.4 to 4.6.5

commit 78c2eac
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Dec 13 20:26:37 2021 +0000

    Bump lxml from 4.6.4 to 4.6.5

    Bumps [lxml](https://github.com/lxml/lxml) from 4.6.4 to 4.6.5.
    - [Release notes](https://github.com/lxml/lxml/releases)
    - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
    - [Commits](lxml/lxml@lxml-4.6.4...lxml-4.6.5)

    ---
    updated-dependencies:
    - dependency-name: lxml
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 01510f3
Merge: e8b2f57 09cc5aa
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Wed Dec 8 14:59:32 2021 +0100

    Merge pull request TandoorRecipes#1119 from TandoorRecipes/user_prefs_fix

    fix package.json

commit 09cc5aa
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:38:03 2021 -0600

    fix package.json
smilerz added a commit that referenced this issue Dec 28, 2021
commit 7837467
Merge: aaaae5b 8475938
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Dec 18 23:14:24 2021 +0100

    Merge pull request #1146 from auanasgheps/patch-1

    Add documentation about swag by linuxserver

commit 8475938
Author: Oliver Cervera <cervera93-19@yahoo.it>
Date:   Sat Dec 18 13:49:09 2021 +0100

    Add documentation about swag by linuxserver

    Documents behaviour in #959

commit aaaae5b
Merge: 4a747f5 ea62c10
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Thu Dec 16 18:10:48 2021 +0100

    Merge pull request #1143 from smilerz/fix_get_facet_api

    fix bug in get_facet_api

commit ea62c10
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:20:56 2021 -0600

    remove console message

commit 3516505
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:08:32 2021 -0600

    fix bug in get_facet_api
smilerz added a commit to smilerz/recipes that referenced this issue Jan 6, 2022
commit 75b45ba
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 15:26:31 2021 -0600

    Squashed commit of the following:

    commit 7837467
    Merge: aaaae5b 8475938
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Sat Dec 18 23:14:24 2021 +0100

        Merge pull request TandoorRecipes#1146 from auanasgheps/patch-1

        Add documentation about swag by linuxserver

    commit 8475938
    Author: Oliver Cervera <cervera93-19@yahoo.it>
    Date:   Sat Dec 18 13:49:09 2021 +0100

        Add documentation about swag by linuxserver

        Documents behaviour in TandoorRecipes#959

    commit aaaae5b
    Merge: 4a747f5 ea62c10
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Thu Dec 16 18:10:48 2021 +0100

        Merge pull request TandoorRecipes#1143 from smilerz/fix_get_facet_api

        fix bug in get_facet_api

    commit ea62c10
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:20:56 2021 -0600

        remove console message

    commit 3516505
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:08:32 2021 -0600

        fix bug in get_facet_api

commit bf9e59d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 14:59:56 2021 -0600

    fix Shopping Modal to filter onhand from initial list

commit 132c48a
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 12:27:25 2021 -0600

    fix shopping list api

commit d4553c0
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 08:13:10 2021 -0600

    fix get_facets_API

commit edc670e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 16:59:33 2021 -0600

    filter fields available to inherit in space settings

commit a313039
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 15:48:55 2021 -0600

    fix after rebase

commit 963dad3
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 14:42:12 2021 -0600

    fix rounding on new shopping list

commit 8f19ab6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:29:08 2021 -0600

    Update settings.py

commit 0e20f67
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:23:22 2021 -0600

    fix post_save signal for sqlite

commit 46b83c8
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 12:33:25 2021 -0600

    delete yarn lock

commit 8b28a47
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 09:39:20 2021 -0600

    rebase and fixes

commit e7e3a30
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 07:24:12 2021 -0600

    test shoppingFood API

commit ea7d34c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 11:29:54 2021 -0600

    test userpreference food_inherit defaults

commit 7e081d4
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 07:54:45 2021 -0600

    test rest food inheritance

commit 2edb455
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 17:34:57 2021 -0600

    pytest shopping user preferences

commit c32a96f
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 15:06:04 2021 -0600

    update

commit 6d1476b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 10:30:53 2021 -0600

    pytest edit shopping list recipes

commit 5d79e4d
Author: smilerz <smilerz@gmail.com>
Date:   Sun Dec 12 10:39:01 2021 -0600

    pytest shopping list from recipe methods

commit 0866d21
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 16:41:20 2021 -0600

    test recent shopping list

commit 6448c06
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 11:09:11 2021 -0600

    test shopping list sharing

commit b146e75
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 09:01:20 2021 -0600

    basic tests with new factories

commit 68927d1
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 16:31:01 2021 -0600

    fixed userpref serializer

commit 1e36e6c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:25:32 2021 -0600

    WIP

commit 4877d69
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 09:02:18 2021 -0600

    fix package.json

commit f2f187a
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 12:16:28 2021 -0600

    minor cleanup

commit c2e84c1
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 09:50:01 2021 -0600

    visual indicator meal plan in shopping

commit ca93920
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 08:19:41 2021 -0600

    copy shopping as markdown

commit 903a721
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 16:33:14 2021 -0600

    download as CSV

commit 44e513f
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 14:33:13 2021 -0600

    fix after rebase

commit 2d7d160
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 12:04:27 2021 -0600

    download shopping list PDF

commit 54ca8b2
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 08:53:06 2021 -0600

    refresh shopping list when item is delayed

commit a972a75
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 13:13:01 2021 -0600

    WIP

commit 7c0d123
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 11:37:29 2021 -0600

    Fix after rebase

commit 09b0dcb
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 10:38:13 2021 -0600

    pre-merge

commit 5b4867d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 09:16:47 2021 -0600

    undo move

commit d3d4c21
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 11:11:51 2021 -0600

    yarn build

commit 6cffee5
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 10:59:11 2021 -0600

    Fix after rebase

commit 286595e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 09:02:20 2021 -0600

    WIP

commit 0d1c55d
Author: smilerz <smilerz@gmail.com>
Date:   Fri Nov 5 12:01:36 2021 -0500

    RecipeFactory and all related models

commit fd8ca2e
Author: smilerz <smilerz@gmail.com>
Date:   Thu Nov 4 16:00:45 2021 -0500

    food inherit tests

commit 9ef4c88
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 21:39:17 2021 -0500

    finish refactoring test_api_food to use factoryboy

commit 08d3c40
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 13:43:41 2021 -0500

    refactor Food tests to use factory_boy fixture factories

commit e229a70
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 16:34:53 2021 -0500

    more fixes after rebase

commit 06b7ba8
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:43:10 2021 -0500

    minor updates

commit 099a542
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:45 2021 -0500

    update migrations

commit 5a9543b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:19 2021 -0500

    Fix after rebase

commit 60d7e63
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 15:18:00 2021 -0500

    add to shopping from card context menu

commit 867e2d4
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 13:33:15 2021 -0500

    add new unit/food from shopping list

commit 757fa5e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 11:18:36 2021 -0500

    edit supermarket categories

commit 8b682c3
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 20:40:56 2021 -0500

    related recipes included when adding mealplan to shopping list

commit 27f358d
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 12:05:29 2021 -0500

    fix apis

commit 7c6a7ef
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 27 11:51:14 2021 -0500

    alpha shopping list

commit 4c50675
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 21:58:06 2021 -0500

    autosync

commit b84d77b
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 19:56:44 2021 -0500

    WIP

commit 247dd30
Author: smilerz <smilerz@gmail.com>
Date:   Mon Oct 25 11:55:36 2021 -0500

    fade-enter-active

commit 5e4e203
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 21 17:44:45 2021 -0500

    shopping line item

commit 79b6d48
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 13:14:22 2021 -0500

    inheritance works with object moves

commit 6075ce5
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 08:35:33 2021 -0500

    food inherit attributes

commit 2ca7722
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 14:44:42 2021 -0500

    Fix after rebase

commit 7a9e5b1
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 13:32:27 2021 -0500

    getUserPreference available for all UserPreferences

commit 7f87a9e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 13 07:42:59 2021 -0500

    Fix after rebase

commit 3d674cf
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 7 12:35:46 2021 -0500

    model changes and GenericAutoSchema

commit 1642224
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 2 12:47:59 2021 -0500

    model migrations

commit 3d359f8
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 15:59:21 2021 -0500

    WIP

commit 94c6927
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 14:20:41 2021 -0500

    WIP

commit 9827c3f
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 07:35:30 2021 -0500

    Fix after rebase

commit 4a747f5
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 18:02:37 2021 +0100

    Revert "Revert "fixed vue build""

    This reverts commit edde015.

commit 0623a8e
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:59:22 2021 +0100

    clear package cache in build

commit 5941022
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:46:01 2021 +0100

    fixed markdown table extension

commit 2559905
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:45:53 2021 +0100

    fixed empty fields breaking recipe update

commit edde015
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:26:06 2021 +0100

    Revert "fixed vue build"

    This reverts commit 7e07508.

commit 9b7b8be
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:22:24 2021 +0100

    addeed yarn lock

commit 2eae8e5
Merge: 4118c8d 6d8bc39
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:35:09 2021 +0100

    Merge pull request TandoorRecipes#1141 from TandoorRecipes/dependabot/pip/django-3.2.10

    Bump django from 3.2.9 to 3.2.10

commit 6d8bc39
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Dec 14 15:33:48 2021 +0000

    Bump django from 3.2.9 to 3.2.10

    Bumps [django](https://github.com/django/django) from 3.2.9 to 3.2.10.
    - [Release notes](https://github.com/django/django/releases)
    - [Commits](django/django@3.2.9...3.2.10)

    ---
    updated-dependencies:
    - dependency-name: django
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 4118c8d
Merge: 01510f3 78c2eac
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:27:23 2021 +0100

    Merge pull request TandoorRecipes#1138 from TandoorRecipes/dependabot/pip/lxml-4.6.5

    Bump lxml from 4.6.4 to 4.6.5

commit 78c2eac
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Dec 13 20:26:37 2021 +0000

    Bump lxml from 4.6.4 to 4.6.5

    Bumps [lxml](https://github.com/lxml/lxml) from 4.6.4 to 4.6.5.
    - [Release notes](https://github.com/lxml/lxml/releases)
    - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
    - [Commits](lxml/lxml@lxml-4.6.4...lxml-4.6.5)

    ---
    updated-dependencies:
    - dependency-name: lxml
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 01510f3
Merge: e8b2f57 09cc5aa
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Wed Dec 8 14:59:32 2021 +0100

    Merge pull request TandoorRecipes#1119 from TandoorRecipes/user_prefs_fix

    fix package.json

commit 09cc5aa
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:38:03 2021 -0600

    fix package.json
smilerz added a commit to smilerz/recipes that referenced this issue Jan 6, 2022
commit 421ade7
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 13:53:40 2021 -0600

    WIP

commit c785b59
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 13:53:16 2021 -0600

    fix filter_to_supermarket setting

commit 4213256
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 13:40:50 2021 -0600

    fix categories in supermarket edit modal

commit dfe4149
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 11:35:35 2021 -0600

    fix add to shopping from MealPlan Modal

commit ee52092
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 11:05:24 2021 -0600

    delete supermarkets and categories from shopping list view

commit 75b45ba
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 15:26:31 2021 -0600

    Squashed commit of the following:

    commit 7837467
    Merge: aaaae5b 8475938
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Sat Dec 18 23:14:24 2021 +0100

        Merge pull request TandoorRecipes#1146 from auanasgheps/patch-1

        Add documentation about swag by linuxserver

    commit 8475938
    Author: Oliver Cervera <cervera93-19@yahoo.it>
    Date:   Sat Dec 18 13:49:09 2021 +0100

        Add documentation about swag by linuxserver

        Documents behaviour in TandoorRecipes#959

    commit aaaae5b
    Merge: 4a747f5 ea62c10
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Thu Dec 16 18:10:48 2021 +0100

        Merge pull request TandoorRecipes#1143 from smilerz/fix_get_facet_api

        fix bug in get_facet_api

    commit ea62c10
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:20:56 2021 -0600

        remove console message

    commit 3516505
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:08:32 2021 -0600

        fix bug in get_facet_api

commit bf9e59d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 14:59:56 2021 -0600

    fix Shopping Modal to filter onhand from initial list

commit 132c48a
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 12:27:25 2021 -0600

    fix shopping list api

commit d4553c0
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 08:13:10 2021 -0600

    fix get_facets_API

commit edc670e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 16:59:33 2021 -0600

    filter fields available to inherit in space settings

commit a313039
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 15:48:55 2021 -0600

    fix after rebase

commit 963dad3
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 14:42:12 2021 -0600

    fix rounding on new shopping list

commit 8f19ab6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:29:08 2021 -0600

    Update settings.py

commit 0e20f67
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:23:22 2021 -0600

    fix post_save signal for sqlite

commit 46b83c8
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 12:33:25 2021 -0600

    delete yarn lock

commit 8b28a47
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 09:39:20 2021 -0600

    rebase and fixes

commit e7e3a30
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 07:24:12 2021 -0600

    test shoppingFood API

commit ea7d34c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 11:29:54 2021 -0600

    test userpreference food_inherit defaults

commit 7e081d4
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 07:54:45 2021 -0600

    test rest food inheritance

commit 2edb455
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 17:34:57 2021 -0600

    pytest shopping user preferences

commit c32a96f
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 15:06:04 2021 -0600

    update

commit 6d1476b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 10:30:53 2021 -0600

    pytest edit shopping list recipes

commit 5d79e4d
Author: smilerz <smilerz@gmail.com>
Date:   Sun Dec 12 10:39:01 2021 -0600

    pytest shopping list from recipe methods

commit 0866d21
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 16:41:20 2021 -0600

    test recent shopping list

commit 6448c06
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 11:09:11 2021 -0600

    test shopping list sharing

commit b146e75
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 09:01:20 2021 -0600

    basic tests with new factories

commit 68927d1
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 16:31:01 2021 -0600

    fixed userpref serializer

commit 1e36e6c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:25:32 2021 -0600

    WIP

commit 4877d69
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 09:02:18 2021 -0600

    fix package.json

commit f2f187a
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 12:16:28 2021 -0600

    minor cleanup

commit c2e84c1
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 09:50:01 2021 -0600

    visual indicator meal plan in shopping

commit ca93920
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 08:19:41 2021 -0600

    copy shopping as markdown

commit 903a721
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 16:33:14 2021 -0600

    download as CSV

commit 44e513f
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 14:33:13 2021 -0600

    fix after rebase

commit 2d7d160
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 12:04:27 2021 -0600

    download shopping list PDF

commit 54ca8b2
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 08:53:06 2021 -0600

    refresh shopping list when item is delayed

commit a972a75
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 13:13:01 2021 -0600

    WIP

commit 7c0d123
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 11:37:29 2021 -0600

    Fix after rebase

commit 09b0dcb
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 10:38:13 2021 -0600

    pre-merge

commit 5b4867d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 09:16:47 2021 -0600

    undo move

commit d3d4c21
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 11:11:51 2021 -0600

    yarn build

commit 6cffee5
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 10:59:11 2021 -0600

    Fix after rebase

commit 286595e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 09:02:20 2021 -0600

    WIP

commit 0d1c55d
Author: smilerz <smilerz@gmail.com>
Date:   Fri Nov 5 12:01:36 2021 -0500

    RecipeFactory and all related models

commit fd8ca2e
Author: smilerz <smilerz@gmail.com>
Date:   Thu Nov 4 16:00:45 2021 -0500

    food inherit tests

commit 9ef4c88
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 21:39:17 2021 -0500

    finish refactoring test_api_food to use factoryboy

commit 08d3c40
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 13:43:41 2021 -0500

    refactor Food tests to use factory_boy fixture factories

commit e229a70
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 16:34:53 2021 -0500

    more fixes after rebase

commit 06b7ba8
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:43:10 2021 -0500

    minor updates

commit 099a542
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:45 2021 -0500

    update migrations

commit 5a9543b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:19 2021 -0500

    Fix after rebase

commit 60d7e63
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 15:18:00 2021 -0500

    add to shopping from card context menu

commit 867e2d4
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 13:33:15 2021 -0500

    add new unit/food from shopping list

commit 757fa5e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 11:18:36 2021 -0500

    edit supermarket categories

commit 8b682c3
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 20:40:56 2021 -0500

    related recipes included when adding mealplan to shopping list

commit 27f358d
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 12:05:29 2021 -0500

    fix apis

commit 7c6a7ef
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 27 11:51:14 2021 -0500

    alpha shopping list

commit 4c50675
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 21:58:06 2021 -0500

    autosync

commit b84d77b
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 19:56:44 2021 -0500

    WIP

commit 247dd30
Author: smilerz <smilerz@gmail.com>
Date:   Mon Oct 25 11:55:36 2021 -0500

    fade-enter-active

commit 5e4e203
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 21 17:44:45 2021 -0500

    shopping line item

commit 79b6d48
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 13:14:22 2021 -0500

    inheritance works with object moves

commit 6075ce5
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 08:35:33 2021 -0500

    food inherit attributes

commit 2ca7722
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 14:44:42 2021 -0500

    Fix after rebase

commit 7a9e5b1
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 13:32:27 2021 -0500

    getUserPreference available for all UserPreferences

commit 7f87a9e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 13 07:42:59 2021 -0500

    Fix after rebase

commit 3d674cf
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 7 12:35:46 2021 -0500

    model changes and GenericAutoSchema

commit 1642224
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 2 12:47:59 2021 -0500

    model migrations

commit 3d359f8
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 15:59:21 2021 -0500

    WIP

commit 94c6927
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 14:20:41 2021 -0500

    WIP

commit 9827c3f
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 07:35:30 2021 -0500

    Fix after rebase

commit 4a747f5
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 18:02:37 2021 +0100

    Revert "Revert "fixed vue build""

    This reverts commit edde015.

commit 0623a8e
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:59:22 2021 +0100

    clear package cache in build

commit 5941022
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:46:01 2021 +0100

    fixed markdown table extension

commit 2559905
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:45:53 2021 +0100

    fixed empty fields breaking recipe update

commit edde015
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:26:06 2021 +0100

    Revert "fixed vue build"

    This reverts commit 7e07508.

commit 9b7b8be
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:22:24 2021 +0100

    addeed yarn lock

commit 2eae8e5
Merge: 4118c8d 6d8bc39
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:35:09 2021 +0100

    Merge pull request TandoorRecipes#1141 from TandoorRecipes/dependabot/pip/django-3.2.10

    Bump django from 3.2.9 to 3.2.10

commit 6d8bc39
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Dec 14 15:33:48 2021 +0000

    Bump django from 3.2.9 to 3.2.10

    Bumps [django](https://github.com/django/django) from 3.2.9 to 3.2.10.
    - [Release notes](https://github.com/django/django/releases)
    - [Commits](django/django@3.2.9...3.2.10)

    ---
    updated-dependencies:
    - dependency-name: django
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 4118c8d
Merge: 01510f3 78c2eac
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:27:23 2021 +0100

    Merge pull request TandoorRecipes#1138 from TandoorRecipes/dependabot/pip/lxml-4.6.5

    Bump lxml from 4.6.4 to 4.6.5

commit 78c2eac
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Dec 13 20:26:37 2021 +0000

    Bump lxml from 4.6.4 to 4.6.5

    Bumps [lxml](https://github.com/lxml/lxml) from 4.6.4 to 4.6.5.
    - [Release notes](https://github.com/lxml/lxml/releases)
    - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
    - [Commits](lxml/lxml@lxml-4.6.4...lxml-4.6.5)

    ---
    updated-dependencies:
    - dependency-name: lxml
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 01510f3
Merge: e8b2f57 09cc5aa
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Wed Dec 8 14:59:32 2021 +0100

    Merge pull request TandoorRecipes#1119 from TandoorRecipes/user_prefs_fix

    fix package.json

commit 09cc5aa
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:38:03 2021 -0600

    fix package.json
smilerz added a commit to smilerz/recipes that referenced this issue Jan 7, 2022
commit 75b45ba
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 15:26:31 2021 -0600

    Squashed commit of the following:

    commit 7837467
    Merge: aaaae5b 8475938
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Sat Dec 18 23:14:24 2021 +0100

        Merge pull request TandoorRecipes#1146 from auanasgheps/patch-1

        Add documentation about swag by linuxserver

    commit 8475938
    Author: Oliver Cervera <cervera93-19@yahoo.it>
    Date:   Sat Dec 18 13:49:09 2021 +0100

        Add documentation about swag by linuxserver

        Documents behaviour in TandoorRecipes#959

    commit aaaae5b
    Merge: 4a747f5 ea62c10
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Thu Dec 16 18:10:48 2021 +0100

        Merge pull request TandoorRecipes#1143 from smilerz/fix_get_facet_api

        fix bug in get_facet_api

    commit ea62c10
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:20:56 2021 -0600

        remove console message

    commit 3516505
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:08:32 2021 -0600

        fix bug in get_facet_api

commit bf9e59d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 14:59:56 2021 -0600

    fix Shopping Modal to filter onhand from initial list

commit 132c48a
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 12:27:25 2021 -0600

    fix shopping list api

commit d4553c0
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 08:13:10 2021 -0600

    fix get_facets_API

commit edc670e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 16:59:33 2021 -0600

    filter fields available to inherit in space settings

commit a313039
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 15:48:55 2021 -0600

    fix after rebase

commit 963dad3
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 14:42:12 2021 -0600

    fix rounding on new shopping list

commit 8f19ab6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:29:08 2021 -0600

    Update settings.py

commit 0e20f67
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:23:22 2021 -0600

    fix post_save signal for sqlite

commit 46b83c8
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 12:33:25 2021 -0600

    delete yarn lock

commit 8b28a47
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 09:39:20 2021 -0600

    rebase and fixes

commit e7e3a30
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 07:24:12 2021 -0600

    test shoppingFood API

commit ea7d34c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 11:29:54 2021 -0600

    test userpreference food_inherit defaults

commit 7e081d4
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 07:54:45 2021 -0600

    test rest food inheritance

commit 2edb455
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 17:34:57 2021 -0600

    pytest shopping user preferences

commit c32a96f
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 15:06:04 2021 -0600

    update

commit 6d1476b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 10:30:53 2021 -0600

    pytest edit shopping list recipes

commit 5d79e4d
Author: smilerz <smilerz@gmail.com>
Date:   Sun Dec 12 10:39:01 2021 -0600

    pytest shopping list from recipe methods

commit 0866d21
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 16:41:20 2021 -0600

    test recent shopping list

commit 6448c06
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 11:09:11 2021 -0600

    test shopping list sharing

commit b146e75
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 09:01:20 2021 -0600

    basic tests with new factories

commit 68927d1
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 16:31:01 2021 -0600

    fixed userpref serializer

commit 1e36e6c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:25:32 2021 -0600

    WIP

commit 4877d69
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 09:02:18 2021 -0600

    fix package.json

commit f2f187a
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 12:16:28 2021 -0600

    minor cleanup

commit c2e84c1
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 09:50:01 2021 -0600

    visual indicator meal plan in shopping

commit ca93920
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 08:19:41 2021 -0600

    copy shopping as markdown

commit 903a721
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 16:33:14 2021 -0600

    download as CSV

commit 44e513f
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 14:33:13 2021 -0600

    fix after rebase

commit 2d7d160
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 12:04:27 2021 -0600

    download shopping list PDF

commit 54ca8b2
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 08:53:06 2021 -0600

    refresh shopping list when item is delayed

commit a972a75
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 13:13:01 2021 -0600

    WIP

commit 7c0d123
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 11:37:29 2021 -0600

    Fix after rebase

commit 09b0dcb
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 10:38:13 2021 -0600

    pre-merge

commit 5b4867d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 09:16:47 2021 -0600

    undo move

commit d3d4c21
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 11:11:51 2021 -0600

    yarn build

commit 6cffee5
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 10:59:11 2021 -0600

    Fix after rebase

commit 286595e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 09:02:20 2021 -0600

    WIP

commit 0d1c55d
Author: smilerz <smilerz@gmail.com>
Date:   Fri Nov 5 12:01:36 2021 -0500

    RecipeFactory and all related models

commit fd8ca2e
Author: smilerz <smilerz@gmail.com>
Date:   Thu Nov 4 16:00:45 2021 -0500

    food inherit tests

commit 9ef4c88
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 21:39:17 2021 -0500

    finish refactoring test_api_food to use factoryboy

commit 08d3c40
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 13:43:41 2021 -0500

    refactor Food tests to use factory_boy fixture factories

commit e229a70
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 16:34:53 2021 -0500

    more fixes after rebase

commit 06b7ba8
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:43:10 2021 -0500

    minor updates

commit 099a542
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:45 2021 -0500

    update migrations

commit 5a9543b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:19 2021 -0500

    Fix after rebase

commit 60d7e63
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 15:18:00 2021 -0500

    add to shopping from card context menu

commit 867e2d4
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 13:33:15 2021 -0500

    add new unit/food from shopping list

commit 757fa5e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 11:18:36 2021 -0500

    edit supermarket categories

commit 8b682c3
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 20:40:56 2021 -0500

    related recipes included when adding mealplan to shopping list

commit 27f358d
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 12:05:29 2021 -0500

    fix apis

commit 7c6a7ef
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 27 11:51:14 2021 -0500

    alpha shopping list

commit 4c50675
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 21:58:06 2021 -0500

    autosync

commit b84d77b
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 19:56:44 2021 -0500

    WIP

commit 247dd30
Author: smilerz <smilerz@gmail.com>
Date:   Mon Oct 25 11:55:36 2021 -0500

    fade-enter-active

commit 5e4e203
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 21 17:44:45 2021 -0500

    shopping line item

commit 79b6d48
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 13:14:22 2021 -0500

    inheritance works with object moves

commit 6075ce5
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 08:35:33 2021 -0500

    food inherit attributes

commit 2ca7722
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 14:44:42 2021 -0500

    Fix after rebase

commit 7a9e5b1
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 13:32:27 2021 -0500

    getUserPreference available for all UserPreferences

commit 7f87a9e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 13 07:42:59 2021 -0500

    Fix after rebase

commit 3d674cf
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 7 12:35:46 2021 -0500

    model changes and GenericAutoSchema

commit 1642224
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 2 12:47:59 2021 -0500

    model migrations

commit 3d359f8
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 15:59:21 2021 -0500

    WIP

commit 94c6927
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 14:20:41 2021 -0500

    WIP

commit 9827c3f
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 07:35:30 2021 -0500

    Fix after rebase

commit 4a747f5
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 18:02:37 2021 +0100

    Revert "Revert "fixed vue build""

    This reverts commit edde015.

commit 0623a8e
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:59:22 2021 +0100

    clear package cache in build

commit 5941022
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:46:01 2021 +0100

    fixed markdown table extension

commit 2559905
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:45:53 2021 +0100

    fixed empty fields breaking recipe update

commit edde015
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:26:06 2021 +0100

    Revert "fixed vue build"

    This reverts commit 7e07508.

commit 9b7b8be
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:22:24 2021 +0100

    addeed yarn lock

commit 2eae8e5
Merge: 4118c8d 6d8bc39
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:35:09 2021 +0100

    Merge pull request TandoorRecipes#1141 from TandoorRecipes/dependabot/pip/django-3.2.10

    Bump django from 3.2.9 to 3.2.10

commit 6d8bc39
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Dec 14 15:33:48 2021 +0000

    Bump django from 3.2.9 to 3.2.10

    Bumps [django](https://github.com/django/django) from 3.2.9 to 3.2.10.
    - [Release notes](https://github.com/django/django/releases)
    - [Commits](django/django@3.2.9...3.2.10)

    ---
    updated-dependencies:
    - dependency-name: django
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 4118c8d
Merge: 01510f3 78c2eac
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:27:23 2021 +0100

    Merge pull request TandoorRecipes#1138 from TandoorRecipes/dependabot/pip/lxml-4.6.5

    Bump lxml from 4.6.4 to 4.6.5

commit 78c2eac
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Dec 13 20:26:37 2021 +0000

    Bump lxml from 4.6.4 to 4.6.5

    Bumps [lxml](https://github.com/lxml/lxml) from 4.6.4 to 4.6.5.
    - [Release notes](https://github.com/lxml/lxml/releases)
    - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
    - [Commits](lxml/lxml@lxml-4.6.4...lxml-4.6.5)

    ---
    updated-dependencies:
    - dependency-name: lxml
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 01510f3
Merge: e8b2f57 09cc5aa
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Wed Dec 8 14:59:32 2021 +0100

    Merge pull request TandoorRecipes#1119 from TandoorRecipes/user_prefs_fix

    fix package.json

commit 09cc5aa
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:38:03 2021 -0600

    fix package.json
smilerz added a commit to smilerz/recipes that referenced this issue Jan 7, 2022
commit 421ade7
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 13:53:40 2021 -0600

    WIP

commit c785b59
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 13:53:16 2021 -0600

    fix filter_to_supermarket setting

commit 4213256
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 13:40:50 2021 -0600

    fix categories in supermarket edit modal

commit dfe4149
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 11:35:35 2021 -0600

    fix add to shopping from MealPlan Modal

commit ee52092
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 21 11:05:24 2021 -0600

    delete supermarkets and categories from shopping list view

commit 75b45ba
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 15:26:31 2021 -0600

    Squashed commit of the following:

    commit 7837467
    Merge: aaaae5b 8475938
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Sat Dec 18 23:14:24 2021 +0100

        Merge pull request TandoorRecipes#1146 from auanasgheps/patch-1

        Add documentation about swag by linuxserver

    commit 8475938
    Author: Oliver Cervera <cervera93-19@yahoo.it>
    Date:   Sat Dec 18 13:49:09 2021 +0100

        Add documentation about swag by linuxserver

        Documents behaviour in TandoorRecipes#959

    commit aaaae5b
    Merge: 4a747f5 ea62c10
    Author: vabene1111 <vabene1111@users.noreply.github.com>
    Date:   Thu Dec 16 18:10:48 2021 +0100

        Merge pull request TandoorRecipes#1143 from smilerz/fix_get_facet_api

        fix bug in get_facet_api

    commit ea62c10
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:20:56 2021 -0600

        remove console message

    commit 3516505
    Author: smilerz <smilerz@gmail.com>
    Date:   Thu Dec 16 09:08:32 2021 -0600

        fix bug in get_facet_api

commit bf9e59d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 14:59:56 2021 -0600

    fix Shopping Modal to filter onhand from initial list

commit 132c48a
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 20 12:27:25 2021 -0600

    fix shopping list api

commit d4553c0
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 08:13:10 2021 -0600

    fix get_facets_API

commit edc670e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 16:59:33 2021 -0600

    filter fields available to inherit in space settings

commit a313039
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 15:48:55 2021 -0600

    fix after rebase

commit 963dad3
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 14:42:12 2021 -0600

    fix rounding on new shopping list

commit 8f19ab6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:29:08 2021 -0600

    Update settings.py

commit 0e20f67
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 13:23:22 2021 -0600

    fix post_save signal for sqlite

commit 46b83c8
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 12:33:25 2021 -0600

    delete yarn lock

commit 8b28a47
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 09:39:20 2021 -0600

    rebase and fixes

commit e7e3a30
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 15 07:24:12 2021 -0600

    test shoppingFood API

commit ea7d34c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 11:29:54 2021 -0600

    test userpreference food_inherit defaults

commit 7e081d4
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 14 07:54:45 2021 -0600

    test rest food inheritance

commit 2edb455
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 17:34:57 2021 -0600

    pytest shopping user preferences

commit c32a96f
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 15:06:04 2021 -0600

    update

commit 6d1476b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Dec 13 10:30:53 2021 -0600

    pytest edit shopping list recipes

commit 5d79e4d
Author: smilerz <smilerz@gmail.com>
Date:   Sun Dec 12 10:39:01 2021 -0600

    pytest shopping list from recipe methods

commit 0866d21
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 16:41:20 2021 -0600

    test recent shopping list

commit 6448c06
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 11:09:11 2021 -0600

    test shopping list sharing

commit b146e75
Author: smilerz <smilerz@gmail.com>
Date:   Wed Dec 8 09:01:20 2021 -0600

    basic tests with new factories

commit 68927d1
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 16:31:01 2021 -0600

    fixed userpref serializer

commit 1e36e6c
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:25:32 2021 -0600

    WIP

commit 4877d69
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 09:02:18 2021 -0600

    fix package.json

commit f2f187a
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 12:16:28 2021 -0600

    minor cleanup

commit c2e84c1
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 09:50:01 2021 -0600

    visual indicator meal plan in shopping

commit ca93920
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 2 08:19:41 2021 -0600

    copy shopping as markdown

commit 903a721
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 16:33:14 2021 -0600

    download as CSV

commit 44e513f
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 14:33:13 2021 -0600

    fix after rebase

commit 2d7d160
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 12:04:27 2021 -0600

    download shopping list PDF

commit 54ca8b2
Author: smilerz <smilerz@gmail.com>
Date:   Tue Nov 30 08:53:06 2021 -0600

    refresh shopping list when item is delayed

commit a972a75
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 13:13:01 2021 -0600

    WIP

commit 7c0d123
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 11:37:29 2021 -0600

    Fix after rebase

commit 09b0dcb
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 10:38:13 2021 -0600

    pre-merge

commit 5b4867d
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 29 09:16:47 2021 -0600

    undo move

commit d3d4c21
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 11:11:51 2021 -0600

    yarn build

commit 6cffee5
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 10:59:11 2021 -0600

    Fix after rebase

commit 286595e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Nov 21 09:02:20 2021 -0600

    WIP

commit 0d1c55d
Author: smilerz <smilerz@gmail.com>
Date:   Fri Nov 5 12:01:36 2021 -0500

    RecipeFactory and all related models

commit fd8ca2e
Author: smilerz <smilerz@gmail.com>
Date:   Thu Nov 4 16:00:45 2021 -0500

    food inherit tests

commit 9ef4c88
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 21:39:17 2021 -0500

    finish refactoring test_api_food to use factoryboy

commit 08d3c40
Author: smilerz <smilerz@gmail.com>
Date:   Wed Nov 3 13:43:41 2021 -0500

    refactor Food tests to use factory_boy fixture factories

commit e229a70
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 16:34:53 2021 -0500

    more fixes after rebase

commit 06b7ba8
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:43:10 2021 -0500

    minor updates

commit 099a542
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:45 2021 -0500

    update migrations

commit 5a9543b
Author: smilerz <smilerz@gmail.com>
Date:   Mon Nov 1 12:32:19 2021 -0500

    Fix after rebase

commit 60d7e63
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 15:18:00 2021 -0500

    add to shopping from card context menu

commit 867e2d4
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 13:33:15 2021 -0500

    add new unit/food from shopping list

commit 757fa5e
Author: smilerz <smilerz@gmail.com>
Date:   Sun Oct 31 11:18:36 2021 -0500

    edit supermarket categories

commit 8b682c3
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 20:40:56 2021 -0500

    related recipes included when adding mealplan to shopping list

commit 27f358d
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 12:05:29 2021 -0500

    fix apis

commit 7c6a7ef
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 27 11:51:14 2021 -0500

    alpha shopping list

commit 4c50675
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 21:58:06 2021 -0500

    autosync

commit b84d77b
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 26 19:56:44 2021 -0500

    WIP

commit 247dd30
Author: smilerz <smilerz@gmail.com>
Date:   Mon Oct 25 11:55:36 2021 -0500

    fade-enter-active

commit 5e4e203
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 21 17:44:45 2021 -0500

    shopping line item

commit 79b6d48
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 13:14:22 2021 -0500

    inheritance works with object moves

commit 6075ce5
Author: smilerz <smilerz@gmail.com>
Date:   Tue Oct 19 08:35:33 2021 -0500

    food inherit attributes

commit 2ca7722
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 14:44:42 2021 -0500

    Fix after rebase

commit 7a9e5b1
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 16 13:32:27 2021 -0500

    getUserPreference available for all UserPreferences

commit 7f87a9e
Author: smilerz <smilerz@gmail.com>
Date:   Wed Oct 13 07:42:59 2021 -0500

    Fix after rebase

commit 3d674cf
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 7 12:35:46 2021 -0500

    model changes and GenericAutoSchema

commit 1642224
Author: smilerz <smilerz@gmail.com>
Date:   Sat Oct 2 12:47:59 2021 -0500

    model migrations

commit 3d359f8
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 15:59:21 2021 -0500

    WIP

commit 94c6927
Author: smilerz <smilerz@gmail.com>
Date:   Fri Oct 1 14:20:41 2021 -0500

    WIP

commit 9827c3f
Author: smilerz <smilerz@gmail.com>
Date:   Thu Oct 28 07:35:30 2021 -0500

    Fix after rebase

commit 4a747f5
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 18:02:37 2021 +0100

    Revert "Revert "fixed vue build""

    This reverts commit edde015.

commit 0623a8e
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:59:22 2021 +0100

    clear package cache in build

commit 5941022
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:46:01 2021 +0100

    fixed markdown table extension

commit 2559905
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:45:53 2021 +0100

    fixed empty fields breaking recipe update

commit edde015
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:26:06 2021 +0100

    Revert "fixed vue build"

    This reverts commit 7e07508.

commit 9b7b8be
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Wed Dec 15 17:22:24 2021 +0100

    addeed yarn lock

commit 2eae8e5
Merge: 4118c8d 6d8bc39
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:35:09 2021 +0100

    Merge pull request TandoorRecipes#1141 from TandoorRecipes/dependabot/pip/django-3.2.10

    Bump django from 3.2.9 to 3.2.10

commit 6d8bc39
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Dec 14 15:33:48 2021 +0000

    Bump django from 3.2.9 to 3.2.10

    Bumps [django](https://github.com/django/django) from 3.2.9 to 3.2.10.
    - [Release notes](https://github.com/django/django/releases)
    - [Commits](django/django@3.2.9...3.2.10)

    ---
    updated-dependencies:
    - dependency-name: django
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 4118c8d
Merge: 01510f3 78c2eac
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Tue Dec 14 16:27:23 2021 +0100

    Merge pull request TandoorRecipes#1138 from TandoorRecipes/dependabot/pip/lxml-4.6.5

    Bump lxml from 4.6.4 to 4.6.5

commit 78c2eac
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Dec 13 20:26:37 2021 +0000

    Bump lxml from 4.6.4 to 4.6.5

    Bumps [lxml](https://github.com/lxml/lxml) from 4.6.4 to 4.6.5.
    - [Release notes](https://github.com/lxml/lxml/releases)
    - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
    - [Commits](lxml/lxml@lxml-4.6.4...lxml-4.6.5)

    ---
    updated-dependencies:
    - dependency-name: lxml
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 01510f3
Merge: e8b2f57 09cc5aa
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Wed Dec 8 14:59:32 2021 +0100

    Merge pull request TandoorRecipes#1119 from TandoorRecipes/user_prefs_fix

    fix package.json

commit 09cc5aa
Author: smilerz <smilerz@gmail.com>
Date:   Tue Dec 7 15:38:03 2021 -0600

    fix package.json
@Nabukodonosor
Copy link

This works for me, but it doesn't load recipe images. Anyone knows why?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
setup issue possibly or definitely an issue with the user setup
Projects
None yet
Development

No branches or pull requests

5 participants