Merge remote-tracking branch 'refs/remotes/OpenBankProject/develop' into develop

This commit is contained in:
Hongwei 2025-05-20 13:35:15 +02:00
commit 9e0bd20032
13 changed files with 13 additions and 14 deletions

2
NOTICE
View File

@ -1,5 +1,5 @@
Open Bank Project API Manager
Copyright (C) 2011-2021, TESOBE GmbH
Copyright (C) 2011-2025, TESOBE GmbH
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by

View File

@ -44,7 +44,7 @@ INSTALLED_APPS = [
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'bootstrap',
'bootstrap4',
'bootstrap_datepicker_plus',
'mathfilters',
'base',
@ -301,7 +301,6 @@ ALLOW_DIRECT_LOGIN = True
GATEWAYLOGIN_HAS_CBS = False
ALLOW_GATEWAY_LOGIN = True
# Use BOOTSTRAP3 if you are using Bootstrap 3
BOOTSTRAP4 = {
'include_jquery': True,
}

View File

@ -5,7 +5,7 @@
{% block page_title %}{{ block.super }} / {% trans "Customers" %}{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="customers">
{% bootstrap_javascript jquery='full' %} {# Embed Bootstrap JS+jQuery #}

View File

@ -6,7 +6,7 @@
{% block extrajs %}
<script type="text/javascript" src="{% static 'metrics/js/lastEndpointMetric.js' %}"></script>
{% endblock extrajs %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">
{% bootstrap_javascript jquery='full' %} {# Embed Bootstrap JS+jQuery #}

View File

@ -3,7 +3,7 @@
{% load i18n %}
{% block page_title %}{{ block.super }} / Connector Metrics{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">
{% bootstrap_javascript jquery='full' %} {# Embed Bootstrap JS+jQuery #}

View File

@ -2,7 +2,7 @@
{% load static %}
{% load i18n %}
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">
<h1>{% trans "API Usage Report" %}</h1>

View File

@ -5,7 +5,7 @@
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">

View File

@ -3,7 +3,7 @@
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">

View File

@ -2,7 +2,7 @@
{% load static %}
{% load i18n %}
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">
<h1>{% trans "API Usage Report" %}</h1>

View File

@ -4,7 +4,7 @@
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">

View File

@ -4,7 +4,7 @@
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">

View File

@ -4,7 +4,7 @@
{% block page_title %}{{ block.super }} / API Usage Report{% endblock page_title %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block content %}
<div id="metrics">

View File

@ -9,5 +9,5 @@ gunicorn==22.0.0
matplotlib
django-bootstrap-datepicker-plus
django-mathfilters
django-bootstrap
django-bootstrap4
django-csp