Skip to content
Snippets Groups Projects
Commit 02883076 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '147-contact-on-field' into 'master'

Resolve "contact on field"

Closes #147

See merge request !72
parents 9027d3ec db1bbd5f
No related branches found
No related tags found
1 merge request!72Resolve "contact on field"
Pipeline #
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2017-09-25 09:05
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('web', '0054_remove_inconsistentsubject_ignore'),
]
operations = [
migrations.AlterField(
model_name='subject',
name='datetime_contact_reminder',
field=models.DateTimeField(blank=True, null=True, verbose_name=b'Please make a contact on'),
),
]
...@@ -42,7 +42,7 @@ class Subject(models.Model): ...@@ -42,7 +42,7 @@ class Subject(models.Model):
datetime_contact_reminder = models.DateTimeField( datetime_contact_reminder = models.DateTimeField(
null=True, null=True,
blank=True, blank=True,
verbose_name='Contact on', verbose_name='Please make a contact on',
) )
type = models.CharField(max_length=1, type = models.CharField(max_length=1,
choices=SUBJECT_TYPE_CHOICES.items(), choices=SUBJECT_TYPE_CHOICES.items(),
......
...@@ -269,7 +269,7 @@ desired effect ...@@ -269,7 +269,7 @@ desired effect
{% block footer %} {% block footer %}
<!-- To the right --> <!-- To the right -->
<div class="pull-right hidden-xs"> <div class="pull-right hidden-xs">
Version: <strong>0.8.0</strong> (20 September 2017) Version: <strong>0.8.1</strong> (25 September 2017)
</div> </div>
<!-- Default to the left --> <!-- Default to the left -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment