Code

make up to date with main repo#1

Code

Merged

harleensahni merged 149 commits intoharleensahni:masterharleensahni/xdm:masterfrom adobe:masteradobe/xdm:masterCopy head branch name to clipboardMay 8, 2018

+9,906-8,779

Commits

Commits on Mar 29, 2018

• Fix Issue #206

  Show description for ac9024e
  

  Saurabh Gupta

  committed
  ac9024e

• Merge branch 'master' into campaign-extensions-experienceEvent

  saurabhere

  authored
  a3ce1ce

• @trivial minor fixes suggested in review. Iteration #1.

  

  Saurabh Gupta

  committed
  e04cd20

• Merge branch 'campaign-extensions-experienceEvent' of github.com:saurabhere/xdm into campaign-extensions-experienceEvent

  

  Saurabh Gupta

  committed
  9b047df

Commits on Apr 3, 2018

• Merge branch 'master' into campaign-extensions-experienceEvent

  kstreeter

  authored
  616a1f0

Commits on Apr 4, 2018

• Merge branch 'master' into campaign-extensions-experienceEvent

  trieloff

  authored
  983b0f3

Commits on Apr 5, 2018

• @trivial fixes suggested in review. Iteration #2.

  

  Saurabh Gupta

  committed
  b779b65

• Merge branch 'campaign-extensions-experienceEvent' of github.com:saurabhere/xdm into campaign-extensions-experienceEvent

  

  Saurabh Gupta

  committed
  ab2cbd9

Commits on Apr 9, 2018

• Merge branch 'master' into campaign-extensions-experienceEvent

  trieloff

  authored
  ac7bab7

• Merge branch 'master' into campaign-extensions-experienceEvent

  trieloff

  authored
  2a309fe

Commits on Apr 10, 2018

• Merge branch 'master' into campaign-extensions-experienceEvent

  trieloff

  authored
  c634fd9

• @trivial fixes suggested in review. Iteration #3.

  

  Saurabh Gupta

  committed
  8c8d6d2

• Merge branch 'campaign-extensions-experienceEvent' of github.com:saurabhere/xdm into campaign-extensions-experienceEvent

  

  Saurabh Gupta

  committed
  7fb97a5

• [trivial] clarify control group as holdout group

  trieloff

  authored
  c4bc631

• Merge branch 'master' into campaign-extensions-experienceEvent

  trieloff

  authored
  18f974b

• [trivial] fixes suggested in review. Iteration #4.

  

  Saurabh Gupta

  committed
  a7400fd

Commits on Apr 12, 2018

• Change 'Business Reason" field to explain its use for campaign orchestration.

  Show description for a425c3f
  

  Saurabh Gupta

  committed
  a425c3f

• Renamed metric->metricdefinition

  chrisdegroot

  committed
  163bf54

• renamed example

  chrisdegroot

  committed
  4a27b0e

• renamed docs

  chrisdegroot

  committed
  7b9cd6e

• corrected typo

  chrisdegroot

  committed
  b5de306

Commits on Apr 13, 2018

• Fixing examples to reflect changes to experienceevents.

  

  Saurabh Gupta

  committed
  613bf1f

• Fix the $id format

  jwen-adobe

  committed
  881390c

Commits on Apr 19, 2018

• Merge branch 'master' into campaign-extensions-experienceEvent

  saurabhere

  authored
  7ac8281

• Merge branch 'master' into platform-pr-implemenatations

  trieloff

  authored
  a9b432e

• Merge pull request #261 from adobe/platform-pr-implemenatations

  Show description for 95e5c68
  trieloff

  authored
  95e5c68

• [ci skip] updating documentation

  trieloff

  committed
  5ef4d12

• Merge branch 'master' into campaign-extensions-experienceEvent

  trieloff

  authored
  2736144

• [trivial] Fix examples to reflect changed schema.

  

  Saurabh Gupta

  committed
  d42225f

• Merge branch 'campaign-extensions-experienceEvent' of github.com:saurabhere/xdm into campaign-extensions-experienceEvent

  

  Saurabh Gupta

  committed
  90041a3

• Merge pull request #209 from saurabhere/campaign-extensions-experienceEvent

  Show description for 8fe3a55
  trieloff

  authored
  8fe3a55

• [ci skip] updating documentation

  trieloff

  committed
  d982a06

• Fix default values and $id of campaign extension

  jwen-adobe

  committed
  f867f3f

Commits on Apr 20, 2018

• Merge pull request #268 from adobe/platform-pr-campaign-extension

  Show description for 2f23fa8
  trieloff

  authored
  2f23fa8

• [ci skip] updating documentation

  trieloff

  committed
  bcd88dd

Commits on Apr 21, 2018

• Add listdetails to analytics extension and move customdimensions&customevents back to experienceevent

  jwen-adobe

  committed
  f92cf4e

• Correct $ref to webinfo

  jwen-adobe

  committed
  0d05978

Commits on Apr 25, 2018

• Simplify representation of privileges in access control entries by always using an array.

  agudian

  committed
  877b44e

• Add consumability notice for certain usages of polymorphism.

  agudian

  committed
  464cdc6

• 2018

  trieloff

  authored
  d9f54d0

• Merge pull request #272 from adobe/platform-pr-analytics-extension

  Show description for 546d02f
  trieloff

  authored
  546d02f

• [ci skip] updating documentation

  trieloff

  committed
  cac62a4

• Merge branch 'master' into simplify_ace_privilege_mapping

  trieloff

  authored
  8ab7be9

• Add repo:inheritance to accesscontrolentry

  agudian

  committed
  142bd63

Commits on Apr 26, 2018

• Update jsonschema2md to v1.0.5

  

  Andy Steed

  committed
  c1b1f1a

Commits on Apr 27, 2018

• Merge pull request #279 from adobe/jsonschema2md-v105

  Show description for eab4e05
  trieloff

  authored
  eab4e05

• [ci skip] updating documentation

  trieloff

  committed
  3b55ec8

• Merge branch 'master' into add_inheritance_to_ace

  trieloff

  authored
  91ae406

• Merge pull request #276 from agudian/add_inheritance_to_ace

  Show description for b2c4aad
  trieloff

  authored
  b2c4aad

• [ci skip] updating documentation

  trieloff

  committed
  76b38f9

Commits on Apr 30, 2018

• update CONTRIBUTING with guidance on using namespaces versus nested structure

  kstreeter

  committed
  9b95fb7

• Merge branch 'master' into platform-pr-namespace-consistency

  kstreeter

  authored
  ad2ecb7

• fixes for lint

  kstreeter

  committed
  aa4a58e

• fixing conflicts

  kstreeter

  committed
  855f56f

• fixing conflicts

  kstreeter

  committed
  d93bad0

Commits on May 1, 2018

• Update CONTRIBUTING.md

  kstreeter

  authored
  43d776e

Commits on May 2, 2018

• Merge pull request #284 from adobe/platform-pr-namespace-consistency

  Show description for 149bad9
  trieloff

  authored
  149bad9

• [ci skip] updating documentation

  trieloff

  committed
  d75f882

• Merge branch 'master' into simplify_ace_privilege_mapping

  trieloff

  authored
  d9ca62d

• [ci skip] updating documentation

  trieloff

  committed
  0e15429

• [trivial] fixed npm license warning

  trieloff

  committed
  50bff0e

• Make assetID a plain string, as discussed in #217

  trieloff

  committed
  6d02a97

• Merge branch 'master' into pr-217-assetid

  trieloff

  authored
  83baa75

• Reduce PR #154 so that only the most basic schemas are included

  trieloff

  committed
  336971b

• Merge branch 'master' into issue#251-rename-metric-metricDefinition

  trieloff

  authored
  1cd9560

• Updated description with new wording

  trieloff

  committed
  9c4c1ec

• Updated version number, as this is a breaking change to 0.9.0

  trieloff

  committed
  4f37879

• [ci skip] updating documentation

  trieloff

  committed
  6228784

• [trivial] added changelog to log breaking changes from 0.9.0 in one place

  trieloff

  committed
  fe1bbc3

• Merge pull request #254 from adobe/issue#251-rename-metric-metricDefinition

  Show description for 9be94e9
  trieloff

  authored
  9be94e9

• Merge branch 'master' into issue#251-rename-metric-metricDefinition

  trieloff

  committed
  801c59d

• [ci skip] updating documentation

  trieloff

  committed
  c3f3762

• Update changelog

  trieloff

  committed
  e9d401d

• Merge branch 'master' into issue#251-rename-metric-metricDefinition

  trieloff

  authored
  cf247a2

• Mention changelog for breaking changes

  trieloff

  committed
  470a038

• Merge branch 'master' of github.com:adobe/xdm

  trieloff

  committed
  44b8fc3

• [ci skip] updating documentation

  trieloff

  committed
  53a0bee

• [trivial] include explanation of abstract and concrete schemas

  trieloff

  committed
  8c57e08

• Explain the status attributes

  trieloff

  committed
  29dbdde

• [trivial] lint

  trieloff

  committed
  8c41743

• Explain the @id attribute

  trieloff

  committed
  5262aab

• Use extensions to describe custom and additional properties

  trieloff

  committed
  84cdbfc

• Merge branch 'master' into platform-pr-schema-descriptors-basic

  trieloff

  authored
  5761590

• Merge branch 'master' into pr-217-assetid

  trieloff

  authored
  29097c6

• [trivial] automatically publish stabilizing candidates

  trieloff

  committed
  49e5373

• [ci skip] updating documentation

  trieloff

  committed
  2394818

• [trivial] more line breaks

  trieloff

  committed
  2f2d7f6

• [trivial] lint

  trieloff

  committed
  f3b8514

• [ci skip] updating documentation

  trieloff

  committed
  c653475

• [trivial] ignore STABILIZING in linter

  trieloff

  committed
  bce33c4

• Merge branch 'master' of github.com:adobe/xdm

  trieloff

  committed
  e09ef49

• Stabilize language-alternatives

  trieloff

  authored
  643af22

• [trivial] nicer status reporting

  trieloff

  committed
  9abe73a

• Merge branch 'master' of github.com:adobe/xdm

  trieloff

  committed
  44e335c

• [ci skip] updating documentation

  trieloff

  committed
  f056d0b

• [ci skip] updating documentation

  trieloff

  committed
  a83d4df

• [trivial] link to candidates

  trieloff

  committed
  f491aea

• Merge branch 'master' into platform-pr-schema-descriptors-basic

  kstreeter

  authored
  35aa58c

• Merge branch 'master' into platform-pr-schema-descriptors-basic

  trieloff

  authored
  fa8747c

• [trivial] group by status

  trieloff

  committed
  342a760

• Merge branch 'master' of github.com:adobe/xdm

  trieloff

  committed
  c5aa49a

• [ci skip] updating documentation

  trieloff

  committed
  ac675cd

• Add status for implementation details

  trieloff

  authored
  d6fda6d

• Status for web info

  trieloff

  authored
  64111f7

• Merge branch 'master' into stabilize-language-alternatives

  trieloff

  authored
  0bb6dbb

• Merge pull request #294 from adobe/stabilize-language-alternatives

  Show description for 655b6b6
  trieloff

  authored
  655b6b6

• [ci skip] updating documentation

  trieloff

  committed
  92ee2b6

• Merge branch 'master' into platform-pr-schema-descriptors-basic

  trieloff

  authored
  bb1bd27

• Merge branch 'master' into pr-217-assetid

  trieloff

  authored
  50638c7

• Merge pull request #287 from adobe/pr-217-assetid

  Show description for a828dee
  trieloff

  authored
  a828dee

• [ci skip] updating documentation

  trieloff

  committed
  b1b2ddf

• [trivial] Added comments to stabilization script

  

  Andy Steed

  committed
  45dcc86

• Merge branch 'master' into webinfo-status

  kstreeter

  authored
  5c92edc

• Merge pull request #297 from adobe/webinfo-status

  Show description for 0d19270
  kstreeter

  authored
  0d19270

• Merge branch 'master' into experimental-imp

  kstreeter

  authored
  a922ce7

• Merge pull request #296 from adobe/experimental-imp

  Show description for db9264f
  kstreeter

  authored
  db9264f

• [ci skip] updating documentation

  trieloff

  committed
  f08f900

• Refactor git revision date retrieval

  

  Andy Steed

  committed
  06a6460

• Merge from master

  

  Andy Steed

  committed
  fc231b8

Commits on May 3, 2018

• typo

  trieloff

  authored
  48bd0d3

• [ci skip] updating documentation

  trieloff

  committed
  5a92cb3

• Merge branch 'master' into platform-pr-schema-descriptors-basic

  trieloff

  authored
  a891273

• Remove not-yet proposed descriptors

  Show description for fa01947
  trieloff

  authored
  fa01947

• Fix formatting

  trieloff

  committed
  4350a20

• Merge branch 'master' into update-stabilization-comments

  asteed

  authored
  7ebe5da

• Merge pull request #300 from adobe/update-stabilization-comments

  Show description for bd206bd
  trieloff

  authored
  bd206bd

• [ci skip] updating documentation

  trieloff

  committed
  97cd41c

• Update git revision checker to use -G instead of -S for diff string matching

  

  Andy Steed

  committed
  32b3748

• Added check against known trivial revisions via .trivial file when determining stabilization candidates

  

  Andy Steed

  committed
  44d8c70

• Merge branch 'master' into bug/stabilize-script-revision

  trieloff

  authored
  768357e

• Merge pull request #304 from adobe/bug/stabilize-script-revision

  Show description for 27047f6
  trieloff

  authored
  27047f6

• Merge branch 'master' into stabilization-trivial

  trieloff

  authored
  ee8e0a7

• Merge pull request #305 from adobe/stabilization-trivial

  Show description for d8dcf88
  trieloff

  authored
  d8dcf88

• [ci skip] updating documentation

  trieloff

  committed
  3f18a7e

Commits on May 4, 2018

• rearrange analytics extension fields to use nested structure versus namespace

  kstreeter

  committed
  04787f5

Commits on May 7, 2018

• Merge branch 'master' into extensibility-docs

  trieloff

  authored
  d762800

• Merge pull request #290 from adobe/extensibility-docs

  Show description for 13f44e4
  trieloff

  authored
  13f44e4

• Merge branch 'master' into platform-pr-analytics-namespace-fixes

  trieloff

  authored
  4b024b4

• Merge branch 'master' into simplify_ace_privilege_mapping

  trieloff

  authored
  2fc40fd

• Merge pull request #275 from agudian/simplify_ace_privilege_mapping

  Show description for 4a30e39
  trieloff

  authored
  4a30e39

• Merge branch 'master' into platform-pr-schema-descriptors-basic

  trieloff

  authored
  2b9b799

• [trivial] added missing parameter

  trieloff

  committed
  e424338

• [ci skip] updating documentation

  trieloff

  committed
  d7c6e4a

• Merge branch 'master' into platform-pr-analytics-namespace-fixes

  kstreeter

  authored
  eb19bd0

• Merge pull request #306 from adobe/platform-pr-analytics-namespace-fixes

  Show description for dc128a8
  kstreeter

  authored
  dc128a8

• [ci skip] updating documentation

  trieloff

  committed
  41a09dc

• Merge branch 'master' into platform-pr-schema-descriptors-basic

  kstreeter

  authored
  9def6c8

• Merge pull request #288 from adobe/platform-pr-schema-descriptors-basic

  Show description for f79deb5
  kstreeter

  authored
  f79deb5

• [ci skip] updating documentation

  trieloff

  committed
  749de0b