Skip to content

Commit

Permalink
Merge branch 'hotfix-0.1b2'
Browse files Browse the repository at this point in the history
  • Loading branch information
bbengfort committed Jul 19, 2016
2 parents 70262fa + a237448 commit d349132
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The versioning uses a three part version system, "a.b.c" - "a" represents a majo
* **deployment**: Monday, July 18, 2016
* **commit**: [see tag](#)

This is the first beta release of the Political Discourse application. Right now this simple web application allows users to sign in, then add links to go fetch web content to the global corpus. These links are then preprocessed using NLP foo. Users can tag the documents as Republican or Democrat, allowing us to build a political classifier.
This is the first beta release of the Partisan Discourse application. Right now this simple web application allows users to sign in, then add links to go fetch web content to the global corpus. These links are then preprocessed using NLP foo. Users can tag the documents as Republican or Democrat, allowing us to build a political classifier.

<!-- References -->
[travis_img]: https://travis-ci.org/DistrictDataLabs/partisan-discourse.svg
Expand Down
6 changes: 3 additions & 3 deletions partisan/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>{% block title %}Political Discourse{% endblock %}</title>
<title>{% block title %}Partisan Discourse{% endblock %}</title>

{% block meta %}
<meta name="author" content="{% block author %}District Data Labs{% endblock %}">
<meta name="keywords" content="{% block keywords %}Data Science, District Data Labs, Political Discourse, Machine Learning{% endblock %}">
<meta name="description" content="{% block description %}Political Discourse by District Data Labs{% endblock %}">
<meta name="keywords" content="{% block keywords %}Data Science, District Data Labs, Partisan Discourse, Machine Learning{% endblock %}">
<meta name="description" content="{% block description %}Partisan Discourse by District Data Labs{% endblock %}">
{% endblock %}

{% block link %}
Expand Down
2 changes: 1 addition & 1 deletion partisan/templates/components/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</p>
<p class="text-right text-muted">
<small>
Political Discourse v<span id="footerVersion"></span>
Partisan Discourse v<span id="footerVersion"></span>
&middot
status: <span id="footerStatus"><i class="fa fa-circle"></i></span>
</small>
Expand Down
2 changes: 1 addition & 1 deletion partisan/templates/components/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">
<i class="fa fa-comment"></i> Political Discourse <sup><small>beta</small></sup>
<i class="fa fa-comment"></i> Partisan Discourse <sup><small>beta</small></sup>
</a>
</div>

Expand Down
2 changes: 1 addition & 1 deletion partisan/tests/test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
## Module variables
##########################################################################

EXPECTED_VERSION = "0.1b1"
EXPECTED_VERSION = "0.1b2"

##########################################################################
## Initialization Tests
Expand Down
2 changes: 1 addition & 1 deletion partisan/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
'minor': 1,
'micro': 0,
'releaselevel': 'beta',
'serial': 1,
'serial': 2,
}


Expand Down

0 comments on commit d349132

Please sign in to comment.