Merge branch 'release-1.2b3'

Author: bbengfort

Makefile

@@ -52,6 +52,7 @@ runserver:
 # Clean build files
 clean:
 	find . -name "*.pyc" -print0 | xargs -0 rm -rf
+	find . -name "__pycache__" -print0 | xargs -0 rm -rf
 	-rm -rf htmlcov
 	-rm -rf .coverage
 	-rm -rf build

README.md

@@ -107,13 +107,21 @@ The release versions that are sent to the Python package index (PyPI) are also t
 
 The versioning uses a three part version system, "a.b.c" - "a" represents a major release that may not be backwards compatible. "b" is incremented on minor releases that may contain extra features, but are backwards compatible. "c" releases are bug fixes or other micro changes that developers should feel free to immediately update to.
 
+### Version 1.2 Beta 3
+
+* **tag**: [v1.1b2](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2b3)
+* **deployment**: Monday, July 11, 2016
+* **commit**: [see tag](#)
+
+The third beta fixes the tag grid system which got all wonky in the first implementation when actual data was put in. The new style is similar to the Stack Overflow tag grid style. Moreover, now tags are case insensitive, which should help eliminate duplicates. The activity stream was also updated to use templates for a bit more robust control. The "answered" activity now takes the answer as a target rather than as a theme, and answers have detail links to the question that they're on. 
+
 ### Version 1.1 Beta 2
 
 * **tag**: [v1.1b2](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.1b2)
 * **deployment**: Friday, July 8, 2016
-* **commit**: [see tag](#)
+* **commit**: [ebd553f](https://github.com/DistrictDataLabs/minimum-entropy/commit/ebd553fd8ec202de38fb3f27de2993770ac48960)
 
-The second beta release fixes a couple of bugs with the older profile system, and a lingering topic item from Kyudo. This release goes a bit further and creates a tagging system for questions (replacing topics) and allows for the ordering and search of questions in a more meaningful way. Hopefully this is the last official Beta version and Minimum Entropy can actually start to be used in a more meaningful way. 
+The second beta release fixes a couple of bugs with the older profile system, and a lingering topic item from Kyudo. This release goes a bit further and creates a tagging system for questions (replacing topics) and allows for the ordering and search of questions in a more meaningful way. Hopefully this is the last official Beta version and Minimum Entropy can actually start to be used in a more meaningful way.
 
 ### Version 1.0 Beta 1
 

docs/about.md

@@ -49,11 +49,19 @@ The release versions that are sent to the Python package index (PyPI) are also t
 
 The versioning uses a three part version system, "a.b.c" - "a" represents a major release that may not be backwards compatible. "b" is incremented on minor releases that may contain extra features, but are backwards compatible. "c" releases are bug fixes or other micro changes that developers should feel free to immediately update to.
 
+### Version 1.2 Beta 3
+
+* **tag**: [v1.1b2](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2b3)
+* **deployment**: Monday, July 11, 2016
+* **commit**: [see tag](#)
+
+The third beta fixes the tag grid system which got all wonky in the first implementation when actual data was put in. The new style is similar to the Stack Overflow tag grid style. Moreover, now tags are case insensitive, which should help eliminate duplicates. The activity stream was also updated to use templates for a bit more robust control. The "answered" activity now takes the answer as a target rather than as a theme, and answers have detail links to the question that they're on. 
+
 ### Version 1.1 Beta 2
 
 * **tag**: [v1.1b2](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.1b2)
 * **deployment**: Friday, July 8, 2016
-* **commit**: [see tag](#)
+* **commit**: [ebd553f](https://github.com/DistrictDataLabs/minimum-entropy/commit/ebd553fd8ec202de38fb3f27de2993770ac48960)
 
 The second beta release fixes a couple of bugs with the older profile system, and a lingering topic item from Kyudo. This release goes a bit further and creates a tagging system for questions (replacing topics) and allows for the ordering and search of questions in a more meaningful way. Hopefully this is the last official Beta version and Minimum Entropy can actually start to be used in a more meaningful way.
 

fugato/__init__.py

@@ -7,7 +7,7 @@
 # Copyright (C) 2016 District Data Labs
 # For license information, see LICENSE.txt
 #
-# ID: __init__.py [] [email protected] $
+# ID: __init__.py [8eae6c4] [email protected] $
 
 """
 The fugato app is designed to collect questions.

fugato/admin.py

@@ -7,7 +7,7 @@
 # Copyright (C) 2016 District Data Labs
 # For license information, see LICENSE.txt
 #
-# ID: admin.py [] [email protected] $
+# ID: admin.py [8eae6c4] [email protected] $
 
 """
 Description of the app for the admin site and CMS.

fugato/apps.py

@@ -7,7 +7,7 @@
 # Copyright (C) 2016 District Data Labs
 # For license information, see LICENSE.txt
 #
-# ID: apps.py [] [email protected] $
+# ID: apps.py [8eae6c4] [email protected] $
 
 """
 Describes the Fugato application for Django

fugato/exceptions.py

@@ -7,7 +7,7 @@
 # Copyright (C) 2016 District Data Labs
 # For license information, see LICENSE.txt
 #
-# ID: exceptions.py [] [email protected] $
+# ID: exceptions.py [8eae6c4] [email protected] $
 
 """
 Custom exceptions for API

fugato/managers.py

@@ -7,7 +7,7 @@
 # Copyright (C) 2016 District Data Labs
 # For license information, see LICENSE.txt
 #
-# ID: managers.py [] [email protected] $
+# ID: managers.py [8eae6c4] [email protected] $
 
 """
 Custom managers for the fugato models

fugato/migrations/0004_auto_20160710_0909.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-10 13:09
+from __future__ import unicode_literals
+
+import autoslug.fields
+from django.db import migrations
+from slugify import slugify
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fugato', '0003_auto_20160707_2054'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='question',
+            name='slug',
+            field=autoslug.fields.AutoSlugField(editable=False, populate_from='text', slugify=slugify, unique=True),
+        ),
+    ]

fugato/migrations/__init__.py

@@ -7,7 +7,7 @@
 # Copyright (C) 2016 District Data Labs
 # For license information, see LICENSE.txt
 #
-# ID: __init__.py [] [email protected] $
+# ID: __init__.py [8eae6c4] [email protected] $
 
 """
 Database migrations for the fugato application