versions up

zhebrak · Feb 24, 2015 · ed83bd6 · ed83bd6
1 parent 8a92de0
commit ed83bd6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ TODO
 MANIFEST
 dist/*
 .coverage
+topypi
diff --git a/README.md b/README.md
@@ -4,8 +4,6 @@ Django Statsy
 
 [![Build Status](https://travis-ci.org/fata1ex/django-statsy.svg)](https://travis-ci.org/fata1ex/django-statsy) [![Coverage Status](https://coveralls.io/repos/fata1ex/django-statsy/badge.svg)](https://coveralls.io/r/fata1ex/django-statsy) [![Requirements Status](https://requires.io/github/fata1ex/django-statsy/requirements.svg?branch=master)](https://requires.io/github/fata1ex/django-statsy/requirements/?branch=master) [![PyPI version](https://badge.fury.io/py/django-statsy.svg)](http://badge.fury.io/py/django-statsy)
 
-[![Stories in Ready](https://badge.waffle.io/fata1ex/django-statsy.svg?label=in%20progress&title=In%20Progress)](https://waffle.io/fata1ex/django-statsy)
-
 Statsy is an application for collecting and displaying statistics in your Django project.
 
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
 django==1.7.4
-jsonfield==1.0.2
+jsonfield==1.0.3
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 
-__version__ = '0.0.9.5dev'
+__version__ = '0.0.9.7dev'
 
 short_description = 'Statistics for Django projects'
 

diff --git a/statsy/templates/statsy/custom.html b/statsy/templates/statsy/custom.html
@@ -6,7 +6,7 @@
 
 {% block content %}
     <div class="row">
-        <h1>Custom Stats</h1>
+        <h1>Statistics</h1>
         {% for category, category_data in url_map.items %}
             <div class="statsy__custom_category">
                 <h5>{{ category }}</h5>

diff --git a/statsy/views.py b/statsy/views.py
@@ -115,7 +115,7 @@ def get_aggregated_stats_for_the_period(category, start, end=None, aggregation_p
     for category, data in aggregated_stats.items():
         consecutive_null_periods = []
         for period in aggregated_periods:
-            if period > last_period:
+            if period >= last_period:
                 data[period] = None
 
             elif period not in data: