-
Notifications
You must be signed in to change notification settings - Fork 2.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Charting #4954
Merged
Merged
Charting #4954
Changes from 9 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
c186b97
Add VerticalBarChart
f316614
Update webpack config
496dd00
Add source code to example page now that webpack config is working, a…
e117482
Add change file
42437f6
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
d5996e9
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
535611b
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
6c40d5e
Update shrinkwrap
e742738
Revert to master
bf2673c
Revert change files
Markionium 86efa77
Remove change files
Markionium 1ec8511
Re-add charting change file
Markionium a01ee26
Reset more json
Markionium c774423
Merge branch 'master' into mark/charting
Markionium 74b477d
Reset common/changes to master
Markionium 681551b
Revert more conflicts?
Markionium 87017e2
Merge pull request #1 from Markionium/mark/charting
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/charting/charting_2018-05-22-23-27.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/charting", | ||
| "comment": "Add charting package with VerticalBarChart", | ||
| "type": "minor" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/charting", | ||
| "email": "kakje@microsoft.com" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/example-app-base/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/example-app-base", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/example-app-base", | ||
| "email": "mark@thedutchies.com" | ||
| } | ||
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/experiments/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/experiments", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/experiments", | ||
| "email": "mark@thedutchies.com" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/fabric-website/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/fabric-website", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/fabric-website", | ||
| "email": "mark@thedutchies.com" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/file-type-icons/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/file-type-icons", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/file-type-icons", | ||
| "email": "mark@thedutchies.com" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/icons/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/icons", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/icons", | ||
| "email": "mark@thedutchies.com" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/jest-serializer-merge-styles/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/jest-serializer-merge-styles", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/jest-serializer-merge-styles", | ||
| "email": "mark@thedutchies.com" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/merge-styles/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/merge-styles", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/merge-styles", | ||
| "email": "mark@thedutchies.com" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/styling/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/styling", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/styling", | ||
| "email": "mark@thedutchies.com" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/utilities/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/utilities", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/utilities", | ||
| "email": "mark@thedutchies.com" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,4 +8,4 @@ | |
| ], | ||
| "packageName": "@uifabric/utilities", | ||
| "email": "benw@microsoft.com" | ||
| } | ||
| } | ||
11 changes: 11 additions & 0 deletions
11
common/changes/@uifabric/variants/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@uifabric/variants", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "@uifabric/variants", | ||
| "email": "mark@thedutchies.com" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/office-ui-fabric-react/applied-prettier_2018-06-02-22-17.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "office-ui-fabric-react", | ||
| "comment": "Added Prettier", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "office-ui-fabric-react", | ||
| "email": "mark@thedutchies.com" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/office-ui-fabric-react/commandbar-fabricjs_2018-06-04-19-00.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "office-ui-fabric-react", | ||
| "comment": "CommandBarPage: Remove fabric js reference.", | ||
| "type": "patch" | ||
| } | ||
| ], | ||
| "packageName": "office-ui-fabric-react", | ||
| "email": "lynam.emily@gmail.com" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file should not be showing up as a new file created by you..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I pulled upstream/master into my local branch, committed, and then pushed to origin. I'd definitely appreciate tips for how to avoid having these files show up in my PRs.