674 Commits

Author SHA1 Message Date
Norbert de Langen
bf3c2e5afa
UPGRADE to babel7-rc.1 2018-08-15 02:18:39 +02:00
Norbert de Langen
a039c96426
Merge branch 'master' into babel-7
# Conflicts:
#	MIGRATION.md
#	addons/backgrounds/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/info/src/__snapshots__/index.test.js.snap
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/storyshots/storyshots-puppeteer/package.json
#	addons/storysource/package.json
#	addons/viewport/package.json
#	app/angular/package.json
#	app/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/angular-cli/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/html-kitchen-sink/package.json
#	examples/marko-cli/package.json
#	examples/mithril-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
#	examples/official-storybook/stories/__snapshots__/other-dirname.stories.storyshot
#	examples/polymer-cli/package.json
#	examples/vue-kitchen-sink/package.json
#	jest.config.js
#	lib/cli/package.json
#	lib/cli/test/snapshots/angular-cli/package.json
#	lib/cli/test/snapshots/marko/package.json
#	lib/cli/test/snapshots/meteor/package.json
#	lib/cli/test/snapshots/mithril/package.json
#	lib/cli/test/snapshots/polymer/package.json
#	lib/cli/test/snapshots/react/package.json
#	lib/cli/test/snapshots/react_project/package.json
#	lib/cli/test/snapshots/react_scripts/package.json
#	lib/cli/test/snapshots/sfc_vue/package.json
#	lib/cli/test/snapshots/update_package_organisations/package.json
#	lib/cli/test/snapshots/vue/package.json
#	lib/cli/test/snapshots/webpack_react/package.json
#	lib/codemod/package.json
#	lib/components/src/layout/__snapshots__/index.stories.storyshot
#	lib/core/package.json
#	lib/core/src/server/config/webpack.config.prod.js
#	package.json
#	yarn.lock
2018-08-15 00:01:36 +02:00
Michael Shilman
b2b275b32b 4.0.0-alpha.16 snapshots 2018-08-06 22:40:46 +08:00
Michael Shilman
52f0bc687a v4.0.0-alpha.16 2018-08-06 22:25:51 +08:00
Norbert de Langen
c6d4cf43c0
FIX snapshots for CLI 2018-08-06 11:39:30 +02:00
Norbert de Langen
935cefd27a
FIX linting issues after eslint upgrade (partial fix) 2018-08-05 17:57:17 +02:00
Norbert de Langen
dcb8797d71
UPGRADE more tools 2018-08-04 15:59:52 +02:00
Norbert de Langen
947e9bad62
UPGRADE all minor dependencies 2018-08-04 00:41:08 +02:00
Michael Shilman
aaf6281c40 4.0.0-alpha.15 snapshots 2018-08-03 18:11:38 +08:00
Michael Shilman
819ff14255 v4.0.0-alpha.15 2018-08-03 17:56:23 +08:00
igor-dv
6ee44ad4d5 Remove badges from the inner READMEs 2018-07-31 19:34:05 +03:00
igor-dv
ce1d4ca95d Update CLI 2018-07-31 12:02:35 +03:00
Norbert de Langen
0ec2bc0a1e
REMOVE smoke-tests in cli (static build examples are now all in teamcity) 2018-07-20 16:35:07 +02:00
Norbert de Langen
a87d16dfc7
FIX snapshots 2018-07-20 14:49:20 +02:00
Norbert de Langen
d0b7972ece
FIX snapshots 2018-07-16 11:01:21 -07:00
Norbert de Langen
ba544ef8e1
Merge branch 'master' into babel-7
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/events/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/storyshots-core/package.json
#	addons/storyshots/storyshots-puppeteer/package.json
#	addons/storysource/package.json
#	addons/viewport/package.json
#	app/angular/package.json
#	app/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/html-kitchen-sink/package.json
#	examples/marko-cli/package.json
#	examples/mithril-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/vue-kitchen-sink/package.json
#	lib/cli/package.json
#	lib/cli/test/snapshots/angular-cli/package.json
#	lib/cli/test/snapshots/marko/package.json
#	lib/cli/test/snapshots/meteor/package.json
#	lib/cli/test/snapshots/mithril/package.json
#	lib/cli/test/snapshots/polymer/package.json
#	lib/cli/test/snapshots/react/package.json
#	lib/cli/test/snapshots/react_native/package.json
#	lib/cli/test/snapshots/react_native_scripts/package.json
#	lib/cli/test/snapshots/react_project/package.json
#	lib/cli/test/snapshots/react_scripts/package.json
#	lib/cli/test/snapshots/sfc_vue/package.json
#	lib/cli/test/snapshots/update_package_organisations/package.json
#	lib/cli/test/snapshots/vue/package.json
#	lib/cli/test/snapshots/webpack_react/package.json
#	lib/core/package.json
#	yarn.lock
2018-07-16 10:57:17 -07:00
Michael Shilman
cdca2e892c 4.0.0-alpha.14 snapshots 2018-07-11 17:20:40 -07:00
Michael Shilman
e5e1e3aff8 v4.0.0-alpha.14 2018-07-11 17:13:57 -07:00
Michael Shilman
957c74e019 4.0.0-alpha.13 snapshots 2018-07-09 21:42:23 -07:00
Michael Shilman
681869bfcd v4.0.0-alpha.13 2018-07-09 21:31:07 -07:00
Hypnosphi
4b169ab764 Fix version choice logic 2018-07-06 23:52:49 +03:00
Hypnosphi
6da0f7a5e5 Commit snapshot 2018-07-06 23:18:49 +03:00
Hypnosphi
3c0e3832e1 Add babel-loader peer dep 2018-07-06 20:59:30 +03:00
Hypnosphi
170160ddfe Revert CLI changes for RN 2018-07-05 23:48:22 +03:00
Hypnosphi
e496dfbb91 Update CLI 2018-07-04 23:12:47 +03:00
Hypnosphi
b6153d1034 Merge master 2018-07-04 17:45:57 +03:00
Michael Shilman
759d741f03 4.0.0-alpha.12 snapshots 2018-07-03 16:05:50 -07:00
Michael Shilman
a14a8e4a9a v4.0.0-alpha.12 2018-07-03 15:58:21 -07:00
Michael Shilman
7c33f1e215 4.0.0-alpha.11 snapshots 2018-07-02 11:20:46 -07:00
Michael Shilman
9a872790a2 v4.0.0-alpha.11 2018-07-02 11:14:04 -07:00
Neville Mehta
3279207510 update welcome in test/marko 2018-06-25 22:48:25 -07:00
Neville Mehta
5f775a8591 make welcome a component 2018-06-25 22:37:47 -07:00
Michael Shilman
1d7f50d6ee 4.0.0-alpha.10 snapshots 2018-06-21 22:14:57 +08:00
Michael Shilman
4e70f9d192 v4.0.0-alpha.10 2018-06-21 21:48:49 +08:00
Hypnosphi
e63310dcf0 Update snapshots 2018-06-21 10:52:18 +03:00
Hypnosphi
73dc63bb67 Update dependencies 2018-06-20 13:50:17 +03:00
Daniel Duan
85c739c599 random snapshot update 2018-06-18 14:55:34 -04:00
Michael Shilman
ddaf500c34 4.0.0-alpha.9 changelog 2018-06-10 15:53:13 +08:00
Michael Shilman
1a03042590 v4.0.0-alpha.9 2018-06-10 15:42:04 +08:00
Michael Shilman
b6d463200b 4.0.0-alpha.8 snapshots 2018-05-26 18:55:50 -07:00
Michael Shilman
6a1f5e4675 v4.0.0-alpha.8 2018-05-26 18:47:25 -07:00
Hypnosphi
02d5d0003c Update CLI snapshot 2018-05-25 23:25:36 +03:00
Neville Mehta
6392dc5eff remove unwanted files from snapshots/marko 2018-05-20 15:27:42 -07:00
Neville Mehta
084c02e3e7 add addons (correctly) to marko cli 2018-05-20 13:00:26 -07:00
Neville Mehta
77c9b80197 Merge branch 'addmarkosupport' of github.com:nm123github/storybook into addmarkosupport 2018-05-19 19:19:59 -07:00
Neville Mehta
79d53dbfea dont include marko-widget example, in case user is not using them 2018-05-19 19:19:28 -07:00
Neville Mehta
578942bd5c
Merge branch 'master' into addmarkosupport 2018-05-19 18:57:13 -07:00
Neville Mehta
39390d2a28 add support for marko widgets 2018-05-19 01:44:03 -07:00
Neville Mehta
d357f64787 fix some markocli issues 2018-05-18 23:02:00 -07:00
Norbert de Langen
43279a3076
Merge branch 'master' into feature/more-components 2018-05-18 13:38:51 +02:00