Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	README.rst
  • Loading branch information
thornomad committed May 27, 2015
2 parents fa7d46b + efbe288 commit b1b1a4c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions README.rst
@@ -1,8 +1,10 @@
Django-HitCount
===============

.. image:: https://travis-ci.org/thornomad/django-hitcount.svg?branch=develop
.. image:: https://travis-ci.org/thornomad/django-hitcount.svg?branch=master
:target: https://travis-ci.org/thornomad/django-hitcount
.. image:: https://coveralls.io/repos/thornomad/django-hitcount/badge.svg?branch=master
:target: https://coveralls.io/r/thornomad/django-hitcount?branch=master

Basic app that allows you to track the number of hits/views for a particular object. Full documentation is available at: http://django-hitcount.rtfd.org

Expand All @@ -19,8 +21,8 @@ I have added an example project with a simple Blog application so you can see th

You can load some initial fixtures at::

python manage.py migrate # will load some data fixtures for you
python manage.py createsuperuser # if you want admin access
python manage.py migrate # will load some data fixtures for you
python manage.py createsuperuser # if you want admin access

Settings:
---------
Expand All @@ -32,10 +34,10 @@ Be sure to add this to your `settings.py`::
TODO
-----

* Tests (not a single test yet!)
* More tests! (low coverage)
* Internationalization (although this has been started)
* Port to python 3.x
* Upload to pip repository (need to read about this)
* Upload to pip repository

Contribute
----------
Expand Down
2 changes: 1 addition & 1 deletion hitcount/__init__.py
@@ -1,4 +1,4 @@
VERSION = (1, 0, 2, 0, 1)
VERSION = (1, 0, 3, 0, 1)

def get_version():
version = '%s.%s' % (VERSION[0], VERSION[1])
Expand Down

0 comments on commit b1b1a4c

Please sign in to comment.