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
|
52f0bc687a
|
v4.0.0-alpha.16
|
2018-08-06 22:25:51 +08:00 |
|
Norbert de Langen
|
b4df20c3a1
|
Merge pull request #3958 from nm123github/options-param
Make addon-options work with story parameters
|
2018-08-06 12:03:15 +02:00 |
|
Neville Mehta
|
45d5b965d5
|
make options add-on accept params
|
2018-08-04 14:53:52 -07: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
|
819ff14255
|
v4.0.0-alpha.15
|
2018-08-03 17:56:23 +08: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
|
e5e1e3aff8
|
v4.0.0-alpha.14
|
2018-07-11 17:13:57 -07:00 |
|
Michael Shilman
|
681869bfcd
|
v4.0.0-alpha.13
|
2018-07-09 21:31:07 -07:00 |
|
Hypnosphi
|
b6153d1034
|
Merge master
|
2018-07-04 17:45:57 +03:00 |
|
Michael Shilman
|
a14a8e4a9a
|
v4.0.0-alpha.12
|
2018-07-03 15:58:21 -07:00 |
|
Michael Shilman
|
9a872790a2
|
v4.0.0-alpha.11
|
2018-07-02 11:14:04 -07:00 |
|
Neville Mehta
|
5f775a8591
|
make welcome a component
|
2018-06-25 22:37:47 -07:00 |
|
Michael Shilman
|
4e70f9d192
|
v4.0.0-alpha.10
|
2018-06-21 21:48:49 +08:00 |
|
Hypnosphi
|
113c182de2
|
Merge master
|
2018-06-16 20:25:47 +03:00 |
|
igor-dv
|
56d030ebc3
|
Remove eslint from the marko-cli project
|
2018-06-11 14:21:40 +03:00 |
|
igor-dv
|
c19e141147
|
Change version of the marko-widgets to 7.0.1
|
2018-06-11 10:01:23 +03:00 |
|
Michael Shilman
|
1a03042590
|
v4.0.0-alpha.9
|
2018-06-10 15:42:04 +08:00 |
|
Dependencies.io Bot
|
16bd10fe1c
|
Update webpack from 4.10.1 to 4.10.2 in examples/marko-cli
|
2018-06-04 23:17:40 +00:00 |
|
Dependencies.io Bot
|
80238a2948
|
Update prettier from 1.13.2 to 1.13.4 in examples/marko-cli
|
2018-06-04 23:17:39 +00:00 |
|
Dependencies.io Bot
|
d9f87c7f53
|
Update webpack from 4.8.3 to 4.9.2 in examples/marko-cli
|
2018-05-28 21:54:24 +00:00 |
|
Dependencies.io Bot
|
5a9e4ad2bc
|
Update prettier from 1.12.1 to 1.13.0 in examples/marko-cli
|
2018-05-28 21:54:23 +00:00 |
|
Dependencies.io Bot
|
ce8eb510b7
|
Update marko from 4.9.7 to 4.10.0 in examples/marko-cli
|
2018-05-28 21:54:23 +00:00 |
|
Michael Shilman
|
6a1f5e4675
|
v4.0.0-alpha.8
|
2018-05-26 18:47:25 -07:00 |
|
Neville Mehta
|
578942bd5c
|
Merge branch 'master' into addmarkosupport
|
2018-05-19 18:57:13 -07:00 |
|
Neville Mehta
|
2d53fb8e15
|
fix some marko-widgets button
|
2018-05-19 18:34:38 -07:00 |
|
Neville Mehta
|
39390d2a28
|
add support for marko widgets
|
2018-05-19 01:44:03 -07:00 |
|
Norbert de Langen
|
43279a3076
|
Merge branch 'master' into feature/more-components
|
2018-05-18 13:38:51 +02:00 |
|
Hypnosphi
|
7d918df181
|
Merge remote-tracking branch 'origin/master' into dependencies.io-update-build-341.0.0
# Conflicts:
# lib/core/package.json
|
2018-05-18 03:12:24 +03:00 |
|
Michael Shilman
|
008414bc47
|
v4.0.0-alpha.7
|
2018-05-17 16:02:57 -07:00 |
|
Norbert de Langen
|
ec88428d3b
|
Merge branch 'master' into dependencies.io-update-build-341.0.0
|
2018-05-17 17:46:46 +02:00 |
|
Norbert de Langen
|
3925f5a09f
|
CHANGE package.json files so they are sorted nicely
|
2018-05-17 01:05:18 +02:00 |
|
Dependencies.io Bot
|
e291bd322e
|
Update webpack from 4.8.1 to 4.8.3 in examples/marko-cli
|
2018-05-14 16:48:15 +00:00 |
|
Hypnosphi
|
7b1907946a
|
Merge remote-tracking branch 'origin/master' into generic-addon-decorators
# Conflicts:
# addons/viewport/package.json
|
2018-05-13 01:27:33 +03:00 |
|
Michael Shilman
|
369e7204a6
|
v4.0.0-alpha.6
|
2018-05-12 13:32:30 -07:00 |
|
Michael Shilman
|
ca8d96d6d5
|
v4.0.0-alpha.5
|
2018-05-12 13:26:33 -07:00 |
|
Hypnosphi
|
2e30aeb675
|
Generic addon-knobs decorator
|
2018-05-09 18:14:04 +03:00 |
|
Neville Mehta
|
e9df6b6700
|
add storysource addon
|
2018-05-06 01:13:02 -07:00 |
|
Neville Mehta
|
24bdcfcd3c
|
remove No Preview story
|
2018-05-05 15:00:05 -07:00 |
|
Hypnosphi
|
1acf55fcfb
|
register options addon
|
2018-05-05 23:23:56 +03:00 |
|
Hypnosphi
|
067caf8498
|
Configure hierarchy separator
|
2018-05-05 22:09:12 +03:00 |
|
Neville Mehta
|
4e7018d990
|
update app/marko version.
|
2018-05-01 16:16:19 -07:00 |
|
Neville Mehta
|
727e14df48
|
add info in ADDONS_SUPPORT.md
|
2018-05-01 11:25:23 -07:00 |
|
Neville Mehta
|
d99b440758
|
review comments, use new showError framework
|
2018-05-01 01:32:43 -07:00 |
|
Neville Mehta
|
d09c83fea0
|
add postcss-loader options in js, some refactoring of stories
|
2018-04-30 19:34:46 -07:00 |
|
Neville Mehta
|
26d71a0e66
|
fix lint errors for marko app
|
2018-04-30 00:16:36 -07:00 |
|
Neville Mehta
|
7a09fd3e8f
|
remove unused references in files
|
2018-04-29 20:02:26 -07:00 |
|
Neville Mehta
|
d44022f96c
|
fix app/marko to point to 4.0.0-alpha.4, remove stuff thats not needed, and some refactor
|
2018-04-29 18:37:18 -07:00 |
|
Neville Mehta
|
38076540e9
|
make knobs+actions work
|
2018-04-28 15:59:17 -07:00 |
|