From 34aca21a0bb14ecfc59ab4e5e41f5a0e935e96d1 Mon Sep 17 00:00:00 2001
From: redfast00 <redfast00@gmail.com>
Date: Fri, 5 Apr 2019 23:10:12 +0200
Subject: [PATCH 1/3] Don't load over protocol-relative URI

---
 app/templates/order.html      | 4 ++--
 app/templates/order_edit.html | 6 +++---
 app/templates/orders.html     | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/templates/order.html b/app/templates/order.html
index 6637b1c..13eaa1c 100644
--- a/app/templates/order.html
+++ b/app/templates/order.html
@@ -123,13 +123,13 @@
 
 {% block styles %}
     {{ super() }}
-    <link href="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/css/select2.min.css" rel="stylesheet" />
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/css/select2.min.css" rel="stylesheet" />
     <link rel="stylesheet" href="{{ url_for('static', filename='css/select2-bootstrap.min.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/print.css') }}">
 {% endblock %}
 {% block scripts %}
     {{ super() }}
-    <script src="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/js/select2.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/js/select2.min.js"></script>
     <script type="text/javascript">
         var select = $('.select').select2({
             'sorter': function(results) {
diff --git a/app/templates/order_edit.html b/app/templates/order_edit.html
index 299ba11..d0981c3 100644
--- a/app/templates/order_edit.html
+++ b/app/templates/order_edit.html
@@ -59,13 +59,13 @@
 
 {% block styles -%}
     {{ super() }}
-    <link href="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0-rc.2/css/select2.min.css" rel="stylesheet" />
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0-rc.2/css/select2.min.css" rel="stylesheet" />
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap-datetimepicker.min.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/select2-bootstrap.min.css') }}">
 {%- endblock %}
 {% block scripts -%}
     {{ super() }}
-    <script src="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0-rc.2/js/select2.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0-rc.2/js/select2.min.js"></script>
     <script src="{{ url_for('static', filename='js/moment.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/bootstrap-datetimepicker.min.js') }}"></script>
     <script type="text/javascript">
@@ -76,4 +76,4 @@
             });
         }());
     </script>
-{%- endblock %}
\ No newline at end of file
+{%- endblock %}
diff --git a/app/templates/orders.html b/app/templates/orders.html
index ed5cf63..573198a 100644
--- a/app/templates/orders.html
+++ b/app/templates/orders.html
@@ -74,13 +74,13 @@
 
 {% block styles -%}
     {{ super() }}
-    <link href="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0-rc.2/css/select2.min.css" rel="stylesheet" />
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0-rc.2/css/select2.min.css" rel="stylesheet" />
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap-datetimepicker.min.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/select2-bootstrap.min.css') }}">
 {%- endblock %}
 {% block scripts -%}
     {{ super() }}
-    <script src="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0-rc.2/js/select2.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0-rc.2/js/select2.min.js"></script>
     <script src="{{ url_for('static', filename='js/moment.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/bootstrap-datetimepicker.min.js') }}"></script>
     <script type="text/javascript">
@@ -91,4 +91,4 @@
             });
         }());
     </script>
-{%- endblock %}
\ No newline at end of file
+{%- endblock %}

From b2c637b343434f171d4e25d94810c4afdb0eceb9 Mon Sep 17 00:00:00 2001
From: redfast00 <redfast00@gmail.com>
Date: Fri, 5 Apr 2019 23:26:57 +0200
Subject: [PATCH 2/3] Serve own bootstrap

---
 app/app.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/app.py b/app/app.py
index 4765a7c..bbeb0af 100644
--- a/app/app.py
+++ b/app/app.py
@@ -11,6 +11,7 @@ from airbrake import Airbrake, AirbrakeHandler
 app = Flask(__name__)
 app.config.from_object('config.Configuration')
 Bootstrap(app)
+app.config['BOOTSTRAP_SERVE_LOCAL'] = True
 
 # use our own bootstrap theme
 app.extensions['bootstrap']['cdns']['bootstrap'] = StaticCDN()
@@ -44,4 +45,4 @@ if not app.debug:
     )
     app.logger.addHandler(
         AirbrakeHandler(airbrake=airbrake)
-    )
\ No newline at end of file
+    )

From 093963cf3a1cf3becf4fa18b58326b5262001840 Mon Sep 17 00:00:00 2001
From: redfast00 <redfast00@gmail.com>
Date: Sat, 6 Apr 2019 11:12:21 +0200
Subject: [PATCH 3/3] Added links, removed unneeded badges

Badges for the amount of open issues, PR's and last commit are unneeded, since they are shown in the GitHub UI.
I removed them, because they don't always load as fast as the page loads, resulting in ugly
text getting displayed.
---
 README.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index affbfb6..b8e2a8a 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,9 @@
 Haldis
 =======
 [![chat mattermost](https://img.shields.io/badge/chat-mattermost-blue.svg)](https://mattermost.zeus.gent/zeus/channels/haldis)
-![Website](https://img.shields.io/website/https/haldis.zeus.gent.svg)
-![Mozilla HTTP Observatory Grade](https://img.shields.io/mozilla-observatory/grade-score/haldis.zeus.gent.svg?publish)
+[![Website](https://img.shields.io/website/https/haldis.zeus.gent.svg)](https://haldis.zeus.gent)
+[![Mozilla HTTP Observatory Grade](https://img.shields.io/mozilla-observatory/grade-score/haldis.zeus.gent.svg?publish)](https://observatory.mozilla.org/analyze/haldis.zeus.gent)
 
-![GitHub last commit](https://img.shields.io/github/last-commit/zeuswpi/haldis.svg)
-![GitHub issues](https://img.shields.io/github/issues/zeuswpi/haldis.svg)
-![GitHub pull requests](https://img.shields.io/github/issues-pr/zeuswpi/haldis.svg)
 ![GitHub commit activity](https://img.shields.io/github/commit-activity/y/zeuswpi/haldis.svg)
 
 Haldis is your friendly neighbourhood servant. He exists so lazy fucks like you and me don't need to keep tabs of who is ordering what from where.