Code

Cutting edge#16

Code

Merged

larjohn merged 17 commits intomasterokgreece/indigo:masterfrom cutting-edgeokgreece/indigo:cutting-edgeCopy head branch name to clipboardJun 20, 2017

+12,714-2,677

Commits

Commits on May 10, 2017

• Integrated DAM

  larjohn

  committed
  b87fe2b

  Copy full SHA for b87fe2b

Commits on May 16, 2017

• DAM integration: actually wait for job to finish (retry n times, with more time between each effort)

  larjohn

  committed
  feacbd3

  Copy full SHA for feacbd3

Commits on May 24, 2017

• DAM integration: cleaner metadata

  larjohn

  committed
  b524cc7

  Copy full SHA for b524cc7

Commits on May 28, 2017

• DAM integration: metadata of single algorithm coming from DAM

  larjohn

  committed
  a59b7e3

  Copy full SHA for a59b7e3

Commits on Jun 5, 2017

• Infinite scrolling for index page, dependencies update

  larjohn

  committed
  9ed752f

  Copy full SHA for 9ed752f

• Infinite scrolling for index page, dependencies update

  larjohn

  committed
  b1620ce

  Copy full SHA for b1620ce

Commits on Jun 8, 2017

• Infinite scrolling for index page, dependencies update

  larjohn

  committed
  3e6d784

  Copy full SHA for 3e6d784

• Infinite scrolling for index page, dependencies update

  larjohn

  committed
  6066313

  Copy full SHA for 6066313

• Infinite scrolling for index page, dependencies update

  larjohn

  committed
  1e49853

  Copy full SHA for 1e49853

• Infinite scrolling for index page, dependencies update

  larjohn

  committed
  bb4cb79

  Copy full SHA for bb4cb79

• Infinite scrolling for index page, dependencies update

  larjohn

  committed
  4685007

  Copy full SHA for 4685007

Commits on Jun 10, 2017

• Rebuilt to resolve dependency issues

  larjohn

  committed
  c50592a

  Copy full SHA for c50592a

Commits on Jun 11, 2017

• GUI overhaul (work in progress)

  larjohn

  committed
  6a73ccc

  Copy full SHA for 6a73ccc

Commits on Jun 13, 2017

• Fix for server start

  larjohn

  committed
  95ef392

  Copy full SHA for 95ef392

Commits on Jun 19, 2017

• More GUI integration

  larjohn

  committed
  6f47165

  Copy full SHA for 6f47165

• More GUI integration

  larjohn

  committed
  d314f8a

  Copy full SHA for d314f8a

Commits on Jun 20, 2017

• Merge branch 'master' into cutting-edge

  larjohn

  authored
  66312fd

  Copy full SHA for 66312fd