Code

Share keys#4975

Code

Merged

nf-s merged 14 commits intonextTerriaJS/terriajs:nextfrom share-keysTerriaJS/terriajs:share-keysCopy head branch name to clipboardNov 26, 2020

+772-176

Commits

Commits on Sep 30, 2020

• WIP: Porting share keys. See #4774

  tephenavies

  committed
  cfe3f6b

  Copy full SHA for cfe3f6b

Commits on Nov 7, 2020

• Make shareKeys work for JSON catalogs

  tephenavies

  committed
  e3a6e29

  Copy full SHA for e3a6e29

Commits on Nov 10, 2020

• Allow adding shareKeys in addModel

  tephenavies

  committed
  f8893cf

  Copy full SHA for f8893cf

Commits on Nov 11, 2020

• Merge remote-tracking branch 'origin/next' into share-keys

  tephenavies

  committed
  fb180c9

  Copy full SHA for fb180c9

• Fix calls to upsertModelFromJson

  tephenavies

  committed
  b3abb39

  Copy full SHA for b3abb39

• Fix trying to match by share key stopping proper creation of new models

  tephenavies

  committed
  867dfdd

  Copy full SHA for 867dfdd

• Promisify some tests so that test failures are faster

  Show description for caf17a3
  tephenavies

  committed
  caf17a3

  Copy full SHA for caf17a3

Commits on Nov 16, 2020

• Use shareKeys when deserialising workbench and timeline

  tephenavies

  committed
  bea2150

  Copy full SHA for bea2150

Commits on Nov 18, 2020

• Add shareKeys for magda catalogs and tests

  tephenavies

  committed
  065a2e8

  Copy full SHA for 065a2e8

• Fix orphaned promise

  tephenavies

  committed
  28bb334

  Copy full SHA for 28bb334

• Fix invalid test data

  tephenavies

  committed
  81b02f3

  Copy full SHA for 81b02f3

• Add error message when share keys match but model cannot be found

  tephenavies

  committed
  c1f7c7a

  Copy full SHA for c1f7c7a

Commits on Nov 25, 2020

• Merge remote-tracking branch 'origin/next' into share-keys

  nf-s

  committed
  32f915f

  Copy full SHA for 32f915f

Commits on Nov 26, 2020

• change

  nf-s

  committed
  ca7b953

  Copy full SHA for ca7b953