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

Use Language Ontology API in front-end (proof of concept, do not merge) #306

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open

Use Language Ontology API in front-end (proof of concept, do not merge) #306

wants to merge 35 commits into from

Commits on Mar 4, 2018

  1. [setup-videos-page] create videos controller and view

    Jenny Sun committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    8748959 View commit details
    Browse the repository at this point in the history

  2. Remove node_modules

    @andyzg
    andyzg committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    1b6e742 View commit details
    Browse the repository at this point in the history

  3. Update package.json, set up starting files

    @andyzg
    andyzg committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    74b0321 View commit details
    Browse the repository at this point in the history

  4. my bad

    @andyzg
    andyzg committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    26275e2 View commit details
    Browse the repository at this point in the history

  5. Setup stylus

    @andyzg
    andyzg committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    24c7a2f View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2018

  1. Added styling

    @andyzg
    andyzg committed Mar 11, 2018
    Configuration menu
    Copy the full SHA
    50e4932 View commit details
    Browse the repository at this point in the history

  2. Modify CSS

    @andyzg
    andyzg committed Mar 11, 2018
    Configuration menu
    Copy the full SHA
    68c19eb View commit details
    Browse the repository at this point in the history

  3. Added video grids

    @andyzg
    andyzg committed Mar 11, 2018
    Configuration menu
    Copy the full SHA
    7e38139 View commit details
    Browse the repository at this point in the history

  4. Remove compiled assets

    @andyzg
    andyzg committed Mar 11, 2018
    Configuration menu
    Copy the full SHA
    88d0a5e View commit details
    Browse the repository at this point in the history

  5. Added README

    @andyzg
    andyzg committed Mar 11, 2018
    Configuration menu
    Copy the full SHA
    7f3a2cf View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2018

  1. Started video page

    @andyzg
    andyzg committed Mar 18, 2018
    Configuration menu
    Copy the full SHA
    6cb70ed View commit details
    Browse the repository at this point in the history

  2. Removed video react, finished video page

    @andyzg
    andyzg committed Mar 18, 2018
    Configuration menu
    Copy the full SHA
    cbede59 View commit details
    Browse the repository at this point in the history

  3. created video components

    Jenny Sun committed Mar 18, 2018
    Configuration menu
    Copy the full SHA
    f8980cb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'setup_videos_page'

    Jenny Sun committed Mar 18, 2018
    Configuration menu
    Copy the full SHA
    ab65b60 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2018

  1. Load data from CSV as placeholder

    @imruahmed
    imruahmed committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    f9bb64e View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2018

  1. Merge pull request #2 from uwblueprint/load_dummy_data 

    Load data from a CSV
    @imruahmed
    imruahmed authored Mar 21, 2018
    Configuration menu
    Copy the full SHA
    417beeb View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2018

  1. initial setup

    Maggie Liu authored and Maggie Liu committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    e2fafde View commit details
    Browse the repository at this point in the history

  2. render video focus view

    Maggie Liu authored and Maggie Liu committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    cccaaf6 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2018

  1. finalize react component

    Maggie Liu authored and Maggie Liu committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    3d030a4 View commit details
    Browse the repository at this point in the history

  2. finalize videos controller

    Maggie Liu authored and Maggie Liu committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    966fa9e View commit details
    Browse the repository at this point in the history

  3. fix quotation marks

    Maggie Liu authored and Maggie Liu committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    a979ae5 View commit details
    Browse the repository at this point in the history

  4. remove comments

    Maggie Liu authored and Maggie Liu committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    a85b7a1 View commit details
    Browse the repository at this point in the history

  5. make sure /videos/index is a valid route

    Maggie Liu authored and Maggie Liu committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    6bc2b2a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3 from uwblueprint/set_up_video_controller 

    Set up video controller
    @mgyliu
    mgyliu authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    69e26e1 View commit details
    Browse the repository at this point in the history

  7. Prepare for demo, modify title, add icon, add navigation between list… 

    … and videos
    @andyzg
    andyzg committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    7ab1934 View commit details
    Browse the repository at this point in the history

  8. Add back img

    @andyzg
    andyzg committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    d562ace View commit details
    Browse the repository at this point in the history

  9. Use proper video thumbnail

    @andyzg
    andyzg committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    b74f9dd View commit details
    Browse the repository at this point in the history

  10. Merge pull request #4 from uwblueprint/prep-demo 

    Fix titles, fix navigation, small polish
    @andyzg
    andyzg authored Mar 23, 2018
    Configuration menu
    Copy the full SHA
    e620612 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2018

  1. Added video urls

    @andyzg
    andyzg committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    8987b10 View commit details
    Browse the repository at this point in the history

  2. Add functionality to frontend, comments

    @andyzg
    andyzg committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    fd082f0 View commit details
    Browse the repository at this point in the history

  3. If SRT url exists, add

    @andyzg
    andyzg committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    a1165e7 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2018

  1. Front-end sends language ID in requests, autosuggests languages

    @baieric
    baieric committed May 22, 2018
    Configuration menu
    Copy the full SHA
    2d3fc3b View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2018

  1. Update from wikitongues/master

    @uti0mnia
    uti0mnia committed Jun 3, 2018
    Configuration menu
    Copy the full SHA
    2dc2810 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2018

  1. Merge pull request #7 from uwblueprint/update-fork 

    Update fork from Wikitongues master
    @uti0mnia
    uti0mnia authored Jun 6, 2018
    Configuration menu
    Copy the full SHA
    d2b949e View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. Merge branch 'master' into ontology-fe

    Casey McLewin committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    cddb952 View commit details
    Browse the repository at this point in the history