Skip to content

Commit

Permalink
Bump Django version to 3.2
Browse files Browse the repository at this point in the history
Signed-off-by: Maurício Meneghini Fauth <[email protected]>
  • Loading branch information
MauricioFauth committed Aug 10, 2023
1 parent b1dd19f commit 8495090
Show file tree
Hide file tree
Showing 36 changed files with 215 additions and 107 deletions.
18 changes: 18 additions & 0 deletions demo/migrations/0003_alter_demo_id.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.19 on 2023-08-10 20:19

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('demo', '0002_demo_master_version'),
]

operations = [
migrations.AlterField(
model_name='demo',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
]
28 changes: 28 additions & 0 deletions files/migrations/0008_auto_20230810_2019.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Generated by Django 3.2.19 on 2023-08-10 20:19

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('files', '0007_auto_20200505_1705'),
]

operations = [
migrations.AlterField(
model_name='download',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
migrations.AlterField(
model_name='release',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
migrations.AlterField(
model_name='theme',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
]
23 changes: 23 additions & 0 deletions news/migrations/0005_auto_20230810_2019.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 3.2.19 on 2023-08-10 20:19

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('news', '0004_auto_20200505_1705'),
]

operations = [
migrations.AlterField(
model_name='planet',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
migrations.AlterField(
model_name='post',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
]
50 changes: 25 additions & 25 deletions pmaweb/fixtures/test_data.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions pmaweb/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
'django.template.context_processors.debug',
'django.template.context_processors.i18n',
'django.template.context_processors.media',
'django.template.context_processors.request',
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
Expand Down Expand Up @@ -122,6 +123,8 @@
}
}

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

# Internationalization
# https://docs.djangoproject.com/en/1.7/topics/i18n/

Expand Down
8 changes: 4 additions & 4 deletions pmaweb/templates/15-years.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

<h2> The <a href="https://www.phpmyadmin.net">phpMyAdmin</a> project is thrilled to celebrate fifteen years of phpMyAdmin </h2>

<p>
The phpMyAdmin project was &ldquo;born&rdquo; on the 9th of September, 1998, when
Tobias Ratschiller released version 0.9.0. The project has grown to be one of the
Expand All @@ -25,7 +25,7 @@ <h2> The <a href="https://www.phpmyadmin.net">phpMyAdmin</a> project is thrilled
By lines of code, the project has grown from 13,496 to 508,761
lines<sup><a href="#openhub">1</a></sup>.
</p>

<p>Please join us in celebrating fifteen years of phpMyAdmin! Please send us your
success stories, preferably using the Sourceforge <a href="https://sourceforge.net/projects/phpmyadmin/#reviews">review form</a>
or by:
Expand Down Expand Up @@ -60,5 +60,5 @@ <h2> The <a href="https://www.phpmyadmin.net">phpMyAdmin</a> project is thrilled
<p name="openhub">
<sup>1</sup> &#8211; These analyses provided by <a href="https://www.openhub.net/p/phpmyadmin">Open HUB</a> by Black Duck.
</p>

{% endblock %}
2 changes: 1 addition & 1 deletion pmaweb/templates/404.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

Expand Down
2 changes: 1 addition & 1 deletion pmaweb/templates/_sponsors.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load staticfiles %}
{% load static %}
<div class="sponsors">

<h2><a href="{% url 'sponsors' %}">Sponsors</a></h2>
Expand Down
16 changes: 8 additions & 8 deletions pmaweb/templates/about-website.html
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

<h2>About Website</h2>

<p>
This website is implemented in <a href="https://www.python.org/">Python</a>, uses
<a href="https://github.com/kurtmckee/feedparser/">FeedParser</a> to grab
external data and <a href="https://www.djangoproject.com/">Django</a> to generate
web pages. Source code of it is available in the Github repository
<code><a href="https://github.com/phpmyadmin/website">phpmyadmin/website</a></code>
(see <a href="{% url 'develop' %}">developer information</a>
<a href="https://github.com/kurtmckee/feedparser/">FeedParser</a> to grab
external data and <a href="https://www.djangoproject.com/">Django</a> to generate
web pages. Source code of it is available in the Github repository
<code><a href="https://github.com/phpmyadmin/website">phpmyadmin/website</a></code>
(see <a href="{% url 'develop' %}">developer information</a>
for information how to access it).
</p>

<p>
Site design and logic has been created by <a href="{% url 'team' %}#michal">Michal
Čihař</a> and it is powered by
Čihař</a> and it is powered by
<a href="https://www.cdn77.com/">CDN77.com</a>.
</p>

<p>
Site should be valid XHTML and CSS, where it makes sense, we try to use
Site should be valid XHTML and CSS, where it makes sense, we try to use
<a href="http://microformats.org/">Microformats</a>. We also try to make
website <a href="https://www.w3.org/WAI/WCAG1AAA-Conformance">accessible</a>.
</p>
Expand Down
2 changes: 1 addition & 1 deletion pmaweb/templates/about.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}
{% load downloads %}

{% block content %}
Expand Down
2 changes: 1 addition & 1 deletion pmaweb/templates/awards.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

Expand Down
2 changes: 1 addition & 1 deletion pmaweb/templates/base.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load staticfiles %}
{% load static %}
{% load compress %}

<!DOCTYPE html>
Expand Down
2 changes: 1 addition & 1 deletion pmaweb/templates/contest.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}
<h2>Contest results</h2>
Expand Down
2 changes: 1 addition & 1 deletion pmaweb/templates/contractor.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

Expand Down
14 changes: 7 additions & 7 deletions pmaweb/templates/contribute.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

Expand Down Expand Up @@ -29,7 +29,7 @@ <h3>Helping users</h3>
<h3 id="translate">Localization</h3>

<p>
phpMyAdmin is being translated to many languages, but maybe your language is not
phpMyAdmin is being translated to many languages, but maybe your language is not
really up to date? You can easily contribute on our
<a href="https://hosted.weblate.org/engage/phpmyadmin/">translation server</a>.
You can find out more on the <a href="{% url 'translate' %}">translation
Expand All @@ -48,9 +48,9 @@ <h3>Testing and quality assurance</h3>
<h3>Documentation writer/tutorial creator</h3>

<p>
Do you
Do you
feel our documentation misses some points? We welcome additions; just
let us know how you think the documentation can be improved.
let us know how you think the documentation can be improved.
The best way is to <a href="https://wiki.phpmyadmin.net/pma/Pull_request">submit a pull request</a>
against our <a href="https://github.com/phpmyadmin/">GitHub repository</a>.
If you don't know how to make these changes, we still want to hear your input.
Expand All @@ -66,8 +66,8 @@ <h3>Documentation writer/tutorial creator</h3>
<h3 id="devel">Developing</h3>

<p>
Coding contributions are very welcome, the easiest way is to fork our code on github
and submit a pull request. We really welcome bug fixes or new features.
Coding contributions are very welcome, the easiest way is to fork our code on github
and submit a pull request. We really welcome bug fixes or new features.
You can find out more on the <a href="{% url 'develop' %}">developers
page</a>.
</p>
Expand All @@ -78,7 +78,7 @@ <h3>Bug/features screening/squashing</h3>
Our trackers, especially the
<a href="https://github.com/phpmyadmin/phpmyadmin/labels/enhancement">feature tracker</a>,
contain dozens of entries which might already be implemented or don't make much sense after years.
You can go through reported issues, verify if they still apply to latest version and
You can go through reported issues, verify if they still apply to latest version and
check whether they would be still useful. Also checking incoming reports for all required
information or whether they were already reported is welcome help.
</p>
Expand Down
16 changes: 8 additions & 8 deletions pmaweb/templates/develop.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

Expand Down Expand Up @@ -31,17 +31,17 @@ <h3>Contributing code</h3>
once you are done with some feature/bugfix. Please keep your changes as small as possible; do not include unrelated changes like formatting, whitespace and new line characters.
</p>
<p>
Our developers will then merge your code or will guide you through
improving the patch. The patch will be of course committed under your
name and mail, so that you receive appropriate credits. Generally after
merging several good patches you will be offered write access to our
Our developers will then merge your code or will guide you through
improving the patch. The patch will be of course committed under your
name and mail, so that you receive appropriate credits. Generally after
merging several good patches you will be offered write access to our
repository.
</p>

<h3>Simple tasks to start</h3>
<p>
If you are looking for some simple task where you can start, check out
<a href="https://github.com/phpmyadmin/phpmyadmin/issues?q=is%3Aopen+is%3Aissue+label%3Anewbie">newbie tagged issues in our tracker</a>
<a href="https://github.com/phpmyadmin/phpmyadmin/issues?q=is%3Aopen+is%3Aissue+label%3Anewbie">newbie tagged issues in our tracker</a>
where you can find issues which might be good starting point for you.
</p>

Expand All @@ -59,8 +59,8 @@ <h3>Coding Standards</h3>
<h3>Documentation and other resources</h3>

<p>
If you don't know much about <a href="https://git-scm.com/">Git</a>,
you can get some basic facts in
If you don't know much about <a href="https://git-scm.com/">Git</a>,
you can get some basic facts in
<a href="https://en.wikipedia.org/wiki/Git_software">Wikipedia</a> or
reference in the comprehensive book <a href="https://progit.org/">Pro Git</a>.
</p>
Expand Down
2 changes: 1 addition & 1 deletion pmaweb/templates/docs.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

Expand Down
18 changes: 9 additions & 9 deletions pmaweb/templates/donate.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

Expand All @@ -13,7 +13,7 @@ <h2>Donations</h2>

<p>
As a free software project, phpMyAdmin has almost no revenues itself. On the
other side, we have some expenses. Currently most of the project's funds are
other side, we have some expenses. Currently most of the project's funds are
used to hire contractors for development and bug fixes, and for travel costs to allow team members to meet at conferences.
</p>

Expand All @@ -34,7 +34,7 @@ <h3>PayPal</h3>

<p>
We invite you to contribute money to our project using the above PayPal button.
PayPal is one of the most used online payments methods, it also accepts all
PayPal is one of the most used online payments methods, it also accepts all
major credit cards.
</p>

Expand All @@ -52,27 +52,27 @@ <h3>Check or Wire</h3>
137 Montague ST STE 380<br />
BROOKLYN, NY 11201 USA<br />
</p>

<p>
Conservancy can accept wire donations, but the instructions vary depending on
the country of origin. Please contact
<a href="mailto:[email protected]">[email protected]</a>
for instructions.
the country of origin. Please contact
<a href="mailto:[email protected]">[email protected]</a>
for instructions.
</p>

<h3>Stock donations</h3>

<p>
Conservancy also accepts stock donations on behalf of the phpMyAdmin project.
If you would like to donate stock, please contact
<a href="mailto:[email protected]">[email protected]</a>
<a href="mailto:[email protected]">[email protected]</a>
for instructions on how to initiate the transfer.
</p>

<h3>Flattr</h3>

<p>
Alternatively you can appreciate our work using
Alternatively you can appreciate our work using
<a href="https://flattr.com/@sfconservancy/domain/phpmyadmin.net">Flattr</a>. Flattr is a
microdonation system allowing users to easily appreciate others.
</p>
Expand Down
2 changes: 1 addition & 1 deletion pmaweb/templates/downloads.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

Expand Down
12 changes: 6 additions & 6 deletions pmaweb/templates/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}

Expand All @@ -12,10 +12,10 @@ <h2>About</h2>
<p>
phpMyAdmin is a free software tool written in <a href="https://php.net/">PHP</a>,
intended to handle the administration of <a href="https://www.mysql.com/">MySQL</a>
over the Web. phpMyAdmin supports a wide range of operations on MySQL and
MariaDB. Frequently used operations (managing databases, tables,
columns, relations, indexes, users, permissions, etc) can be performed via the
user interface, while you still have the ability to directly execute any SQL statement.
over the Web. phpMyAdmin supports a wide range of operations on MySQL and
MariaDB. Frequently used operations (managing databases, tables,
columns, relations, indexes, users, permissions, etc) can be performed via the
user interface, while you still have the ability to directly execute any SQL statement.
</p>

<div class="bookbanner">
Expand Down Expand Up @@ -81,7 +81,7 @@ <h2>Features</h2>
<li>manage stored procedures and triggers</li>
</ul>
</li>
<li>Import data from
<li>Import data from
<abbr title="comma separated values">CSV</abbr> and
<abbr title="structured query language">SQL</abbr>
</li>
Expand Down
Loading

0 comments on commit 8495090

Please sign in to comment.