321 Commits

Author SHA1 Message Date
Michael Shilman
d8d955cbbc v3.4.0-alpha.0 2018-01-07 21:32:57 +05:30
Michael Shilman
71c528c462 merge release 3.3.4 to master 2018-01-07 19:36:11 +05:30
Michael Shilman
3abdbb6528 v3.3.4 2018-01-07 18:23:40 +05:30
Michael Shilman
02a69e0b1b v3.3.3 2017-12-28 22:34:34 +05:30
Michael Shilman
fbe50ffb46 v3.3.2 2017-12-28 12:10:49 +09:00
Michael Shilman
79c07c727a v3.3.1 2017-12-26 19:30:05 -08:00
Michael Shilman
9eb0623d17 v3.3.0 2017-12-26 15:57:48 -08:00
Michael Shilman
92d7fca746 v3.3.0-rc.1 2017-12-26 09:48:54 -08:00
Michael Shilman
aa2a8c11f3 v3.3.0-rc.0 2017-12-23 20:20:05 -08:00
Michael Shilman
2ac25778f1 Publish from master 2017-12-23 20:18:30 -08:00
Michael Shilman
4903d6ece7 v3.3.0-alpha.6 2017-12-23 09:25:20 -08:00
Michael Shilman
a65beced79 v3.3.0-alpha.5 2017-12-23 09:05:46 -08:00
hypnos
fd33faddc3 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	examples/cra-kitchen-sink/package.json
#	examples/vue-kitchen-sink/package.json
#	lerna.json
2017-11-22 19:35:57 +03:00
hypnos
3c87c1ada1 Stop ignoring example packages when publishing 2017-11-22 16:59:20 +03:00
Michael Shilman
3c1715daca v3.3.0-alpha.4 2017-11-22 03:15:31 -08:00
Michael Shilman
7a6c901d71 v3.2.16 2017-11-15 18:03:04 -08:00
Michael Shilman
0be4efcec8 v3.2.15 2017-11-10 11:39:27 +09:00
Norbert de Langen
cf054ad1b3
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/knobs/package.json
#	addons/knobs/src/components/types/Array.js
#	examples/cra-kitchen-sink/package.json
#	package.json
#	yarn.lock
2017-11-07 09:33:30 +01:00
Michael Shilman
1a6082a4ad v3.3.0-alpha.3 2017-11-07 12:56:56 +09:00
Michael Shilman
25f80c3a86 Fix lerna publish branch restriction typo 2017-11-07 12:52:24 +09:00
hypnos
95466943d2 Specify new lerna version in lerna.json 2017-11-05 11:51:58 +03:00
Michael Shilman
f15eaa6a68 v3.2.14 2017-11-01 16:21:34 +09:00
Michael Shilman
a701365e70 v3.2.13 2017-10-20 21:44:34 +02:00
hypnos
0d684f89dc Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	app/react-native/package.json
#	docs/pages/basics/faq/index.md
#	examples/vue-kitchen-sink/package.json
#	lib/cli/generators/SFC_VUE/index.js
#	lib/cli/generators/VUE/index.js
#	lib/cli/lib/helpers.js
#	lib/cli/package.json
#	lib/ui/package.json
#	package.json
#	yarn.lock
2017-10-17 03:24:46 +03:00
hypnos
18068eca11 Update lerna.json 2017-10-07 00:31:33 +02:00
Carlos Vega
217ec79eb8 Merge branch 'release/3.3' of github.com:storybooks/storybook into 269-angular-support 2017-10-06 08:46:33 -06:00
hypnos
83f988b8e3 Merge branch 'master' into release/3.3
# Conflicts:
#	lerna.json
#	package.json
2017-10-04 02:35:31 +03:00
Michael Shilman
83cc148d1f Disable nom publish on all non-master branches to prevent mistakes 2017-10-04 00:32:56 +02:00
hypnos
9d8df63208 Update lerna.json 2017-10-04 00:02:25 +03:00
Michael Shilman
b577ddd543 v3.3.0-alpha.2 2017-10-03 22:10:15 +02:00
Michael Shilman
3f97c6f175 v3.2.12 2017-10-03 00:29:46 +02:00
Michael Shilman
8ece54186a Ignore vue-example (package name updated) 2017-10-03 00:02:35 +02:00
Michael Shilman
5030ee196c v3.3.0-alpha.1 2017-10-02 20:57:35 +02:00
hypnos
2f53feb64a Use yarn workspaces on master 2017-09-29 23:00:47 +03:00
Michael Shilman
33977480e7 v3.2.11 2017-09-27 00:53:29 +02:00
Michael Shilman
748e5959ec v3.2.10 2017-09-22 22:42:13 +01:00
hypnos
dc140b02ed Merge remote-tracking branch 'upstream/release/3.3' into 269-angular-support 2017-09-15 03:45:42 +03:00
hypnos
067ccdf9a0 Refactor CLI 2017-09-14 04:35:40 +03:00
Carlos Vega
cad98bbd69 Merge branch '269-angular-support' of github.com:storybooks/storybook into 269-angular-support 2017-09-12 13:00:16 -06:00
Norbert de Langen
ab30934249 trying to fix after yarn workspaces change 2017-09-09 13:30:49 +02:00
Norbert de Langen
eb9fe3c6e7 Merge branch 'release/3.3' into 269-angular-support 2017-09-09 09:30:20 +02:00
hypnos
6d3752168a Fix lerna.json 2017-09-07 02:08:10 +03:00
hypnos
dc0bd90930 Merge remote-tracking branch 'upstream/release/3.3' into yarn-workspaces
# Conflicts:
#	yarn.lock
2017-09-07 01:07:27 +03:00
hypnos
4d10a55997 Introduce yarn workspaces 2017-09-07 00:55:44 +03:00
Michael Shilman
94723262d9 v3.3.0-alpha.0 2017-09-06 13:46:17 -07:00
Norbert de Langen
1a8dbdd09f Merge branch 'release/3.3' into 269-angular-support 2017-09-06 09:30:28 +02:00
Michael Shilman
381d4e84e2 v3.2.9 2017-08-26 08:56:30 -07:00
Norbert de Langen
7c93bf6736 Merge branch 'release/3.3' into 269-angular-support 2017-08-24 20:02:27 +02:00
Michael Shilman
0159955ba7 v3.2.8 2017-08-23 13:55:09 -07:00
Michael Shilman
c6a690e037 v3.2.7 2017-08-23 09:23:41 -07:00