Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/IBM/gantt-chart
Browse files Browse the repository at this point in the history
  • Loading branch information
gillesdandrea committed Nov 27, 2019
2 parents 5e278c9 + cb9ab8f commit 715ce37
Show file tree
Hide file tree
Showing 26 changed files with 138 additions and 118 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,12 @@ node_modules/
stats.html
stats.json
.DS_Store
.idea/workspace.xml
.idea/watcherTasks.xml
.idea/vcs.xml
.idea/modules.xml
.idea/misc.xml
.idea/inspectionProfiles/Project_Default.xml
.idea/gantt-chart.iml
.idea/deployment.xml
.idea/$CACHE_FILE$
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.5.0",
"version": "0.5.2",
"command": {
"publish": {
"gitReset": false,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"prettier:list": "prettier -l \"packages/*/{src,test}/**/*.{js,jsx,css,scss,json,md}\" \"packages/*/.*.js\" \"packages/*/*.js\" \".*.js\" \"*.js\" \"docs/*.md\" \"*.md\"",
"slint": "gda-scripts stylelint packages/*/{src,test}",
"slint:fix": "gda-scripts stylelint packages/*/{src,test} --fix",
"start": "cd packages/gantt-chart && yarn start",
"start": "cd packages/ibm-gantt-chart-dev && yarn start",
"update": "yarn upgrade-interactive --latest"
},
"lint-staged": {
Expand Down
4 changes: 2 additions & 2 deletions packages/ibm-gantt-chart-dev/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ibm-gantt-chart-dev",
"version": "0.5.0",
"version": "0.5.2",
"private": true,
"description": "IBM Gantt Chart Dev",
"license": "Apache-2.0",
Expand All @@ -16,7 +16,7 @@
},
"dependencies": {
"@babel/polyfill": "^7.4.4",
"ibm-gantt-chart": "^0.5.0"
"ibm-gantt-chart": "^0.5.2"
},
"devDependencies": {
"gda-scripts": "^0.3.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/ibm-gantt-chart-docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ibm-gantt-chart-docs",
"version": "0.5.0",
"version": "0.5.2",
"private": true,
"description": "IBM Gantt Chart, docs and examples.",
"keywords": [
Expand All @@ -19,7 +19,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"ibm-gantt-chart": "^0.5.0"
"ibm-gantt-chart": "^0.5.2"
},
"devDependencies": {
"gda-scripts": "^0.3.0"
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/ibm-gantt-chart-docs/storybook/iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@
} catch (e) {
// eslint-disable-next-line no-console
console.warn('unable to connect to parent frame for connecting dev tools');
}</script><link href="ibm-gantt-chart-docs-vendors~main.css" rel="stylesheet"><link href="ibm-gantt-chart-docs-main.css" rel="stylesheet"></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><div id="error-message" class="sb-heading"></div><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><script src="runtime~main.fcb321860dc142377bbd.bundle.js"></script><script src="vendors~main.fcb321860dc142377bbd.bundle.js"></script><script src="main.fcb321860dc142377bbd.bundle.js"></script></body></html>
}</script><link href="ibm-gantt-chart-docs-vendors~main.css" rel="stylesheet"><link href="ibm-gantt-chart-docs-main.css" rel="stylesheet"></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><div id="error-message" class="sb-heading"></div><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><script src="runtime~main.c5698a43cb2836d9ec8a.bundle.js"></script><script src="vendors~main.c5698a43cb2836d9ec8a.bundle.js"></script><script src="main.c5698a43cb2836d9ec8a.bundle.js"></script></body></html>
2 changes: 1 addition & 1 deletion packages/ibm-gantt-chart-docs/storybook/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
} catch (e) {
// eslint-disable-next-line no-console
console.warn('unable to connect to parent frame for connecting dev tools');
}</script></head><body><div id="root"></div><script src="runtime~main.17da544d0ef88cbabfaf.bundle.js"></script><script src="vendors~main.bcd52b31c975153996fc.bundle.js"></script><script src="main.d4ce6112879e07963182.bundle.js"></script></body></html>
}</script></head><body><div id="root"></div><script src="runtime~main.17da544d0ef88cbabfaf.bundle.js"></script><script src="vendors~main.e54f44a09754fd0a86fd.bundle.js"></script><script src="main.f037b806461afeb7a74b.bundle.js"></script></body></html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

4 changes: 2 additions & 2 deletions packages/ibm-gantt-chart-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ibm-gantt-chart-react",
"version": "0.5.0",
"version": "0.5.2",
"description": "IBM Gantt Chart React Component.",
"repository": "https://github.com/ibm/gantt-chart",
"keywords": [
Expand All @@ -27,7 +27,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"ibm-gantt-chart": "^0.5.0"
"ibm-gantt-chart": "^0.5.2"
},
"devDependencies": {
"@hot-loader/react-dom": "^16.8.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/ibm-gantt-chart/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ibm-gantt-chart",
"version": "0.5.0",
"version": "0.5.2",
"description": "IBM Gantt Chart Component, integrable in Vanilla, jQuery, or React Framework.",
"repository": "https://github.com/ibm/gantt-chart",
"keywords": [
Expand Down
Loading

0 comments on commit 715ce37

Please sign in to comment.