Merge remote-tracking branch 'origin' into fix_map

ZeusWPI · Apr 6, 2019 · 94fedf8 · 94fedf8
2 parents 31a731c + 01bde15
commit 94fedf8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git 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.

diff --git a/app/app.py b/app/app.py
@@ -11,6 +11,7 @@
 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 @@
     )
     app.logger.addHandler(
         AirbrakeHandler(airbrake=airbrake)
-    )
+    )
diff --git a/app/templates/order.html b/app/templates/order.html
@@ -123,13 +123,13 @@ <h3>Debts</h3>
 
 {% 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
@@ -59,13 +59,13 @@ <h3>Create new order:</h3>
 
 {% 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 @@ <h3>Create new order:</h3>
             });
         }());
     </script>
-{%- endblock %}
+{%- endblock %}
diff --git a/app/templates/orders.html b/app/templates/orders.html
@@ -74,13 +74,13 @@ <h3>Create new order:</h3>
 
 {% 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 @@ <h3>Create new order:</h3>
             });
         }());
     </script>
-{%- endblock %}
+{%- endblock %}