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.

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

release/3.3 #1724

Merged
merged 934 commits into from
Dec 23, 2017
Merged

release/3.3 #1724

merged 934 commits into from
Dec 23, 2017

Conversation

ndelangen
Copy link
Member

@ndelangen ndelangen commented Aug 23, 2017

Merge this when ready for 3.3 release

@ndelangen ndelangen self-assigned this Aug 23, 2017
@ndelangen ndelangen changed the title Merge branch 'master' into release/3.3 release/3.3 Aug 23, 2017
@codecov
Copy link

codecov bot commented Aug 23, 2017

Codecov Report

Merging #1724 into master will increase coverage by 0.47%.
The diff coverage is 20.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1724      +/-   ##
==========================================
+ Coverage   22.16%   22.63%   +0.47%     
==========================================
  Files         268      344      +76     
  Lines        5875     6763     +888     
  Branches      707      890     +183     
==========================================
+ Hits         1302     1531     +229     
- Misses       4049     4578     +529     
- Partials      524      654     +130
Impacted Files Coverage Δ
app/angular/bin/build.js 0% <ø> (ø)
app/vue/src/server/config/webpack.config.js 0% <ø> (ø) ⬆️
...-native/src/preview/components/OnDeviceUI/index.js 0% <ø> (ø) ⬆️
addons/knobs/src/index.js 0% <ø> (ø) ⬆️
app/react/src/server/config/babel.prod.js 0% <ø> (ø) ⬆️
addons/viewport/register.js 0% <ø> (ø)
app/vue/src/server/config/webpack.config.prod.js 0% <ø> (ø) ⬆️
...tive/src/preview/components/StoryListView/index.js 0% <ø> (ø) ⬆️
app/angular/bin/index.js 0% <ø> (ø)
addons/viewport/manager.js 0% <ø> (ø)
... and 264 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 27d4f41...5574bd7. Read the comment docs.

@shilman
Copy link
Member

shilman commented Aug 31, 2017

2017-August-31

Features

  • Deprecate confusing option names #1692
  • 1699 Have Stories on each level of hierarchy #1763
  • 887 Generate snapshot per story file #1584
  • Search box: make found options selectable with click #1697

Bug Fixes

  • Height aligned the 2 button #1769
  • Fix Docgen in static builds for Info #1725

Documentation

  • Add carbon to examples page #1764
  • Minor grammar fixes and clarification to Vue documentation #1756
  • Make dependencies more deterministic #1703
  • Fix incorrect yarn command in docs #1758

Maintenance

  • A CLI for running specific tests suites, like bootstrap CLI #1752
  • Remove check for sender on channel. #1407
  • Add config for dependencies.io #1770
  • Fixed Jest warnings #1744
  • [Examples] Added addon-knobs to crna and vanilla react native. #1636

Dependency Upgrades

  • Update lerna to the latest version 🚀 #1768
  • Update lerna to the latest version 🚀 #1760

@Hypnosphi
Copy link
Member

Hypnosphi commented Sep 5, 2017

@ndelangen please resolve the conflicts =)

In case of Prettier changes, it might be easier to run it separately on this branch

@Hypnosphi
Copy link
Member

Ok, now it's my turn

Hypnosphi
Hypnosphi previously approved these changes Oct 2, 2017
@codecov-io
Copy link

codecov-io commented Nov 6, 2017

Codecov Report

Merging #1724 into master will increase coverage by 15.81%.
The diff coverage is 43.23%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #1724       +/-   ##
===========================================
+ Coverage   16.87%   32.69%   +15.81%     
===========================================
  Files         307      398       +91     
  Lines        7792     8837     +1045     
  Branches      785      960      +175     
===========================================
+ Hits         1315     2889     +1574     
+ Misses       5844     5280      -564     
- Partials      633      668       +35
Impacted Files Coverage Δ
app/react/src/server/babel_config.js 76.66% <ø> (+76.66%) ⬆️
addons/viewport/manager.js 0% <ø> (ø)
addons/knobs/src/index.js 0% <ø> (ø) ⬆️
app/angular/bin/build.js 0% <ø> (ø)
addons/viewport/register.js 0% <ø> (ø)
app/react/src/server/config/babel.prod.js 0% <ø> (ø) ⬆️
app/react/src/server/config.js 0% <ø> (ø) ⬆️
app/angular/bin/index.js 0% <ø> (ø)
app/react/src/server/config/webpack.config.js 0% <ø> (ø) ⬆️
app/vue/src/server/config/webpack.config.js 0% <ø> (ø) ⬆️
... and 352 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c031826...f16b9b4. Read the comment docs.

ralzinov and others added 25 commits December 22, 2017 13:34
Added type annotation to helpers, added ts declaration files for angu…
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
# Conflicts:
#	CHANGELOG.md
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/background/package.json
#	addons/centered/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/vue-kitchen-sink/package.json
#	lerna.json
#	lib/addons/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/channels/package.json
#	lib/cli/package.json
#	lib/codemod/package.json
#	lib/components/package.json
#	lib/ui/package.json
# Conflicts:
#	examples/cra-kitchen-sink/package.json
#	package.json
#	yarn.lock
@ndelangen
Copy link
Member Author

I think we're ready to merge this one

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment