Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
estruyf committed Mar 24, 2020
2 parents 6e7e84f + 759e92b commit 0ac78d9
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 22 deletions.
24 changes: 2 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,6 @@ workflows:
filters:
branches:
ignore: /^(dev|master)/
- test:
requires:
- build
filters:
branches:
ignore: /^(dev|master)/
release_next:
jobs:
- build:
Expand All @@ -145,15 +139,9 @@ workflows:
filters:
branches:
only: dev
- test:
requires:
- build_next
filters:
branches:
only: dev
- publish_next:
requires:
- test
- build_next
filters:
branches:
only: dev
Expand All @@ -165,17 +153,9 @@ workflows:
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
branches:
ignore: /.*/
- test:
requires:
- build
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
branches:
ignore: /.*/
- publish:
requires:
- test
- build
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+/
Expand Down
13 changes: 13 additions & 0 deletions docs/documentation/docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,19 @@ Once the package is installed, you will have to configure the resource file of t
"ControlStrings": "node_modules/@pnp/spfx-controls-react/lib/loc/{locale}.js"
```

## Telemetry

All controls gather telemetry to verify the usage. Only the name of the control and related data gets captured.

> More information about the service that we are using for this can be found here: [PnP Telemetry Proxy](https://github.com/pnp/telemetry-proxy-node).
Since version `1.17.0` it is possible to opt-out of the telemetry by adding the following code to your web part:

```typescript
const telemetry = PnPTelemetry.getInstance();
telemetry.optOut();
```

## Available controls

The following controls are currently available:
Expand Down

0 comments on commit 0ac78d9

Please sign in to comment.