Skip to content

Commit

Permalink
Merge branch 'master' into add-button-focus-example
Browse files Browse the repository at this point in the history
  • Loading branch information
cschleiden authored May 9, 2017
2 parents 836a427 + bb7474c commit b6f7c6a
Show file tree
Hide file tree
Showing 42 changed files with 1,642 additions and 328 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ before_script:
- npm install -g gulp
script:
- npm run build
cache:
directories:
- node_modules
- common/node_modules
2 changes: 1 addition & 1 deletion apps/fabric-website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"json-loader": "^0.5.4",
"load-themed-styles": "^1.1.0",
"office-ui-fabric-core": ">=5.1.0 <6.0.0",
"office-ui-fabric-react": ">=2.26.0 <3.0.0",
"office-ui-fabric-react": ">=2.27.1 <3.0.0",
"@uifabric/utilities": ">=1.8.7 <2.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": ">=2.26.0 <3.0.0",
"office-ui-fabric-react": ">=2.27.1 <3.0.0",
"raw-loader": "^0.5.1",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/todo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"es6-promise": "^4.1.0",
"immutability-helper": "^2.0.0",
"office-ui-fabric-core": ">=5.1.0 <6.0.0",
"office-ui-fabric-react": ">=2.26.0 <3.0.0",
"office-ui-fabric-react": ">=2.27.1 <3.0.0",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"typescript": "2.2.2"
Expand Down
10 changes: 0 additions & 10 deletions common/changes/choicegroup-focus_2017-05-05-21-27.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "ContextualMenu: Fixed an issue where submenu items wouldn't update properly when new props were passed own",
"type": "patch"
},
{
"comment": "",
"packageName": "@uifabric/utilities",
"type": "none"
},
{
"comment": "",
"packageName": "@uifabric/styling",
"type": "none"
},
{
"comment": "",
"packageName": "@uifabric/example-app-base",
"type": "none"
}
],
"email": "joschect@microsoft.com"
}
10 changes: 10 additions & 0 deletions common/changes/phkuo-semanticInputs_2017-04-21-01-53.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Lay some groundwork for converting to semantic slots, starting with input text fields.",
"type": "patch"
}
],
"email": "phkuo@microsoft.com"
}
10 changes: 0 additions & 10 deletions common/changes/tooltip-custom-render_2017-05-05-21-12.json

This file was deleted.

Loading

0 comments on commit b6f7c6a

Please sign in to comment.