Permalink
Switch branches/tags
Nothing to show
Commits on Oct 21, 2016
  1. Merge pull request #444 from jvc26/fix-cellcounter/cellcounter#428

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

    oghm2 committed on GitHub Oct 21, 2016
    Handle rounding at the 99.5% margin
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

    jvc26 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

    jvc26 committed with JV Clemence Oct 16, 2016
    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.
  5. Merge pull request #442 from jvc26/update-requirements

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

    jvc26 committed with JV Clemence Oct 16, 2016
    * Share use of UserFactory for consistency through testing
  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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    jvc26 committed Jun 15, 2016