Skip to content

Commit 3a5fb2f

Browse files
estruyfestruyf
committed
Merge for v2.0.0 release
2 parents e0cae23 + 7bfadf8 commit 3a5fb2f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+13276
-11885
lines changed

‎.circleci/config.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defaults: &defaults
22
working_directory: ~/sp-dev-fx-controls-react
33
docker:
4-
- image: circleci/node:8.9.1
4+
- image: circleci/node:10.22.0
55

66
version: 2
77
jobs:
@@ -126,25 +126,31 @@ workflows:
126126
- build:
127127
filters:
128128
branches:
129-
ignore: /^(dev|master)/
129+
ignore: /^(dev|master|v2)/
130130
release_next:
131131
jobs:
132132
- build:
133133
filters:
134134
branches:
135-
only: dev
135+
only:
136+
- dev
137+
- v2
136138
- build_next:
137139
requires:
138140
- build
139141
filters:
140142
branches:
141-
only: dev
143+
only:
144+
- dev
145+
- v2
142146
- publish_next:
143147
requires:
144148
- build_next
145149
filters:
146150
branches:
147-
only: dev
151+
only:
152+
- dev
153+
- v2
148154
release:
149155
jobs:
150156
- build:

‎.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
10.22.0

‎.yo-rc.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
{
22
"@microsoft/generator-sharepoint": {
3-
"version": "1.2.0",
3+
"version": "1.11.0",
44
"libraryName": "sp-dev-fx-controls-react",
55
"libraryId": "92b1e52c-a5fa-490a-bcf4-76080f39442c",
6-
"environment": "spo"
6+
"environment": "spo",
7+
"isDomainIsolated": false,
8+
"isCreatingSolution": true,
9+
"packageManager": "npm",
10+
"componentType": "webpart"
711
}
8-
}
12+
}

‎CHANGELOG.JSON

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
{
22
"versions": [
3+
{
4+
"version": "2.0.0",
5+
"changes": {
6+
"new": [],
7+
"enhancements": [
8+
"`FilePicker`: added additional properties - `isPanelOpen` and `onCancel` [#668](https://github.com/pnp/sp-dev-fx-controls-react/pull/668)"
9+
],
10+
"fixes": [
11+
"`PeoplePicker`: Disabled doesn't work [#484](https://github.com/pnp/sp-dev-fx-controls-react/issues/484)",
12+
"`Pagination`: control not re-rendering when `currentPage` is updated in state [#663](https://github.com/pnp/sp-dev-fx-controls-react/issues/663)"
13+
]
14+
},
15+
"contributions": [
16+
"[Gautam Sheth](https://github.com/gautamdsheth)"
17+
]
18+
},
319
{
420
"version": "1.20.0",
521
"changes": {

‎CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Releases
22

3+
## 2.0.0
4+
5+
### Enhancements
6+
7+
- `FilePicker`: added additional properties - `isPanelOpen` and `onCancel` [#668](https://github.com/pnp/sp-dev-fx-controls-react/pull/668)
8+
9+
### Fixes
10+
11+
- `PeoplePicker`: Disabled doesn't work [#484](https://github.com/pnp/sp-dev-fx-controls-react/issues/484)
12+
- `Pagination`: control not re-rendering when `currentPage` is updated in state [#663](https://github.com/pnp/sp-dev-fx-controls-react/issues/663)
13+
14+
### Contributors
15+
16+
Special thanks to our contributor: [Gautam Sheth](https://github.com/gautamdsheth).
17+
318
## 1.20.0
419

520
### New control(s)

‎config/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://dev.office.com/json-schemas/spfx-build/config.2.0.schema.json",
2+
"$schema": "https://developer.microsoft.com/json-schemas/spfx-build/config.2.0.schema.json",
33
"version": "2.0",
44
"bundles": {
55
"controls-test-web-part": {

‎config/copy-assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"$schema": "https://dev.office.com/json-schemas/spfx-build/copy-assets.schema.json",
2+
"$schema": "https://developer.microsoft.com/json-schemas/spfx-build/copy-assets.schema.json",
33
"deployCdnPath": "temp/deploy"
44
}

‎config/deploy-azure-storage.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"$schema": "https://dev.office.com/json-schemas/spfx-build/deploy-azure-storage.schema.json",
2+
"$schema": "https://developer.microsoft.com/json-schemas/spfx-build/deploy-azure-storage.schema.json",
33
"workingDir": "./temp/deploy/",
44
"account": "<!-- STORAGE ACCOUNT NAME -->",
55
"container": "sp-dev-fx-controls-react",
66
"accessKey": "<!-- ACCESS KEY -->"
7-
}
7+
}

‎config/package-solution.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
2-
"$schema": "https://dev.office.com/json-schemas/spfx-build/package-solution.schema.json",
2+
"$schema": "https://developer.microsoft.com/json-schemas/spfx-build/package-solution.schema.json",
33
"solution": {
44
"name": "sp-dev-fx-controls-react-client-side-solution",
55
"id": "92b1e52c-a5fa-490a-bcf4-76080f39442c",
66
"version": "1.0.0.0",
7-
"skipFeatureDeployment": true
7+
"skipFeatureDeployment": true,
8+
"isDomainIsolated": false,
9+
"includeClientSideAssets": true
810
},
911
"paths": {
1012
"zippedPackage": "solution/sp-dev-fx-controls-react.sppkg"

‎config/serve.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://dev.office.com/json-schemas/core-build/serve.schema.json",
2+
"$schema": "https://developer.microsoft.com/json-schemas/core-build/serve.schema.json",
33
"port": 4321,
44
"initialPage": "https://localhost:5432/workbench",
55
"https": true,

0 commit comments

Comments
 (0)