Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Example site layout updates. #44

Open
wants to merge 83 commits into from

9 participants

Allan Bogh Ben Brittain coderaiser feiyunruyue Juan Batiz-Benet David Peter Matt Null Daniel Kutik Dennis
Allan Bogh

Cherry-pick commit: ajbogh@cab9299

Git shows 82 commits for some reason, not sure why. Feel free to cherry-pick for safety.

In the above commit I changed the example site layout. The remote videos are laid out on the left in a similar row/column format as before. The subdivide function has been fixed and the remote videos have been muted to prevent echoing in local testing. The audio can be unmuted by right-clicking the video.

The buttons are now on the right with the local video below them. The chat section is below the local video, taking up the remainder of the space. The toggle chat button is removed but it can be added back in at a later date.

Removing a remote video will now cause a subdivide task to execute once more.

The background has been changed to black to bring out more of the video.

Dennis and others added some commits
Dennis Initial commit 6ce5c27
Dennis Mårtensson now giving the socket.io and client fils a3e761f
Dennis Mårtensson new style and fullscreen ca5a103
Dennis Mårtensson git fork and new readme d69cfa1
Dennis Mårtensson remove of script 6d169d5
Dennis Mårtensson fix readme 5733cb9
Dennis Mårtensson added rooms and abstracted away the server code 22e6fc8
Dennis Mårtensson serve client from server automatecly 0e5f6cc
Dennis Mårtensson setup for deployment 5a47c82
Dennis Mårtensson update the readme c3e8821
Dennis Mårtensson remove of unused files 1c2de92
Dennis Mårtensson chanched for localhost use 8230f9b
Dennis Mårtensson new instructions on how to setup in the readme c4d4e8f
Dennis Mårtensson fix the ``` int the readme dbb8a4c
Dennis Mårtensson fix the ``` int the readme 6aa8b56
Dennis Mårtensson fix the ``` int the readme 85749d5
Ben Brittain cavedweller add stuff for demo 2ba24fa
Dennis Mårtensson added message if peerconnection is not supported b1b4542
Ben Brittain cavedweller make local video mirror ef3087d
Ben Brittain cavedweller make local remote video not mirror 824ee97
Dennis Mårtensson chanched to use the new callback API 77d2b73
Dennis Mårtensson update of fork in index 6bfef44
Dennis Mårtensson updated readme 421d599
Dennis Mårtensson add /#1 in the readme links 728098c
Dennis Mårtensson setup for loack use c002a3c
Dennis Mårtensson edited for use with the only websocket part e6cad94
Dennis Mårtensson fix for issue 1 2e20bc7
Dennis Mårtensson remove socket.io dependenc and remove of auto set room 394459a
Dennis Mårtensson added remove of socket.id from room on close d6338f5
Ben Brittain cavedweller symlink the clientside code 8feb295
Ben Brittain cavedweller update for 0.0.1 release 239f033
Ben Brittain cavedweller update for 0.0.1 release 31e6a74
Dennis Mårtensson added chat 226ef3a
Dennis Mårtensson fixed chat repeat 61a0fa1
Dennis Mårtensson clean up some log e7fedbb
Dennis Mårtensson add dependency 7e974e2
Ben Brittain cavedweller Merge pull request #2 from webRTC/websocket
Websocket
36036ac
Dennis Mårtensson removed nodejitsu thinks c1e2d60
Dennis Mårtensson Merge branch 'master' of https://github.com/webRTC/webrtc.io-demo 308684d
Ben Brittain cavedweller bump version num and clean up NPM a404d7a
Dennis Mårtensson fix websocket problems with lisen to server effe583
Dennis Mårtensson chance of api fic 04fd812
Dennis Mårtensson fix for ln -s d1ea339
Dennis Mårtensson fix symlink 64b00fe
Dennis Mårtensson add .swp to gitignore 30c1ede
coderaiser coderaiser added suport of Chrome Version 25.0.1323.0 canary e6bfa10
Ben Brittain cavedweller Merge pull request #6 from coderaiser/patch-1
added suport of Chrome Version 25.0.1323.0 canary
b7446ff
feiyunruyue feiyunruyue Update example/index.html
comment "rtc.attachStream(stream, 'you');"
3daa35d
Dennis Merge pull request #9 from feiyunruyue/master
comment the repeated code
243c217
Juan Batiz-Benet jbenet nits whitespace 7a2bd70
Juan Batiz-Benet jbenet use webrtc.io-client directly (symlink was broken) eb46e8d
Juan Batiz-Benet jbenet DataChannel support (with fallback)
This commit adds support for the WebRTC DataChannel API.
If available, it sends all chat messages through DataChannel.
If not, it falls back to using the websocket.
5e65ada
Juan Batiz-Benet jbenet stylefix - removed commas ending hash af0231f
David Peter sarenji Merge pull request #11 from jbenet/master
DataChannel support
aa38365
Daniel Kutik Connect WebSocket relative to window.location b1aaef0
Daniel Kutik Updated dependencies from express 2.5.1 to express 3.1.0 66bc37e
Daniel Kutik Small mistake: removed duplicate of 'server =' 2c4fd93
David Peter sarenji Merge pull request #12 from danielkutik/master
Connect WebSocket relative to window.location
dd775f0
Daniel Kutik variable should be declared 15a7472
Ben Brittain cavedweller update demo link ca6e5ba
Ben Brittain cavedweller put in actuall link 839208e
David Peter sarenji Merge pull request #13 from danielkutik/master
variable should be declared
5864d2b
Matt Null mattnull fixed a url fragment issue with web socket url on page load for room …
…hashes

There is an issue on page load when you have a room hash in the url.
You get a url fragment error and the socket connection does not succeed
654f9e2
David Peter sarenji Merge pull request #14 from mattnull/master
URL fragment issue
8ef0dce
Dennis Mårtensson new demo added and link to the demo page is now correct 7c6f3dd
Dennis Mårtensson remove old version 5b7c8a9
Dennis Mårtensson fix in the readme setup instructions f195d17
Dennis Mårtensson remove google analytics 1967058
Daniel Kutik danielkutik declared 80bc181
Daniel Kutik danielkutik Removed unused variable fef6185
Daniel Kutik danielkutik Server listen port can now be defined in environment variables (usefu…
…l for Heroku, CloudBees, cloud9), fallback to 8080
8502bf8
David Peter sarenji Merge pull request #18 from danielkutik/master
Listing port defined in env variable
4d3492f
Dennis Mårtensson default port now 8080 cf3214c
Dennis Mårtensson fix the link text to 2e596b2
Daniel Kutik danielkutik Updated webrtc.io.js 001fe6b
Dennis dennismartensson Merge pull request #19 from danielkutik/master
Updated webrtc.io.js
8bd941d
Dennis Mårtensson now firefox to firefox works. It looks like there is a conection betw…
…een firefox and chrome to but I have not gotten the media to play back. I dont know why the video is not playing back in the video tag... any one please have a look
e9b8313
Dennis Mårtensson fix the problems in the last build 6b0023f
Dennis Mårtensson sorry did miss some of them e40f50e
Dennis dennismartensson add toogle to message and made the video of you smaller 79b1a15
Allan Bogh ajbogh Modified website layout and disabled video audio by default to preven…
…t echo during local testing. Videos need a hover control for the audio.
cab9299
Allan Bogh ajbogh Fixed merge conflicts. e78cadc
Allan Bogh ajbogh Added a Join Room button instead of the Create Room button and create…
…d a new popup screen for joining existing rooms. Added some code to clean up the room list when someone disconnects from a room. Changed the use of hashtags for joining rooms to query strings to force the browser to make a new connection. subdivideVideos function to properly calculate video sizes given a predetermined aspect ratio (4/3).
ee25283
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 31, 2012
  1. Initial commit

    Dennis authored
  2. now giving the socket.io and client fils

    Dennis Mårtensson authored
  3. new style and fullscreen

    Dennis Mårtensson authored
  4. git fork and new readme

    Dennis Mårtensson authored
  5. remove of script

    Dennis Mårtensson authored
  6. fix readme

    Dennis Mårtensson authored
Commits on Aug 2, 2012
  1. added rooms and abstracted away the server code

    Dennis Mårtensson authored
  2. serve client from server automatecly

    Dennis Mårtensson authored
  3. setup for deployment

    Dennis Mårtensson authored
Commits on Aug 3, 2012
  1. update the readme

    Dennis Mårtensson authored
  2. remove of unused files

    Dennis Mårtensson authored
  3. chanched for localhost use

    Dennis Mårtensson authored
  4. new instructions on how to setup in the readme

    Dennis Mårtensson authored
  5. fix the ``` int the readme

    Dennis Mårtensson authored
  6. fix the ``` int the readme

    Dennis Mårtensson authored
  7. fix the ``` int the readme

    Dennis Mårtensson authored
  8. Ben Brittain

    add stuff for demo

    cavedweller authored
  9. added message if peerconnection is not supported

    Dennis Mårtensson authored
Commits on Aug 4, 2012
  1. Ben Brittain

    make local video mirror

    cavedweller authored
  2. Ben Brittain
  3. chanched to use the new callback API

    Dennis Mårtensson authored
  4. update of fork in index

    Dennis Mårtensson authored
Commits on Aug 6, 2012
  1. updated readme

    Dennis Mårtensson authored
  2. add /#1 in the readme links

    Dennis Mårtensson authored
  3. setup for loack use

    Dennis Mårtensson authored
Commits on Aug 7, 2012
  1. edited for use with the only websocket part

    Dennis Mårtensson authored
  2. fix for issue 1

    Dennis Mårtensson authored
Commits on Aug 8, 2012
  1. remove socket.io dependenc and remove of auto set room

    Dennis Mårtensson authored
  2. added remove of socket.id from room on close

    Dennis Mårtensson authored
Commits on Aug 10, 2012
  1. Ben Brittain
  2. Ben Brittain

    update for 0.0.1 release

    cavedweller authored
  3. Ben Brittain

    update for 0.0.1 release

    cavedweller authored
  4. added chat

    Dennis Mårtensson authored
  5. fixed chat repeat

    Dennis Mårtensson authored
  6. clean up some log

    Dennis Mårtensson authored
  7. add dependency

    Dennis Mårtensson authored
  8. Ben Brittain

    Merge pull request #2 from webRTC/websocket

    cavedweller authored
    Websocket
  9. removed nodejitsu thinks

    Dennis Mårtensson authored
Commits on Aug 11, 2012
  1. Merge branch 'master' of https://github.com/webRTC/webrtc.io-demo

    Dennis Mårtensson authored
  2. Ben Brittain
  3. fix websocket problems with lisen to server

    Dennis Mårtensson authored
  4. chance of api fic

    Dennis Mårtensson authored
Commits on Aug 14, 2012
  1. fix for ln -s

    Dennis Mårtensson authored
  2. fix symlink

    Dennis Mårtensson authored
Commits on Aug 18, 2012
  1. add .swp to gitignore

    Dennis Mårtensson authored
Commits on Nov 12, 2012
  1. coderaiser
Commits on Nov 19, 2012
  1. Ben Brittain

    Merge pull request #6 from coderaiser/patch-1

    cavedweller authored
    added suport of Chrome Version 25.0.1323.0 canary
Commits on Jan 11, 2013
  1. feiyunruyue

    Update example/index.html

    feiyunruyue authored
    comment "rtc.attachStream(stream, 'you');"
Commits on Jan 17, 2013
  1. Merge pull request #9 from feiyunruyue/master

    Dennis authored
    comment the repeated code
Commits on Jan 27, 2013
  1. Juan Batiz-Benet

    nits whitespace

    jbenet authored
  2. Juan Batiz-Benet
  3. Juan Batiz-Benet

    DataChannel support (with fallback)

    jbenet authored
    This commit adds support for the WebRTC DataChannel API.
    If available, it sends all chat messages through DataChannel.
    If not, it falls back to using the websocket.
Commits on Jan 28, 2013
  1. Juan Batiz-Benet
Commits on Jan 29, 2013
  1. David Peter

    Merge pull request #11 from jbenet/master

    sarenji authored
    DataChannel support
Commits on Feb 6, 2013
  1. Connect WebSocket relative to window.location

    Daniel Kutik authored
  2. Small mistake: removed duplicate of 'server ='

    Daniel Kutik authored
  3. David Peter

    Merge pull request #12 from danielkutik/master

    sarenji authored
    Connect WebSocket relative to window.location
Commits on Feb 7, 2013
  1. variable should be declared

    Daniel Kutik authored
Commits on Feb 9, 2013
  1. Ben Brittain

    update demo link

    cavedweller authored
  2. Ben Brittain

    put in actuall link

    cavedweller authored
Commits on Feb 11, 2013
  1. David Peter

    Merge pull request #13 from danielkutik/master

    sarenji authored
    variable should be declared
Commits on Feb 18, 2013
  1. Matt Null

    fixed a url fragment issue with web socket url on page load for room …

    mattnull authored
    …hashes
    
    There is an issue on page load when you have a room hash in the url.
    You get a url fragment error and the socket connection does not succeed
  2. David Peter

    Merge pull request #14 from mattnull/master

    sarenji authored
    URL fragment issue
Commits on Feb 21, 2013
  1. new demo added and link to the demo page is now correct

    Dennis Mårtensson authored
  2. remove old version

    Dennis Mårtensson authored
  3. fix in the readme setup instructions

    Dennis Mårtensson authored
Commits on Feb 22, 2013
  1. remove google analytics

    Dennis Mårtensson authored
Commits on Mar 3, 2013
  1. Daniel Kutik

    declared

    danielkutik authored
  2. Daniel Kutik

    Removed unused variable

    danielkutik authored
  3. Daniel Kutik

    Server listen port can now be defined in environment variables (usefu…

    danielkutik authored
    …l for Heroku, CloudBees, cloud9), fallback to 8080
Commits on Mar 4, 2013
  1. David Peter

    Merge pull request #18 from danielkutik/master

    sarenji authored
    Listing port defined in env variable
  2. default port now 8080

    Dennis Mårtensson authored
  3. fix the link text to

    Dennis Mårtensson authored
Commits on Mar 6, 2013
  1. Daniel Kutik

    Updated webrtc.io.js

    danielkutik authored
  2. Dennis

    Merge pull request #19 from danielkutik/master

    dennismartensson authored
    Updated webrtc.io.js
Commits on Mar 17, 2013
  1. now firefox to firefox works. It looks like there is a conection betw…

    Dennis Mårtensson authored
    …een firefox and chrome to but I have not gotten the media to play back. I dont know why the video is not playing back in the video tag... any one please have a look
  2. fix the problems in the last build

    Dennis Mårtensson authored
  3. sorry did miss some of them

    Dennis Mårtensson authored
Commits on Mar 22, 2013
  1. Dennis
Commits on Mar 26, 2014
  1. Allan Bogh

    Modified website layout and disabled video audio by default to preven…

    ajbogh authored
    …t echo during local testing. Videos need a hover control for the audio.
  2. Allan Bogh

    Fixed merge conflicts.

    ajbogh authored
Commits on Mar 31, 2014
  1. Allan Bogh

    Added a Join Room button instead of the Create Room button and create…

    ajbogh authored
    …d a new popup screen for joining existing rooms. Added some code to clean up the room list when someone disconnects from a room. Changed the use of hashtags for joining rooms to query strings to force the browser to make a new connection. subdivideVideos function to properly calculate video sizes given a predetermined aspect ratio (4/3).
Something went wrong with that request. Please try again.