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: charisma-lab/GroundedCoding
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: export_to_csv
Choose a base ref
...
head repository: charisma-lab/GroundedCoding
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 16 commits
  • 15 files changed
  • 4 contributors

Commits on Sep 12, 2019

  1. editing

    @CHARISMAlab
    CHARISMAlab authored Sep 12, 2019
    Configuration menu
    Copy the full SHA
    898397f View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @CHARISMAlab
    CHARISMAlab authored Sep 12, 2019
    Configuration menu
    Copy the full SHA
    896335a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:charisma-lab/GroundedCoding

    @CHARISMAlab
    CHARISMAlab committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    68c325f View commit details
    Browse the repository at this point in the history

  4. Un-hardcoded the IP so all can deploy

    @CHARISMAlab
    CHARISMAlab committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    604b2e2 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2019

  1. changed page layout

    @philipsun1990
    philipsun1990 committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    c0d5508 View commit details
    Browse the repository at this point in the history

  2. changed page layout

    @philipsun1990
    philipsun1990 committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    4c61a5a View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2019

  1. start session

    @philipsun1990
    philipsun1990 committed Sep 21, 2019
    Configuration menu
    Copy the full SHA
    25c0986 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2019

  1. We can now see video stream of the laptop's camera from any device. 

    This makes the web interface usable on multiple devices by displayng
video stream from the server.

We now display video using miguelgrinberg's code which uses OpenCV

Removed references to the video streaming which used pure HTML+JS
    @knightsamar
    knightsamar committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    a173020 View commit details
    Browse the repository at this point in the history

  2. Making the server threaded allows the same video to be viewed from mu… 

    …ltiple devices.

(Or so I guess)
    @knightsamar
    knightsamar committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    acff597 View commit details
    Browse the repository at this point in the history

  3. Removing supporting files for old video-string and bringing in new ones

    @knightsamar
    knightsamar committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    282e3dd View commit details
    Browse the repository at this point in the history

  4. We don;t support recording or snapshotting with this video streaming … 

    …method
    @knightsamar
    knightsamar committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    86906b4 View commit details
    Browse the repository at this point in the history

  5. Updated requirements.txt to suit our new video streaming method

    @knightsamar
    knightsamar committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    c334cdf View commit details
    Browse the repository at this point in the history

  6. add more label

    @philipsun1990
    philipsun1990 committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    da1cc0b View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2019

  1. Merge branch 'opencv_video' into start_session

    @philipsun1990
    philipsun1990 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    db19f11 View commit details
    Browse the repository at this point in the history

  2. Update .gitignore 

    ignore mac os Store file
    @philipsun1990
    philipsun1990 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    7ab1055 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2019

  1. "add more" hyperlink 

    make "add more" hyperlink work
    @philipsun1990
    philipsun1990 committed Sep 30, 2019
    Configuration menu
    Copy the full SHA
    f5cf128 View commit details
    Browse the repository at this point in the history
Loading