247 Commits

Author SHA1 Message Date
hypnos
aae4d52c68 Merge remote-tracking branch 'upstream/master' into release/3.3
# Conflicts:
#	addons/storyshots/src/index.js
2017-09-17 00:09:12 +03:00
Oleg Proskurin
4f32a4ede5 Add addon-console to addons gallery 2017-09-14 17:38:55 +03:00
hypnos
de1314ccea Merge remote-tracking branch 'upstream/release/3.3' into routed-link-to
# Conflicts:
#	addons/links/README.md
2017-09-13 01:58:45 +03:00
Filipp Riabchun
f90827a9cc Merge branch 'master' into release/3.3 2017-09-12 15:45:57 +03:00
Nathaniel Blackburn
e4e6368a9b Removed "React" references 2017-09-12 10:35:50 +01:00
hypnos
39af55a076 addon-links: add LinkTo component, and hrefTo function 2017-09-09 22:51:31 +03:00
hypnos
5afe9e556e Merge remote-tracking branch 'upstream/release/3.3' into cli-tests
# Conflicts:
#	package.json
#	yarn.lock
2017-09-09 03:04:04 +03:00
hypnos
bd31e8b2f5 Merge remote-tracking branch 'upstream/release/3.3' into yarn-workspaces
# Conflicts:
#	package.json
2017-09-09 02:35:01 +03:00
Filipp Riabchun
c9c0e84659 Merge branch 'master' into release/3.3 2017-09-09 02:30:08 +03:00
Norbert de Langen
920de11a16 FIX broken docs markdown 2017-09-09 01:20:46 +02:00
Norbert de Langen
95d60597ab Merge branch 'master' into release/3.3 2017-09-09 01:16:03 +02:00
Norbert de Langen
2513a373a3 CHANGE package.json.engines to >=8.0.0 && UPDATE toc for a documentation page for vue 2017-09-09 01:08:24 +02:00
Jan Van Bruggen
cc74b32603 Docs: Add missing NPM script section to Vue guide
It seems that this necessary setup step didn't get copy-pasted over from the React guide (probably because it isn't a standalone section in the React guide).
2017-09-08 14:26:38 -07:00
Filipp Riabchun
d84a10b536 Merge branch 'release/3.3' into cli-tests 2017-09-08 04:14:41 +03:00
Filipp Riabchun
088c5f80e1 Merge branch 'release/3.3' into yarn-workspaces 2017-09-08 04:13:53 +03:00
Filipp Riabchun
f396a49497 Merge branch 'master' into release/3.3 2017-09-08 04:13:03 +03:00
hypnos
e91d60e2f4 Merge release/3.3 2017-09-08 01:44:20 +03:00
Vincent Taing
f4a744a67c Fix a typo 2017-09-07 13:57:09 -07:00
hypnos
4d10a55997 Introduce yarn workspaces 2017-09-07 00:55:44 +03:00
Norbert de Langen
7ab74c6a34 LINTING 2017-09-06 20:57:31 +02:00
Norbert de Langen
7610652d39 Merge branch 'master' into release/3.3 2017-09-06 07:24:35 +02:00
hypnos
15ea4cb03b Merge remote-tracking branch 'upstream/release/3.3' into cli-tests
# Conflicts:
#	package.json
#	yarn.lock
2017-09-06 03:21:52 +03:00
Norbert de Langen
db96f28d0f UPGRADE root dependencies and SYNC with packages 2017-09-06 01:54:21 +02:00
Norbert de Langen
d0b752d8d3 FIX linting after prettier upgrade 2017-09-06 00:54:12 +02:00
Norbert de Langen
d8f7545cfb Merge branch 'master' into release/3.3 2017-09-04 22:46:57 +02:00
hypnos
5cd67ffb48 Merge remote-tracking branch 'upstream/release/3.3' into deprecate-left-down
# Conflicts:
#	lib/ui/src/modules/ui/components/layout/index.test.js
2017-08-31 02:02:29 +03:00
Norbert de Langen
fdee05a6b2 Merge branch 'master' into release/3.3 2017-08-30 22:38:39 +02:00
Daniel Duan
e852ca2baf Merge branch 'master' into add-storyshot-addon 2017-08-29 16:17:41 -04:00
Daniel Duan
5501633ff2 fix markdown linter changes 2017-08-29 16:16:58 -04:00
TJ Egan
d95f2793b5 add carbon to examples page 2017-08-29 10:39:25 -05:00
Igor
c1c16485a9 Merge branch 'master' into release/3.3 2017-08-29 17:44:20 +03:00
tsuyoshiwada
e188845574 Add storybook-chrome-screenshot to addon gallery 2017-08-29 14:46:17 +09:00
Benjamin Cass
b7eca1e4b4 Minor grammar fixes and clarification 2017-08-28 14:51:08 -05:00
Norbert de Langen
c8492398c2 new lockfiles 2017-08-28 00:04:05 +02:00
hypnos
ad4ba42812 Use shorthand commands in docs 2017-08-26 03:23:08 +03:00
hypnos
1704ab4420 Actually commit yarn.locks 2017-08-24 23:32:04 +03:00
hypnos
e30e53cd52 Merge remote-tracking branch 'upstream/master' into commit-yarn-lock
# Conflicts:
#	CONTRIBUTING.md
#	examples/crna-kitchen-sink/package.json
#	examples/test-cra/package.json
2017-08-22 23:42:29 +03:00
hypnos
a4c5142126 Stop ignoring yarn.locks 2017-08-22 00:42:06 +03:00
hypnos
8b2608687b Restrict import/extensions to warning everywhere 2017-08-20 18:40:47 +03:00
hypnos
c0dc8212d3 Merge remote-tracking branch 'upstream/master' into stricter-lint-imports 2017-08-20 18:29:47 +03:00
Michael Shilman
7b544ba60f Add tachyons components to storybook examples 2017-08-20 01:51:01 -07:00
Filipp Riabchun
5d7f79c018 Merge branch 'master' into stricter-lint-imports 2017-08-18 12:44:20 +03:00
hypnos
a82f305bf4 Restrict import/extensions to warning in docs package 2017-08-18 12:43:35 +03:00
hypnos
1c0dcbc8a0 Allow wrapping of "used by" items 2017-08-18 12:04:44 +03:00
hypnos
cb92897063 Promote no-extraneous-dependencies to error level and make it pass 2017-08-18 04:35:25 +03:00
Michael Shilman
9d4732efbe Fix broken FAQ title/link 2017-08-12 15:50:48 -07:00
Filipp Riabchun
485f08d5bb Update index.md 2017-08-12 16:25:29 +03:00
Filipp Riabchun
1a4115563c Merge branch 'master' into cd-project-dir 2017-08-12 16:14:31 +03:00
Filipp Riabchun
fceb70350e Quick start: React Storybook => Storybook (#1643)
Since we support Vue, those sentences are outdated
2017-08-12 16:13:50 +03:00
Filipp Riabchun
5e412fb338 Quick start: add cd my-project-directory line
`getstorybook` expects to be launched at project directory, which is not quite obvious from the quick start guide
2017-08-12 15:21:17 +03:00