synoyms and version bump

Author: bbengfort

README.md

@@ -107,9 +107,17 @@ 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.
 
+### Hotfix 1.2.1 Beta 4
+
+* **tag**: [v1.2.1b4](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2.1b4)
+* **deployment**: Monday, July 11, 2016
+* **commit**: [see tag](#)
+
+A quick hotfix due to a question and answer ordering by vote bug. Also took the chance to add links to the tags in the question list and detail pages as well as to fix the synonym bug (temporarily). Links for the tags are still not rendered after JavaScript editing though.
+
 ### Version 1.2 Beta 3
 
-* **tag**: [v1.1b2](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2b3)
+* **tag**: [v1.2b3](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2b3)
 * **deployment**: Monday, July 11, 2016
 * **commit**: [6ff3530](https://github.com/DistrictDataLabs/minimum-entropy/commit/6ff3530eaf6af0584e65577ddeeedc19aced84a5)
 

docs/about.md

@@ -49,9 +49,17 @@ 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.
 
+### Hotfix 1.2.1 Beta 4
+
+* **tag**: [v1.2.1b4](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2.1b4)
+* **deployment**: Monday, July 11, 2016
+* **commit**: [see tag](#)
+
+A quick hotfix due to a question and answer ordering by vote bug. Also took the chance to add links to the tags in the question list and detail pages as well as to fix the synonym bug (temporarily). Links for the tags are still not rendered after JavaScript editing though.
+
 ### Version 1.2 Beta 3
 
-* **tag**: [v1.1b2](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2b3)
+* **tag**: [v1.2b3](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2b3)
 * **deployment**: Monday, July 11, 2016
 * **commit**: [6ff3530](https://github.com/DistrictDataLabs/minimum-entropy/commit/6ff3530eaf6af0584e65577ddeeedc19aced84a5)
 

minent/templates/fugato/list.html

@@ -83,7 +83,7 @@ <h3>
                   <span class="label label-info">{{ question.votes.count }} vote{{ question.votes.count|pluralize }}</span>
                   {% for tag in question.tags.all %}
                   <a href="{% url 'question-list' %}?tag={{ tag.slug }}" title="Show questions tagged: {{ tag.text }}">
-                    <span class="label label-primary">{% if tag.is_synonym %}{{ tag.head_word }}{% else %}{{ tag }}{% endif %}</span>
+                    <span class="label label-primary">{{ tag }}</span>
                   </a>
                   {% endfor %}
                 </p>

minent/templates/fugato/question.html

@@ -130,7 +130,7 @@ <h2 id="questionText">{{ question.text }}</h2>
               <div class="pull-left" id="questionTags">
                 {% for tag in question.tags.all %}
                 <a href="{% url 'question-list' %}?tag={{ tag.slug }}" title="Show questions tagged: {{ tag.text }}">
-                  <span class="label label-primary">{% if tag.is_synonym %}{{ tag.head_word }}{% else %}{{ tag }}{% endif %}</span>
+                  <span class="label label-primary">{{ tag }}</span>
                 </a>
                 {% endfor %}
               </div>

minent/tests/test_init.py

@@ -23,7 +23,7 @@
 ## Module variables
 ##########################################################################
 
-EXPECTED_VERSION = "1.2b3"
+EXPECTED_VERSION = "1.2.1b4"
 
 ##########################################################################
 ## Initialization Tests

minent/version.py

@@ -20,9 +20,9 @@
 __version_info__ = {
     'major': 1,
     'minor': 2,
-    'micro': 0,
+    'micro': 1,
     'releaselevel': 'beta',
-    'serial': 3,
+    'serial': 4,
 }