Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Charting #4954

Merged
merged 17 commits into from
Jun 6, 2018
Merged

Charting #4954

merged 17 commits into from
Jun 6, 2018

Commits on May 22, 2018

  1. Add VerticalBarChart

    Katherine Kjeer committed May 22, 2018
    Configuration menu
    Copy the full SHA
    c186b97 View commit details
    Browse the repository at this point in the history

  2. Update webpack config

    Katherine Kjeer committed May 22, 2018
    Configuration menu
    Copy the full SHA
    f316614 View commit details
    Browse the repository at this point in the history

  3. Add source code to example page now that webpack config is working, a… 

    …dd comments to interfaces
    Katherine Kjeer committed May 22, 2018
    Configuration menu
    Copy the full SHA
    496dd00 View commit details
    Browse the repository at this point in the history

  4. Add change file

    Katherine Kjeer committed May 22, 2018
    Configuration menu
    Copy the full SHA
    e117482 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2018

  1. Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri… 

    …c-react into charting

# Conflicts:
#	common/config/rush/npm-shrinkwrap.json
    Katherine Kjeer committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    42437f6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri… 

    …c-react into charting

# Conflicts:
#	common/config/rush/npm-shrinkwrap.json
    Katherine Kjeer committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    d5996e9 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri… 

    …c-react into charting

# Conflicts:
#	common/changes/@uifabric/example-app-base/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/experiments/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/fabric-website/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/file-type-icons/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/icons/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/jest-serializer-merge-styles/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/merge-styles/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/styling/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/utilities/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/variants/applied-prettier_2018-06-02-22-17.json
#	common/changes/office-ui-fabric-react/applied-prettier_2018-06-02-22-17.json
#	common/changes/office-ui-fabric-react/commandbar-fabricjs_2018-06-04-19-00.json
    Katherine Kjeer committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    535611b View commit details
    Browse the repository at this point in the history

  2. Update shrinkwrap

    Katherine Kjeer committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    6c40d5e View commit details
    Browse the repository at this point in the history

  3. Revert to master

    Katherine Kjeer committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    e742738 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2018

  1. Revert change files

    @Markionium
    Markionium committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    bf2673c View commit details
    Browse the repository at this point in the history

  2. Remove change files

    @Markionium
    Markionium committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    86efa77 View commit details
    Browse the repository at this point in the history

  3. Re-add charting change file

    @Markionium
    Markionium committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    1ec8511 View commit details
    Browse the repository at this point in the history

  4. Reset more json

    @Markionium
    Markionium committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    a01ee26 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into mark/charting 

    * master:
  Part 2 of demo page refactor (microsoft#5089)
  Update jest.js
  fixing official example page and datepicker/calendar components using… (microsoft#5108)
  Don't run prettier and tslint in parallel as it might cause conflicts (microsoft#5100)
  FocusTrapZone - restore last focused descendant element (microsoft#5103)
  Coachmark/TeachingBubble: Fix SCSS selectors for buttons and Close Icon (microsoft#4835)
  HoverCard: IE11 fix (microsoft#5105)
    @Markionium
    Markionium committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    c774423 View commit details
    Browse the repository at this point in the history

  6. Reset common/changes to master

    @Markionium
    Markionium committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    74b477d View commit details
    Browse the repository at this point in the history

  7. Revert more conflicts?

    @Markionium
    Markionium committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    681551b View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1 from Markionium/mark/charting 

    Cleanup my mess
    kkjeer committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    87017e2 View commit details
    Browse the repository at this point in the history