Permalink
Commits on Oct 21, 2016
  1. Merge pull request #444 from jvc26/fix-cellcounter/cellcounter#428

    Add support for XML output in stats API
    oghm2 committed on GitHub Oct 21, 2016
  2. Merge pull request #425 from jvc26/rounding-allowance

    Handle rounding at the 99.5% margin
    oghm2 committed on GitHub Oct 21, 2016
Commits on Oct 16, 2016
  1. Merged master with fix-cellcounter/cellcounter#428

    JV Clemence committed Oct 16, 2016
  2. Add support for XML output in stats api

    committed with JV Clemence Oct 16, 2016
  3. Merge branch 'master' into rounding-allowance

    JV Clemence committed Oct 16, 2016
  4. Fixes cellcounter/cellcounter#439

    The source of this bug appears to be the fact that the 'clear key map' function strips out the user from the keyboard_map. On saving, this leads to a 400 error, as the 'user' field has not been provided.
    
    This fix ensures 'user' is preserved across keymap clearances.
    committed with JV Clemence Oct 16, 2016
  5. Merge pull request #442 from jvc26/update-requirements

    Updated requirements
    committed on GitHub Oct 16, 2016
  6. * Factories to use new style Meta information.

    * Share use of UserFactory for consistency through testing
    committed with JV Clemence Oct 16, 2016
  7. Update test requirements

    JV Clemence committed Oct 16, 2016
Commits on Oct 15, 2016
  1. Updated requirements

    JV Clemence committed Oct 15, 2016
Commits on Aug 18, 2016
  1. Merge pull request #441 from jvc26/ft-syslog

    Fix logging
    committed on GitHub Aug 18, 2016
  2. Fix logging

    committed with JV Clemence Aug 18, 2016
  3. Merge pull request #440 from jvc26/ft-syslog

    Ft syslog
    committed on GitHub Aug 18, 2016
  4. Log to stderr

    committed with JV Clemence Aug 18, 2016
  5. Redirect logging to stderr for capture by systemd

    committed with JV Clemence Aug 18, 2016
Commits on Aug 5, 2016
  1. Merge pull request #437 from jvc26/ft-django-1.10

    Temporarily use github checkout for django-compressor
    committed on GitHub Aug 5, 2016
  2. Use github checkout for django-compressor as no current release suppo…

    …rting 1.10
    JV Clemence committed Aug 5, 2016
Commits on Aug 4, 2016
  1. Merge pull request #434 from jvc26/django-1.10

    Django 1.10
    committed on GitHub Aug 4, 2016
  2. Template context_processors have now been moved from django.core to d…

    …jango.template
    committed with JV Clemence Aug 4, 2016
  3. Merge latest upstream/master

    committed with JV Clemence Aug 4, 2016
  4. Update django to 1.10

    committed Aug 4, 2016
Commits on Aug 3, 2016
  1. Merge pull request #433 from jvc26/django-ratelimit-1.0.0

    Update ratelimit to PyPI release
    committed on GitHub Aug 3, 2016
  2. Merge pull request #432 from jvc26/django-1.9.9

    Update Django to 1.9.9
    committed on GitHub Aug 3, 2016
  3. Update Django to 1.9.9

    committed Aug 3, 2016
Commits on Aug 2, 2016
  1. Merge pull request #427 from jvc26/improved-logging

    Improved logging handling.
    committed on GitHub Aug 2, 2016
  2. Merge pull request #426 from jvc26/12factor-ALLOWED_HOSTS

    Take ALLOWED_HOSTS setting from environment
    committed on GitHub Aug 2, 2016
Commits on Jun 15, 2016
  1. Merge pull request #431 from jvc26/django-1.9.7

    Update django to 1.9.7
    committed on GitHub Jun 15, 2016
  2. Update django to 1.9.7

    committed Jun 15, 2016