Merge pull request #319 from bcgov/release-v0.2.0

Release v0.2.0.2

backend/api/migrations/0010_auto_20180529_2003.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-29 20:03
+from __future__ import unicode_literals
+
+import api.validators
+from decimal import Decimal
+import django.contrib.auth.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0009_signingauthorityassertion_signingauthorityconfirmation'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='credittrade',
+            name='fair_market_value_per_credit',
+            field=models.DecimalField(blank=True, decimal_places=2, default=Decimal('0.00'), max_digits=999, null=True, validators=[api.validators.CreditTradeFairMarketValueValidator]),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username'),
+        ),
+    ]

backend/api/models/User.py

@@ -24,13 +24,15 @@
 from django.db import models
 from django.contrib.auth.models import AbstractUser
 from django.core.validators import RegexValidator
+import django.contrib.auth.validators
 
 from .OrganizationBalance import OrganizationBalance
 
 from auditable.models import Auditable
 
 
 class User(AbstractUser, Auditable):
+    username = models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')
     phone_regex = RegexValidator(regex=r'^\+?1?\d{9,15}$',
                                  message="Phone number must be entered in the format: '+999999999'. Up to 15 digits allowed.")
 

frontend/webpack.production.config.js

@@ -1,4 +1,5 @@
 const Webpack = require('webpack');
+const packageJson = require('./package.json');
 const path = require('path');
 
 const nodeModulesPath = path.resolve(__dirname, 'node_modules');
@@ -64,7 +65,8 @@ const config = {
   },
   plugins: [
     new Webpack.DefinePlugin({
-      __LOGOUT_URL__: JSON.stringify('https://logon.gov.bc.ca/clp-cgi/logoff.cgi')
+      __LOGOUT_URL__: JSON.stringify('https://logon.gov.bc.ca/clp-cgi/logoff.cgi'),
+      __VERSION__: JSON.stringify(packageJson.version)
     }),
     new Webpack.optimize.UglifyJsPlugin({
       compress: {