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: StreetVoice/django-elastic-transcoder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: morris-tech/django-elastic-transcoder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 16 commits
  • 5 files changed
  • 4 contributors

Commits on Jan 21, 2016

  1. Adding missing migration.

    @trumpet2012
    trumpet2012 committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    abc67fd View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2016

  1. Merge pull request #1 from morris-tech/patch-1 

    Fixed django warning
    @trumpet2012
    trumpet2012 committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    f747777 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2016

  1. Notifications for jobs that had errors were breaking when the message… 

    … dictionary did not contain the `messageDetails` key. So instead we add the entire message dictionary to the job for more useful debugging information.
    @trumpet2012
    trumpet2012 committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    737a95e View commit details
    Browse the repository at this point in the history

  2. Notifications for jobs that had errors were breaking when the message… 

    … dictionary did not contain the `messageDetails` key. So instead we add the entire message dictionary to the job for more useful debugging information.

(cherry picked from commit 737a95e)
    @trumpet2012
    trumpet2012 committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    c466ecc View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2016

  1. Merge remote-tracking branch 'origin/job-error-handling'

    @trumpet2012
    trumpet2012 committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    ac07a4f View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2016

  1. took out asserts 

    When running on EC2 the AWS_* variables are set implicitly by IAM. They aren't required.
    @wgiddens
    wgiddens committed Mar 2, 2016
    Configuration menu
    Copy the full SHA
    7f1bd77 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2016

  1. Merge pull request #2 from wgiddens/patch-1 

    took out asserts
    @AdamBolfik
    AdamBolfik committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    81be111 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2016

  1. adding commit to __init__ to check pip updating

    @trumpet2012
    trumpet2012 committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    9f07573 View commit details
    Browse the repository at this point in the history

  2. removing test comment

    @trumpet2012
    trumpet2012 committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    056ffa4 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2016

  1. app-44 adding back ng-init

    @trumpet2012
    trumpet2012 committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    4c47b05 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from morris-tech/fix-django-url-warnings 

    Fixed django warnings
    @trumpet2012
    trumpet2012 authored Jul 7, 2016
    Configuration menu
    Copy the full SHA
    6741267 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/StreetVoice/django-elasti… 

    …c-transcoder into StreetVoice-master
    @trumpet2012
    trumpet2012 committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    6c17ae5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'StreetVoice-master'

    @trumpet2012
    trumpet2012 committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    478a109 View commit details
    Browse the repository at this point in the history

  5. merging url changes

    @trumpet2012
    trumpet2012 committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    44546b1 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. Upgrading to django 1.10. Fixed import issue in dj_elastictranscoder.

    @trumpet2012
    trumpet2012 committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    77c64ba View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from morris-tech/django-1.10-upgrade 

    Upgrading to django 1.10. Fixed import issue in dj_elastictranscoder.
    @trumpet2012
    trumpet2012 authored Aug 16, 2016
    Configuration menu
    Copy the full SHA
    7b14e34 View commit details
    Browse the repository at this point in the history
Loading