Permalink
Commits on Sep 24, 2015
  1. Update .landscape.yaml

    committed Sep 24, 2015
Commits on Sep 19, 2015
  1. Merge branch 'bkeating-master' into develop

    * bkeating-master:
      Removed rogue character
      ``IPAddressField`` is now ``GenericIPAddressField``
      ``get_query_set`` is now ``get_queryset``
      packet name change
      version bump
      pip install update
      rollback & safe point added
      missing import added
      catch Integrity exception added
    committed Sep 19, 2015
  2. resolving conflicts

    committed Sep 19, 2015
  3. Merge branch 'pcraston-master' into develop

    * pcraston-master:
      update changes
      Make compatible with latest Django
      Port compatibility fix for Django 1.5
      Make compatible with Django 1.6
    committed Sep 19, 2015
  4. resolving conflicts

    committed Sep 19, 2015
  5. Merge branch 'pythonhacker-master' into develop

    * pythonhacker-master:
      version.py for versioning
      Fixing tracking pkg dependency error
      Fixing the issue with timezone aware timestamps
    committed Sep 19, 2015
  6. resolving conflicts

    committed Sep 19, 2015
  7. Merge branch 'ramusus-master' into develop

    * ramusus-master:
      merged with 0.4.1 version from bitbucket
    committed Sep 19, 2015
  8. resolving conflicts

    committed Sep 19, 2015
  9. Merge branch 'stewiegaribaldi-master' into develop

    * stewiegaribaldi-master:
      Update urls.py
      Fixed TypeError: can't compare offset-naive and offset-aware datetimes
      Fixed Django 1.6 error: cannot import name HAS_GEOIP
    committed Sep 19, 2015
  10. resolving conflicts

    committed Sep 19, 2015
  11. Merge branch 'MontmereLimited-master' into develop

    * MontmereLimited-master:
      HAS_GEOIP doesn't seem to exist anymore
      don't need this import
      gitignore
    committed Sep 19, 2015
  12. resolving conflicts

    committed Sep 19, 2015
  13. Merge branch 'madteckhead-master' into develop

    * madteckhead-master:
      listeners depends on Django which isn't installed for in fres environment
    committed Sep 19, 2015
  14. Merge branch 'master' of https://github.com/madteckhead/django-tracking

    … into madteckhead-master
    
    * 'master' of https://github.com/madteckhead/django-tracking:
      listeners depends on Django which isn't installed for in fres environment
    committed Sep 19, 2015
  15. Merge branch 'commoncode-master' into develop

    * commoncode-master:
      hardcode tracking version
      settings.AUTH_USER_MODEL
    committed Sep 19, 2015
  16. resolving conflicts

    committed Sep 19, 2015
  17. Merge branch 'jmichelsen-master' into develop

    * jmichelsen-master:
      added visitor to admin interface to capture IPs for banning
      added visitor to admin interface to capture IPs for banning
    committed Sep 19, 2015
  18. Merge branch 'master' of https://github.com/jmichelsen/django-tracking

    …into jmichelsen-master
    
    * 'master' of https://github.com/jmichelsen/django-tracking:
      added visitor to admin interface to capture IPs for banning
      added visitor to admin interface to capture IPs for banning
    committed Sep 19, 2015
Commits on Sep 18, 2015
  1. Merge branch 'klichukb-master' into develop

    * klichukb-master:
      Added south migrations
    committed Sep 18, 2015
  2. resolving conflicts

    committed Sep 18, 2015
  3. Merge branch 'jspiros-master' into develop

    * jspiros-master:
      Added support for Django 1.4+ time-zone-aware datetimes by using django.utils.timezone.now() in place of datetime.datetime.now() where available.
    committed Sep 18, 2015
  4. resolving conflicts

    committed Sep 18, 2015
  5. Merge branch 'develop' of https://github.com/bashu/django-tracking in…

    …to develop
    
    * 'develop' of https://github.com/bashu/django-tracking:
      Update README.rst
      Update .landscape.yaml
      Create .landscape.yaml
      Update README.rst
    committed Sep 18, 2015
  6. Merge branch 'ghost-master' into develop

    * ghost-master:
      Update tracking/middleware.py
    committed Sep 18, 2015
  7. Update tracking/middleware.py

    add support timezone. using timezone.now()
    ice9at committed with Sep 16, 2012
Commits on Aug 6, 2015
  1. Update README.rst

    committed Aug 6, 2015
  2. Update .landscape.yaml

    committed Aug 6, 2015
  3. Create .landscape.yaml

    committed Aug 6, 2015
Commits on Aug 5, 2015
  1. Update README.rst

    committed Aug 5, 2015
  2. update setup.py

    committed Aug 5, 2015
  3. add .gitignore

    committed Aug 5, 2015
  4. cleanup README

    committed Aug 5, 2015
  5. update LICENSE

    committed Aug 5, 2015
  6. add badges

    committed Aug 5, 2015