Skip to content

Commit

Permalink
Merge branch 'master' into phkuo/glamor
Browse files Browse the repository at this point in the history
  • Loading branch information
phkuo authored Jun 5, 2017
2 parents 5e34c55 + 2e2e984 commit 4aa5950
Show file tree
Hide file tree
Showing 77 changed files with 2,437 additions and 1,443 deletions.
2 changes: 1 addition & 1 deletion apps/component-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"office-ui-fabric-react": ">=1.5.5 <2.0.0",
"react": ">=15.3.2 <16.0.0",
"react-dom": ">=15.3.2 <16.0.0",
"typescript": "2.3.3"
"typescript": "2.2.2"
}
}
2 changes: 2 additions & 0 deletions apps/fabric-website/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
registry=https://registry.npmjs.org/

48 changes: 48 additions & 0 deletions apps/fabric-website/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,54 @@
{
"name": "@uifabric/fabric-website",
"entries": [
{
"version": "4.5.31",
"tag": "@uifabric/fabric-website_v4.5.31",
"date": "Fri, 02 Jun 2017 01:19:36 GMT",
"comments": {
"dependency": [
{
"comment": "Updating dependency \"@uifabric/example-app-base\" from `2.0.3` to `2.0.4`"
},
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `>=4.2.0 <5.0.0` to `>=4.3.0 <5.0.0`"
}
]
}
},
{
"version": "4.5.30",
"tag": "@uifabric/fabric-website_v4.5.30",
"date": "Thu, 01 Jun 2017 16:34:03 GMT",
"comments": {
"dependency": [
{
"comment": "Updating dependency \"@uifabric/example-app-base\" from `2.0.2` to `2.0.3`"
},
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `>=4.1.1 <5.0.0` to `>=4.2.0 <5.0.0`"
},
{
"comment": "Updating dependency \"@uifabric/utilities\" from `>=4.0.0 <5.0.0` to `>=4.0.1 <5.0.0`"
}
]
}
},
{
"version": "4.5.29",
"tag": "@uifabric/fabric-website_v4.5.29",
"date": "Wed, 31 May 2017 01:58:23 GMT",
"comments": {
"dependency": [
{
"comment": "Updating dependency \"@uifabric/example-app-base\" from `2.0.1` to `2.0.2`"
},
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `>=4.1.0 <5.0.0` to `>=4.1.1 <5.0.0`"
}
]
}
},
{
"version": "4.5.28",
"tag": "@uifabric/fabric-website_v4.5.28",
Expand Down
17 changes: 16 additions & 1 deletion apps/fabric-website/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
# Change Log - @uifabric/fabric-website

This log was last generated on Tue, 30 May 2017 20:23:45 GMT and should not be manually modified.
This log was last generated on Fri, 02 Jun 2017 01:19:36 GMT and should not be manually modified.

## 4.5.31
Fri, 02 Jun 2017 01:19:36 GMT

*Changes not tracked*

## 4.5.30
Thu, 01 Jun 2017 16:34:03 GMT

*Changes not tracked*

## 4.5.29
Wed, 31 May 2017 01:58:23 GMT

*Changes not tracked*

## 4.5.28
Tue, 30 May 2017 20:23:45 GMT
Expand Down
8 changes: 4 additions & 4 deletions apps/fabric-website/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uifabric/fabric-website",
"version": "4.5.28",
"version": "4.5.31",
"description": "Reusable React components for building experiences for Office 365.",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -47,12 +47,12 @@
"webpack-bundle-analyzer": "^2.2.1"
},
"dependencies": {
"@uifabric/example-app-base": "2.0.1",
"@uifabric/example-app-base": "2.0.4",
"color-functions": "1.1.0",
"json-loader": "^0.5.4",
"load-themed-styles": "^1.1.0",
"office-ui-fabric-core": ">=7.0.0 <8.0.0",
"office-ui-fabric-react": ">=4.1.0 <5.0.0",
"@uifabric/utilities": ">=4.0.0 <5.0.0"
"office-ui-fabric-react": ">=4.3.0 <5.0.0",
"@uifabric/utilities": ">=4.0.1 <5.0.0"
}
}
2 changes: 1 addition & 1 deletion apps/ssr-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@types/mocha": "^2.2.39",
"@types/webpack-env": "^1.13.0",
"mocha": "~3.3.0",
"office-ui-fabric-react": ">=4.1.0 <5.0.0",
"office-ui-fabric-react": ">=4.3.0 <5.0.0",
"raw-loader": "^0.5.1",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
Expand Down
4 changes: 2 additions & 2 deletions apps/test-bundle-button/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
"@types/prop-types": "^15.5.1",
"source-map-loader": "^0.2.1",
"ts-loader": "^2.0.1",
"typescript": "^2.2.2",
"typescript": "2.2.2",
"webpack": "^2.2.1",
"webpack-bundle-analyzer": "^2.2.1",
"webpack-dev-server": "^2.4.1"
},
"dependencies": {
"react": "^0.14 || ^15.0.1-0 || ^16.0.0-0",
"react-dom": "^0.14 || ^15.0.1-0 || ^16.0.0-0",
"office-ui-fabric-react": ">=4.1.0 <5.0.0"
"office-ui-fabric-react": ">=4.3.0 <5.0.0"
}
}
2 changes: 1 addition & 1 deletion apps/todo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"es6-promise": "^4.1.0",
"immutability-helper": "^2.0.0",
"office-ui-fabric-core": ">=7.0.0 <8.0.0",
"office-ui-fabric-react": ">=4.1.0 <5.0.0",
"office-ui-fabric-react": ">=4.3.0 <5.0.0",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"typescript": "2.2.2"
Expand Down
11 changes: 0 additions & 11 deletions common/changes/@uifabric/styling/fixes_2017-05-30-23-57.json

This file was deleted.

11 changes: 0 additions & 11 deletions common/changes/@uifabric/styling/fixes_2017-05-31-00-44.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "ResizeGroup: Reduce render time when reducing the width of the container.",
"comment": "DragDropHelper: Fix to show ghost element when dragging on Firefox",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "chrisgo@microsoft.com"
"email": "aazhou@microsoft.com"
}
11 changes: 0 additions & 11 deletions common/changes/office-ui-fabric-react/fixes_2017-05-30-23-57.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "office-ui-fabric-react",
"type": "none"
"comment": "TextField: Show red border when invalid",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "dzearing@microsoft.com"
"email": "aazhou@microsoft.com"
}
Loading

0 comments on commit 4aa5950

Please sign in to comment.