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: cb4e834fd4eb
Choose a base ref
...
head repository: timvideos/streaming-system
compare: 8519d830d0e9
Choose a head ref
  • 7 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 13, 2013

  1. Added config.private.json.example which should act as a template for … 

    …config.private.json
    @luke-john
    luke-john committed Dec 13, 2013
    Copy the full SHA
    7c6190c View commit details
    Browse the repository at this point in the history

  2. Removed pycon specific lines from config.json.

    @luke-john
    luke-john committed Dec 13, 2013
    Copy the full SHA
    120eb1d View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2013

  1. Updated config.json to use EVENT instead of pycon.

    @luke-john
    luke-john committed Dec 16, 2013
    Copy the full SHA
    05752e0 View commit details
    Browse the repository at this point in the history

  2. Added default logo (text on image).

    @luke-john
    luke-john committed Dec 16, 2013
    Copy the full SHA
    0dd9307 View commit details
    Browse the repository at this point in the history

  3. Updated config.json to use working timvideos urls instead of EVENT.

    @luke-john
    luke-john committed Dec 16, 2013
    Copy the full SHA
    b7ace77 View commit details
    Browse the repository at this point in the history

  4. Set logo to preexisting TimVideos logo.

    @luke-john
    luke-john committed Dec 16, 2013
    Copy the full SHA
    848817b View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2013

  1. Merge pull request #50 from lukejohnosmahi/add/master/config.private.… 

    …json.example

Added config.private.json.example
    @mithro
    mithro committed Dec 18, 2013
    Copy the full SHA
    8519d83 View commit details
    Browse the repository at this point in the history