Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make gum demos use adapter.js and attachMediaStream #517

Merged
merged 12 commits into from Jun 22, 2015
Merged

make gum demos use adapter.js and attachMediaStream #517

merged 12 commits into from Jun 22, 2015

Commits on Jun 5, 2015

  1. make gum demos use adapter.js and attachMediaStream

    @fippo
    fippo committed Jun 5, 2015
    Copy the full SHA
    5dcd60b View commit details
    Browse the repository at this point in the history

  2. fix variable name

    @fippo
    fippo committed Jun 5, 2015
    Copy the full SHA
    2ca6cd3 View commit details
    Browse the repository at this point in the history

  3. request video in gum

    @fippo
    fippo committed Jun 5, 2015
    Copy the full SHA
    5cdf4aa View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2015

  1. adapter-ify all the getusermedia things

    @fippo
    fippo committed Jun 7, 2015
    Copy the full SHA
    96e00d1 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2015

  1. stop all tracks instead of calling ms.stop()

    @fippo
    fippo committed Jun 12, 2015
    Copy the full SHA
    6f17546 View commit details
    Browse the repository at this point in the history

  2. make grunt happy

    @fippo
    fippo committed Jun 12, 2015
    Copy the full SHA
    ea1590c View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2015

  1. remove check for number of audio/video tracks

    @fippo
    fippo committed Jun 13, 2015
    Copy the full SHA
    9bf89c9 View commit details
    Browse the repository at this point in the history

  2. GUM is shimmed by adapter

    @fippo
    fippo committed Jun 13, 2015
    Copy the full SHA
    789ff83 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2015

  1. Merge remote-tracking branch 'upstream/master' into harmonize-demos 

    Conflicts:
	src/content/getusermedia/canvas/js/main.js
    @fippo
    fippo committed Jun 19, 2015
    Copy the full SHA
    e243b8a View commit details
    Browse the repository at this point in the history

  2. use document.querySelector

    @fippo
    fippo committed Jun 19, 2015
    Copy the full SHA
    2f1240b View commit details
    Browse the repository at this point in the history

  3. edge is supported as well (for getUserMedia)

    @fippo
    fippo committed Jun 19, 2015
    Copy the full SHA
    18c07e5 View commit details
    Browse the repository at this point in the history

  4. bump adapter to 1db82d714bdddf05b881657282e8445a36b10ad5

    @fippo
    fippo committed Jun 19, 2015
    Copy the full SHA
    d4c4808 View commit details
    Browse the repository at this point in the history