Compare commits

..

No commits in common. "3453001e33f46a5a2ea5dce567cf7068cec3d0e4" and "e5cd53a1f5ddc9596ac86d27c968642487317403" have entirely different histories.

5 changed files with 4 additions and 55 deletions

View file

@ -101,9 +101,6 @@ delete from auth_user where is_staff = false;
Set any remaining account `completed_registration` to false. Set any remaining account `completed_registration` to false.
# Step 5: Update conference details and dates
Add a new Conference entry in Django Admin and update the `CONFERENCE_ID` in pinaxcon/settings.py. Also update the conference dates. Add a new Conference entry in Django Admin and update the `CONFERENCE_ID` in pinaxcon/settings.py. Also update the conference dates.
Find and update all uses of 2026 and the conference dates in this codebase. Find and update all uses of 2026 and the conference dates in this codebase.

3
fabfile.py vendored
View file

@ -75,7 +75,10 @@ ns.configure({
# Built-in Fabric config. # Built-in Fabric config.
'run': { 'run': {
'echo': True, 'echo': True,
# Needed so local commands work. Can also use FABRIC_RUN_REPLACE_ENV.
'replace_env': False,
}, },
# Our custom project config. # Our custom project config.
'env': { 'env': {
'branch': 'fossy2026', 'branch': 'fossy2026',

View file

@ -11,7 +11,7 @@
<div class="col-md-4"> <div class="col-md-4">
<form method="POST" action="{% url "account_login" %}" autocapitalize="off" {% if form.is_multipart %} enctype="multipart/form-data"{% endif %}> <form method="POST" action="{% url "account_login" %}" autocapitalize="off" {% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
<legend>{% trans "Log in to an existing account" %}</legend> <legend>{% trans "Log in to an existing account" %}</legend>
<div class="alert alert-primary">Please note that accounts from previous years are not transferred for privacy reasons.</div> <div class="alert alert-primary">Please note that accounts from 2024 are not transferred for privacy reasons.</div>
{% csrf_token %} {% csrf_token %}
{{ form|bootstrap }} {{ form|bootstrap }}
{% if redirect_field_value %} {% if redirect_field_value %}

View file

@ -1,28 +0,0 @@
# Generated by Django 2.2.28 on 2026-03-19 06:40
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('symposion_proposals', '0003_auto_20170702_2250'),
]
operations = [
migrations.AlterField(
model_name='proposalbase',
name='abstract',
field=models.TextField(help_text="This will appear in the conference programme. Up to about 500 words. This field supports <a href='https://daringfireball.net/projects/markdown/syntax' target='_blank'>Markdown</a>, with limitations on allowed elements.", verbose_name='Abstract'),
),
migrations.AlterField(
model_name='proposalbase',
name='private_abstract',
field=models.TextField(help_text="This will only be shown to organisers and reviewers. You should provide any details about your proposal that you don't want to be public here. This field supports <a href='https://daringfireball.net/projects/markdown/syntax' target='_blank'>Markdown</a>, with limitations on allowed elements.", verbose_name='Private Abstract'),
),
migrations.AlterField(
model_name='proposalbase',
name='technical_requirements',
field=models.TextField(blank=True, help_text="Speakers will be provided with: Internet access, power, projector, audio. If you require anything in addition, please list your technical requirements here. Such as: a static IP address, A/V equipment or will be demonstrating security-related techniques on the conference network. This field supports <a href='https://daringfireball.net/projects/markdown/syntax' target='_blank'>Markdown</a>, with limitations on allowed elements.", verbose_name='Special Requirements'),
),
]

View file

@ -1,23 +0,0 @@
# Generated by Django 2.2.28 on 2026-03-19 06:40
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('symposion_speakers', '0013_merge_20260219_2116'),
]
operations = [
migrations.AlterField(
model_name='speaker',
name='biography',
field=models.TextField(blank=True, help_text="This will appear on the conference website and in the programme. Please write in the third person, eg 'Alice is a Moblin hacker...', 150-200 words. This field supports <a href='https://daringfireball.net/projects/markdown/syntax' target='_blank'>Markdown</a>, with limitations on allowed elements.", verbose_name='Biography'),
),
migrations.AlterField(
model_name='speaker',
name='experience',
field=models.TextField(blank=True, help_text="Have you had any experience presenting elsewhere? If so, we'd like to know. Anything you put here will only be seen by the organisers and reviewers; use it to convince them why they should accept your proposal. This field supports <a href='https://daringfireball.net/projects/markdown/syntax' target='_blank'>Markdown</a>, with limitations on allowed elements.", verbose_name='Speaking experience'),
),
]