155 Commits

Author SHA1 Message Date
hypnos
f07cb15973 Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-05 02:42:23 +03:00
Dependencies.io Bot
88fc4cf578 Update graphql from 0.11.6 to 0.11.7 in addons/graphql 2017-10-04 21:42:57 +00: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
5030ee196c v3.3.0-alpha.1 2017-10-02 20:57:35 +02:00
Michael Shilman
70825cb2dc resolve conflicts merging master into release/3.3 2017-10-02 20:20:10 +02:00
hypnos
2e8240d176 Fix/suppress current eslint warnings.
Raise `import/no-unresolved` and `import/extensions` to error level
everywhere except `docs`
2017-10-02 01:40:46 +03:00
Filipp Riabchun
a306d2bd1b Merge branch 'master' into release/3.3 2017-09-30 15:35:05 -07:00
hypnos
cb98495438 Fix merge artifact 2017-10-01 01:26:51 +03:00
Filipp Riabchun
d43a38b692 Merge branch 'master' into graphql-0.11.6-3.0.0-addons--graphql 2017-09-30 15:23:59 -07:00
Norbert de Langen
a270216e96 Merge branch 'master' into release/3.3
# Conflicts:
#	CONTRIBUTING.md
#	addons/actions/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	dependencies.yml
#	examples/cra-kitchen-sink/package.json
#	examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
#	examples/crna-kitchen-sink/package.json
#	examples/react-native-vanilla/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.test.js
#	yarn.lock
2017-09-30 23:19:44 +02:00
Dependencies.io Bot
ccaf965bd4 Update graphql from 0.7.2 to 0.11.6 in addons/graphql 2017-09-30 20:48:59 +00:00
Dependencies.io Bot
261be27010 Update graphiql from 0.7.8 to 0.11.5 in addons/graphql 2017-09-30 20:47:06 +00:00
Filipp Riabchun
f152c0dcb6 Merge branch 'master' into ndelangen/upgrade-react 2017-09-30 06:21:30 -07:00
Norbert de Langen
02c6198a8b UPGRADE react & friends && UPGRADE other dependencies 2017-09-29 23:36:38 +02:00
hypnos
2f53feb64a Use yarn workspaces on master 2017-09-29 23:00:47 +03:00
Michael Shilman
748e5959ec v3.2.10 2017-09-22 22:42:13 +01:00
hypnos
824bbd6a6d Replace the deprecated prepublish script with prepare 2017-09-08 03:19:39 +03:00
Michael Shilman
94723262d9 v3.3.0-alpha.0 2017-09-06 13:46:17 -07:00
Norbert de Langen
7ab74c6a34 LINTING 2017-09-06 20:57:31 +02:00
Norbert de Langen
d0b752d8d3 FIX linting after prettier upgrade 2017-09-06 00:54:12 +02:00
Michael Shilman
8e03aacb68 v3.2.0 2017-07-31 07:12:08 -07:00
Michael Shilman
0188ace87f v3.2.0-alpha.10 2017-07-27 01:06:54 -07:00
Norbert de Langen
c11c189d7e UPDATE everything (including eslint 4) 2017-07-25 11:20:08 +02:00
Michael Shilman
d8f22cdb85 v3.1.6 2017-06-26 16:32:38 +10:00
Michael Shilman
b20e6f5091 Remove package-lock.json 2017-06-23 01:03:45 +10:00
Michael Shilman
a620cfed2a v3.1.5 2017-06-22 16:36:43 +10:00
Michael Shilman
e5041fa06a Add package-lock.json
Per discussion with @tmeasday 😉
2017-06-22 11:17:16 +10:00
Michael Shilman
c289d15bc7 v3.1.2 2017-06-09 23:53:03 +12:00
Michael Shilman
ea616369eb v3.1.1 2017-06-09 23:31:52 +12:00
Michael Shilman
56052112c3 v3.1.0 2017-06-09 22:52:20 +12:00
James Hush
4b534e9a94 Fix bug in addons/graphql in reIndentQuery 2017-06-06 14:24:19 -07:00
Norbert de Langen
28a4b32323 CHANGE all package.jsons so they are uniformly sorted 2017-06-06 17:46:55 +02:00
Norbert de Langen
7765c4534b Merge branch 'master' into eslint-strict
# Conflicts:
#	app/react-native/src/manager/components/PreviewHelp.js
2017-06-06 17:43:50 +02:00
Norbert de Langen
d75bcb896f FIX linting 2017-06-06 15:55:44 +02:00
Michael Shilman
5ec0dad1a3 Updated repository URL to address broken npm images 2017-06-06 01:48:54 +12:00
Norbert de Langen
8fef4bb2d8 FIX linting 2017-06-05 00:58:23 +02:00
Norbert de Langen
47eaac103d FIX linting 2017-06-03 21:23:31 +02:00
Norbert de Langen
af1b0c11d2 Merge branch 'master' into eslint-strict
# Conflicts:
#	.eslintignore
#	.travis.yml
#	addons/actions/src/containers/ActionLogger/index.js
#	addons/centered/package.json
#	addons/graphql/package.json
#	addons/info/src/components/PropTable.js
#	addons/info/src/components/Props.js
#	addons/knobs/package.json
#	addons/knobs/src/components/Panel.js
#	addons/notes/package.json
#	addons/notes/src/index.js
#	addons/notes/src/register.js
#	addons/storyshots/package.json
#	addons/storyshots/src/index.js
#	app/react-native/package.json
#	app/react/package.json
#	examples/cra-storybook/package.json
#	examples/cra-storybook/src/stories/Welcome.js
#	examples/test-cra/src/stories/Button.js
#	examples/test-cra/src/stories/Welcome.js
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/cli/bin/generate.js
#	lib/cli/generators/METEOR/index.js
#	lib/cli/generators/REACT/index.js
#	lib/cli/generators/REACT/template/stories/index.js
#	lib/cli/generators/REACT_NATIVE/index.js
#	lib/cli/generators/REACT_SCRIPTS/index.js
#	lib/cli/generators/REACT_SCRIPTS/template/src/stories/Welcome.js
#	lib/cli/generators/WEBPACK_REACT/index.js
#	lib/cli/lib/helpers.js
#	lib/cli/package.json
#	package.json
2017-05-31 07:45:04 +02:00
Michael Shilman
af41dd1c48 v3.0.0 2017-05-31 01:39:35 +12:00
Michael Shilman
470c22f92a v3.0.0-rc.3 2017-05-30 20:46:11 +12:00
Norbert de Langen
db3cd0b6eb FIX spelling 2017-05-27 22:10:34 +02:00
Norbert de Langen
4a2bc9333a v3.0.0-rc.2 2017-05-27 13:46:50 +02:00
Norbert de Langen
67d902f237 FIX listing for markdown 2017-05-26 11:21:46 +02:00
Norbert de Langen
8be2c88085 FIX cyclical dependencies 2017-05-25 22:22:33 +02:00
Norbert de Langen
f88dfc37ea v3.0.0-rc.0 2017-05-25 18:28:23 +02:00
Michael Shilman
ffe31ef676 Update all package.json with monorepo metadata
- correct repository/homepage/bugs info
2017-05-24 13:48:13 +10:00
Norbert de Langen
57809215f6 v3.0.0-alpha.4 2017-05-23 00:09:21 +02:00
Norbert de Langen
8e9809823f v3.0.0-alpha.3 2017-05-23 00:08:11 +02:00
Norbert de Langen
a81757b333 v3.0.0-alpha.1 2017-05-19 22:40:47 +02:00