Code

Ocr#424

Code

Open

atarix83 wants to merge 33 commits intoUniversalViewer:masterUniversalViewer/universalviewer:masterfrom 4Science:ocr4Science/universalviewer:ocrCopy head branch name to clipboard

+19,373-18,316

Commits

Commits on Dec 12, 2016

• Update README.md

  atarix83

  authored
  dc92fef

  Copy full SHA for dc92fef

• Update README.md

  atarix83

  authored
  47b791e

  Copy full SHA for 47b791e

• Added ocr branch files

  atarix83

  committed
  4e776c3

  Copy full SHA for 4e776c3

• modified README.md

  atarix83

  committed
  fd67963

  Copy full SHA for fd67963

• Update bower.json

  atarix83

  authored
  c6ac3fc

  Copy full SHA for c6ac3fc

• Update bower.json

  atarix83

  authored
  16a814e

  Copy full SHA for 16a814e

• Update bower.json

  atarix83

  authored
  ef76ff1

  Copy full SHA for ef76ff1

• Update README.md

  atarix83

  authored
  9e7cac1

  Copy full SHA for 9e7cac1

Commits on Jan 4, 2017

• build updated

  atarix83

  committed
  b351e8a

  Copy full SHA for b351e8a

• Merge branch 'ocr' of https://github.com/4Science/universalviewer into ocr

  atarix83

  committed
  6e5fa7e

  Copy full SHA for 6e5fa7e

Commits on Jan 9, 2017

• build updated

  atarix83

  committed
  61303cf

  Copy full SHA for 61303cf

Commits on Feb 3, 2017

• Hostname configurable in Gruntfile.js

  atarix83

  committed
  5ca8f6b

  Copy full SHA for 5ca8f6b

Commits on Feb 10, 2017

• Merge remote-tracking branch 'upstream/master' into ocr

  Show description for c917af4
  atarix83

  committed
  c917af4

  Copy full SHA for c917af4

• Merge remote-tracking branch 'upstream/master' into ocr

  atarix83

  committed
  2c67bc6

  Copy full SHA for 2c67bc6

Commits on Feb 16, 2017

• Merge remote-tracking branch 'upstream/master' into ocr

  Show description for 20b3874
  atarix83

  committed
  20b3874

  Copy full SHA for 20b3874

• Gruntfile.js changed

  atarix83

  committed
  038d858

  Copy full SHA for 038d858

• Merge branch 'master' of https://github.com/UniversalViewer/universalviewer

  atarix83

  committed
  e72ba09

  Copy full SHA for e72ba09

Commits on Apr 14, 2017

• Merge branch 'master' of https://github.com/UniversalViewer/universalviewer

  atarix83

  committed
  4f798eb

  Copy full SHA for 4f798eb

Commits on Apr 18, 2017

• Add logo image to footer

  atarix83

  committed
  320ac92

  Copy full SHA for 320ac92

• Merge remote-tracking branch 'remotes/origin/master' into ocr

  atarix83

  committed
  c237a6c

  Copy full SHA for c237a6c

• Merge remote-tracking branch 'remotes/origin/master' into ocr

  Show description for 9c9caaa
  atarix83

  committed
  9c9caaa

  Copy full SHA for 9c9caaa

• Merge last commits

  atarix83

  committed
  71adc43

  Copy full SHA for 71adc43

• Add "contributed by" text to settings dialogue

  atarix83

  committed
  85539fd

  Copy full SHA for 85539fd

• Fix async image load issue

  atarix83

  committed
  4c0b66f

  Copy full SHA for 4c0b66f

Commits on Apr 19, 2017

• Merge remote-tracking branch 'remotes/origin/logo' into ocr

  atarix83

  committed
  f0f9d5b

  Copy full SHA for f0f9d5b

• Merge remote-tracking branch 'remotes/origin/logo' into ocr

  atarix83

  committed
  6fcc3b8

  Copy full SHA for 6fcc3b8

• Add configuration parameter for more info website

  atarix83

  committed
  631ee83

  Copy full SHA for 631ee83

• Add logo and contributor information

  atarix83

  committed
  34751d8

  Copy full SHA for 34751d8

• Remove logo padding

  atarix83

  committed
  e38055e

  Copy full SHA for e38055e

• Update build

  atarix83

  committed
  4c8a6ea

  Copy full SHA for 4c8a6ea

• Fix position logo onLoad

  atarix83

  committed
  b75b8b7

  Copy full SHA for b75b8b7

• Merge remote-tracking branch 'remotes/origin/logo' into ocr

  Show description for 64c48a2
  atarix83

  committed
  64c48a2

  Copy full SHA for 64c48a2

• Update build

  atarix83

  committed
  77121ed

  Copy full SHA for 77121ed