Merge branch 'develop' into 3003.1

latenighttales · Apr 23, 2021 · 96e678f · 96e678f
2 parents 7c1fc3c + 85aba13
commit 96e678f
Show file tree

Hide file tree

Showing 60 changed files with 3,317 additions and 2,844 deletions.
diff --git a/.github/workflows/build-statics.yml b/.github/workflows/build-statics.yml
diff --git a/README.md b/README.md
@@ -85,6 +85,13 @@ More [here](https://github.com/latenighttales/alcali/blob/2019.2/docs/docs/scree
 
 If you'd like to contribute, check the [contribute](https://alcali.dev/contribute/) documentation on how to install a dev environment and submit PR!
 
+And if you like this project, consider donating:
+
+via GitHub Sponsors, or
+
+[![ko-fi](https://www.ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/J3J3173F6)
+
+
 ## Changelog
 
 ## [3000.1.0] - 2020-04-26

diff --git a/api/models.py b/api/models.py
@@ -162,12 +162,15 @@ def conformity(self):
         if not last_highstate:
             return None
         highstate_ret = last_highstate.loaded_ret()
-        for state in highstate_ret["return"]:
-            # Flat out error(return is a string)
-            if isinstance(highstate_ret["return"], list):
-                return False
+
+        # Flat out error(return is a string)
+        return_item = highstate_ret.get("return")
+        if not return_item or isinstance(return_item, list):
+            return False
+
+        for state in return_item:
             # One of the state is not ok
-            if not highstate_ret["return"][state]["result"]:
+            if not return_item.get(state, {}).get("result"):
                 return False
         return True
 

diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>ALCALI</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link href="https://fonts.googleapis.com/css?family=Material+Icons" rel=stylesheet><link href=/static/css/app.ef41b39d.css rel=preload as=style><link href=/static/css/chunk-vendors.e3234c14.css rel=preload as=style><link href=/static/js/app.a8637cac.js rel=preload as=script><link href=/static/js/chunk-vendors.8941a7de.js rel=preload as=script><link href=/static/css/chunk-vendors.e3234c14.css rel=stylesheet><link href=/static/css/app.ef41b39d.css rel=stylesheet></head><body><noscript><strong>We're sorry but my-app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.8941a7de.js></script><script src=/static/js/app.a8637cac.js></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/static/favicon.ico"><title>ALCALI</title><link href="/static/css/app.e48f97d5.css" rel="preload" as="style"><link href="/static/css/chunk-vendors.4aaa8472.css" rel="preload" as="style"><link href="/static/js/app.d84ba841.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.2dd87d26.js" rel="preload" as="script"><link href="/static/css/chunk-vendors.4aaa8472.css" rel="stylesheet"><link href="/static/css/app.e48f97d5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but my-app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.2dd87d26.js"></script><script src="/static/js/app.d84ba841.js"></script></body></html>
diff --git a/dist/static/css/app.e48f97d5.css b/dist/static/css/app.e48f97d5.css
diff --git a/dist/static/css/app.ef41b39d.css b/dist/static/css/app.ef41b39d.css
diff --git a/dist/static/css/chunk-vendors.4aaa8472.css b/dist/static/css/chunk-vendors.4aaa8472.css
diff --git a/dist/static/css/chunk-vendors.e3234c14.css b/dist/static/css/chunk-vendors.e3234c14.css
diff --git a/dist/static/fonts/MaterialIcons-Regular.0509ab09.woff2 b/dist/static/fonts/MaterialIcons-Regular.0509ab09.woff2
diff --git a/dist/static/fonts/MaterialIcons-Regular.29b882f0.woff b/dist/static/fonts/MaterialIcons-Regular.29b882f0.woff
diff --git a/dist/static/fonts/MaterialIcons-Regular.96c47680.eot b/dist/static/fonts/MaterialIcons-Regular.96c47680.eot
diff --git a/dist/static/fonts/MaterialIcons-Regular.da4ea5cd.ttf b/dist/static/fonts/MaterialIcons-Regular.da4ea5cd.ttf
diff --git a/dist/static/fonts/roboto-latin-100.5cb7edfc.woff b/dist/static/fonts/roboto-latin-100.5cb7edfc.woff
diff --git a/dist/static/fonts/roboto-latin-100.7370c367.woff2 b/dist/static/fonts/roboto-latin-100.7370c367.woff2
diff --git a/dist/static/fonts/roboto-latin-100italic.f8b1df51.woff2 b/dist/static/fonts/roboto-latin-100italic.f8b1df51.woff2
diff --git a/dist/static/fonts/roboto-latin-100italic.f9e8e590.woff b/dist/static/fonts/roboto-latin-100italic.f9e8e590.woff
diff --git a/dist/static/fonts/roboto-latin-300.b00849e0.woff b/dist/static/fonts/roboto-latin-300.b00849e0.woff
diff --git a/dist/static/fonts/roboto-latin-300.ef7c6637.woff2 b/dist/static/fonts/roboto-latin-300.ef7c6637.woff2
diff --git a/dist/static/fonts/roboto-latin-300italic.14286f3b.woff2 b/dist/static/fonts/roboto-latin-300italic.14286f3b.woff2
diff --git a/dist/static/fonts/roboto-latin-300italic.4df32891.woff b/dist/static/fonts/roboto-latin-300italic.4df32891.woff
diff --git a/dist/static/fonts/roboto-latin-400.479970ff.woff2 b/dist/static/fonts/roboto-latin-400.479970ff.woff2
diff --git a/dist/static/fonts/roboto-latin-400.60fa3c06.woff b/dist/static/fonts/roboto-latin-400.60fa3c06.woff
diff --git a/dist/static/fonts/roboto-latin-400italic.51521a2a.woff2 b/dist/static/fonts/roboto-latin-400italic.51521a2a.woff2
diff --git a/dist/static/fonts/roboto-latin-400italic.fe65b833.woff b/dist/static/fonts/roboto-latin-400italic.fe65b833.woff
diff --git a/dist/static/fonts/roboto-latin-500.020c97dc.woff2 b/dist/static/fonts/roboto-latin-500.020c97dc.woff2
diff --git a/dist/static/fonts/roboto-latin-500.87284894.woff b/dist/static/fonts/roboto-latin-500.87284894.woff
diff --git a/dist/static/fonts/roboto-latin-500italic.288ad9c6.woff b/dist/static/fonts/roboto-latin-500italic.288ad9c6.woff
diff --git a/dist/static/fonts/roboto-latin-500italic.db4a2a23.woff2 b/dist/static/fonts/roboto-latin-500italic.db4a2a23.woff2
diff --git a/dist/static/fonts/roboto-latin-700.2735a3a6.woff2 b/dist/static/fonts/roboto-latin-700.2735a3a6.woff2
diff --git a/dist/static/fonts/roboto-latin-700.adcde98f.woff b/dist/static/fonts/roboto-latin-700.adcde98f.woff
diff --git a/dist/static/fonts/roboto-latin-700italic.81f57861.woff b/dist/static/fonts/roboto-latin-700italic.81f57861.woff
diff --git a/dist/static/fonts/roboto-latin-700italic.da0e7178.woff2 b/dist/static/fonts/roboto-latin-700italic.da0e7178.woff2
diff --git a/dist/static/fonts/roboto-latin-900.9b3766ef.woff2 b/dist/static/fonts/roboto-latin-900.9b3766ef.woff2
diff --git a/dist/static/fonts/roboto-latin-900.bb1e4dc6.woff b/dist/static/fonts/roboto-latin-900.bb1e4dc6.woff
diff --git a/dist/static/fonts/roboto-latin-900italic.28f91510.woff b/dist/static/fonts/roboto-latin-900italic.28f91510.woff
diff --git a/dist/static/fonts/roboto-latin-900italic.ebf6d164.woff2 b/dist/static/fonts/roboto-latin-900italic.ebf6d164.woff2
diff --git a/dist/static/js/app.a8637cac.js b/dist/static/js/app.a8637cac.js
diff --git a/dist/static/js/app.a8637cac.js.map b/dist/static/js/app.a8637cac.js.map
diff --git a/dist/static/js/app.d84ba841.js b/dist/static/js/app.d84ba841.js
diff --git a/dist/static/js/app.d84ba841.js.map b/dist/static/js/app.d84ba841.js.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>ALCALI</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link href="https://fonts.googleapis.com/css?family=Material+Icons" rel=stylesheet><link href=/static/css/app.ef41b39d.css rel=preload as=style><link href=/static/css/chunk-vendors.e3234c14.css rel=preload as=style><link href=/static/js/app.a8637cac.js rel=preload as=script><link href=/static/js/chunk-vendors.8941a7de.js rel=preload as=script><link href=/static/css/chunk-vendors.e3234c14.css rel=stylesheet><link href=/static/css/app.ef41b39d.css rel=stylesheet></head><body><noscript><strong>We're sorry but my-app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.8941a7de.js></script><script src=/static/js/app.a8637cac.js></script></body></html>
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/static/favicon.ico"><title>ALCALI</title><link href="/static/css/app.e48f97d5.css" rel="preload" as="style"><link href="/static/css/chunk-vendors.4aaa8472.css" rel="preload" as="style"><link href="/static/js/app.d84ba841.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.2dd87d26.js" rel="preload" as="script"><link href="/static/css/chunk-vendors.4aaa8472.css" rel="stylesheet"><link href="/static/css/app.e48f97d5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but my-app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.2dd87d26.js"></script><script src="/static/js/app.d84ba841.js"></script></body></html>