Navigation Menu

Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: timvideos/streaming-system
base: 3659c93f5435
Choose a base ref
...
head repository: timvideos/streaming-system
compare: 78499a883b78
Choose a head ref
  • 18 commits
  • 31 files changed
  • 3 contributors

Commits on Aug 3, 2014

  1. Update project layout to post 1.4

    @funkybob
    funkybob committed Aug 3, 2014
    Copy the full SHA
    f23c822 View commit details
    Browse the repository at this point in the history

  2. Simplify common views

    @funkybob
    funkybob committed Aug 3, 2014
    Copy the full SHA
    a567cc7 View commit details
    Browse the repository at this point in the history

  3. Tidy with flake8

    @funkybob
    funkybob committed Aug 3, 2014
    Copy the full SHA
    1e13377 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. Start purging locals()

    @funkybob
    funkybob committed Aug 4, 2014
    Copy the full SHA
    277f9ec View commit details
    Browse the repository at this point in the history

  2. Start using {% static %}

    @funkybob
    funkybob committed Aug 4, 2014
    Copy the full SHA
    944ea0b View commit details
    Browse the repository at this point in the history

  3. Remove django-extensions

    @funkybob
    funkybob committed Aug 4, 2014
    Copy the full SHA
    dd18dec View commit details
    Browse the repository at this point in the history

  4. Start tidying tracker

    @funkybob
    funkybob committed Aug 4, 2014
    Copy the full SHA
    aad674b View commit details
    Browse the repository at this point in the history

  5. Change from cmp= to key= for sorted calls

    @funkybob
    funkybob committed Aug 4, 2014
    Copy the full SHA
    5ff7f8a View commit details
    Browse the repository at this point in the history

  6. Move site-specific middleware into site module

    @funkybob
    funkybob committed Aug 4, 2014
    Copy the full SHA
    88b9448 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2015

  1. Make this a module

    @funkybob
    funkybob committed Jan 8, 2015
    Copy the full SHA
    aa2305f View commit details
    Browse the repository at this point in the history

  2. Tidy up with flake8

    @funkybob
    funkybob committed Jan 8, 2015
    Copy the full SHA
    3c823d8 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2016

  1. Merge remote-tracking branch 'funkybob/master' into grand-funk-railroad

    @micolous
    micolous committed Jan 28, 2016
    Copy the full SHA
    1b16fbf View commit details
    Browse the repository at this point in the history

  2. Lock to 1.7 for now

    @micolous
    micolous committed Jan 28, 2016
    Copy the full SHA
    664c94c View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2016

  1. Django 1.7 fixes, purge all the simplejson

    @micolous
    micolous committed Jan 29, 2016
    Copy the full SHA
    983d03e View commit details
    Browse the repository at this point in the history

  2. Purge more simplejson-isms, fix tests

    @micolous
    micolous committed Jan 29, 2016
    Copy the full SHA
    5d5ae8b View commit details
    Browse the repository at this point in the history

  3. Fix some deprecated things in Django 1.8

    @micolous
    micolous committed Jan 29, 2016
    Copy the full SHA
    6c0ebf0 View commit details
    Browse the repository at this point in the history

  4. flake8 fixes

    @micolous
    micolous committed Jan 29, 2016
    Copy the full SHA
    3dd4845 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2016

  1. Merge pull request #113 from micolous/grand-funk-railroad 

    Merging @funkybob's Django 1.7 port to master
    @mithro
    mithro committed Jan 30, 2016
    Copy the full SHA
    78499a8 View commit details
    Browse the repository at this point in the history