Code

add book language ID fields#305

Code

Open

baieric wants to merge 36 commits intowikitongues:masterwikitongues/poly:masterfrom uwblueprint:ontology-beuwblueprint/poly:ontology-beCopy head branch name to clipboard

+7,107-984,720

Commits

Commits on Mar 4, 2018

• [setup-videos-page] create videos controller and view

  

  Jenny Sun

  committed
  8748959

  Copy full SHA for 8748959

• Remove node_modules

  andyzg

  committed
  1b6e742

  Copy full SHA for 1b6e742

• Update package.json, set up starting files

  andyzg

  committed
  74b0321

  Copy full SHA for 74b0321

• my bad

  andyzg

  committed
  26275e2

  Copy full SHA for 26275e2

• Setup stylus

  andyzg

  committed
  24c7a2f

  Copy full SHA for 24c7a2f

Commits on Mar 11, 2018

• Added styling

  andyzg

  committed
  50e4932

  Copy full SHA for 50e4932

• Modify CSS

  andyzg

  committed
  68c19eb

  Copy full SHA for 68c19eb

• Added video grids

  andyzg

  committed
  7e38139

  Copy full SHA for 7e38139

• Remove compiled assets

  andyzg

  committed
  88d0a5e

  Copy full SHA for 88d0a5e

• Added README

  andyzg

  committed
  7f3a2cf

  Copy full SHA for 7f3a2cf

Commits on Mar 18, 2018

• Started video page

  andyzg

  committed
  6cb70ed

  Copy full SHA for 6cb70ed

• Removed video react, finished video page

  andyzg

  committed
  cbede59

  Copy full SHA for cbede59

• created video components

  

  Jenny Sun

  committed
  f8980cb

  Copy full SHA for f8980cb

• Merge branch 'setup_videos_page'

  

  Jenny Sun

  committed
  ab65b60

  Copy full SHA for ab65b60

Commits on Mar 20, 2018

• Load data from CSV as placeholder

  imruahmed

  committed
  f9bb64e

  Copy full SHA for f9bb64e

Commits on Mar 21, 2018

• Merge pull request #2 from uwblueprint/load_dummy_data

  Show description for 417beeb
  imruahmed

  authored
  417beeb

  Copy full SHA for 417beeb

Commits on Mar 22, 2018

• initial setup

  

  Maggie Liu

  authored and

  Maggie Liu

  committed
  e2fafde

  Copy full SHA for e2fafde

• render video focus view

  

  Maggie Liu

  authored and

  Maggie Liu

  committed
  cccaaf6

  Copy full SHA for cccaaf6

Commits on Mar 23, 2018

• finalize react component

  

  Maggie Liu

  authored and

  Maggie Liu

  committed
  3d030a4

  Copy full SHA for 3d030a4

• finalize videos controller

  

  Maggie Liu

  authored and

  Maggie Liu

  committed
  966fa9e

  Copy full SHA for 966fa9e

• fix quotation marks

  

  Maggie Liu

  authored and

  Maggie Liu

  committed
  a979ae5

  Copy full SHA for a979ae5

• remove comments

  

  Maggie Liu

  authored and

  Maggie Liu

  committed
  a85b7a1

  Copy full SHA for a85b7a1

• make sure /videos/index is a valid route

  

  Maggie Liu

  authored and

  Maggie Liu

  committed
  6bc2b2a

  Copy full SHA for 6bc2b2a

• Merge pull request #3 from uwblueprint/set_up_video_controller

  Show description for 69e26e1
  mgyliu

  authored
  69e26e1

  Copy full SHA for 69e26e1

• Prepare for demo, modify title, add icon, add navigation between list and videos

  andyzg

  committed
  7ab1934

  Copy full SHA for 7ab1934

• Add back img

  andyzg

  committed
  d562ace

  Copy full SHA for d562ace

• Use proper video thumbnail

  andyzg

  committed
  b74f9dd

  Copy full SHA for b74f9dd

• Merge pull request #4 from uwblueprint/prep-demo

  Show description for e620612
  andyzg

  authored
  e620612

  Copy full SHA for e620612

Commits on Apr 26, 2018

• Added video urls

  andyzg

  committed
  8987b10

  Copy full SHA for 8987b10

• Add functionality to frontend, comments

  andyzg

  committed
  fd082f0

  Copy full SHA for fd082f0

• If SRT url exists, add

  andyzg

  committed
  a1165e7

  Copy full SHA for a1165e7

Commits on May 21, 2018

• add book's language IDs to DB and controllers

  baieric

  committed
  9a72948

  Copy full SHA for 9a72948

• allow glottocode param to be nil

  baieric

  committed
  a017829

  Copy full SHA for a017829

Commits on Jun 3, 2018

• Update from wikitongues/master

  uti0mnia

  committed
  2dc2810

  Copy full SHA for 2dc2810

Commits on Jun 6, 2018

• Merge pull request #7 from uwblueprint/update-fork

  Show description for d2b949e
  uti0mnia

  authored
  d2b949e

  Copy full SHA for d2b949e

Commits on Jun 19, 2018

• Merge branch 'master' into ontology-be

  

  Casey McLewin

  committed
  e37fcd1

  Copy full SHA for e37fcd1