Skip to content
This repository has been archived by the owner on May 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into example/checkable-list
Browse files Browse the repository at this point in the history
  • Loading branch information
freedomlang authored Apr 16, 2019
2 parents 1872741 + 6e41163 commit a70335a
Show file tree
Hide file tree
Showing 64 changed files with 27,537 additions and 474 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"plugins": ["prettier", "flowtype", "react", "standard"],
"env": {
"es6": true,
"browser": true
"browser": true,
"mocha": true
},
"rules": {
"prettier/prettier": "error"
Expand Down
26 changes: 13 additions & 13 deletions examples/add-video-block/package-lock.json

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

8 changes: 4 additions & 4 deletions examples/add-video-block/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@djsp/block-insert",
"homepage": "https://juliankrispel.github.io/@djsp/core",
"name": "@djsp/add-video-block-example",
"homepage": "https://github.com/draft-js-plugins/next#readme",
"version": "0.1.5",
"private": true,
"license": "MIT",
Expand All @@ -9,8 +9,8 @@
"@djsp/core": "^0.1.5",
"@djsp/utils": "^0.1.5",
"prop-types": "^15.6.1",
"react": "^16.5.0",
"react-dom": "^16.2.0",
"react": "16.5.0",
"react-dom": "16.5.0",
"react-scripts": "^1.1.1",
"react-text-selection-popover": "^1.0.3",
"styled-components": "^3.4.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/add-video-block/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">

<title>@djsp/core</title>
<title>@djsp/add-video-block-example</title>
</head>

<body>
Expand Down
24 changes: 12 additions & 12 deletions examples/atomic-block/package-lock.json

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

4 changes: 2 additions & 2 deletions examples/atomic-block/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"@djsp/core": "^0.1.5",
"emoji.json": "^11.0.0",
"prop-types": "^15.6.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react": "16.5.0",
"react-dom": "16.5.0",
"react-scripts": "^1.1.1"
},
"scripts": {
Expand Down
26 changes: 13 additions & 13 deletions examples/block-switcher/package-lock.json

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

8 changes: 4 additions & 4 deletions examples/block-switcher/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@djsp/block-switcher",
"homepage": "https://juliankrispel.github.io/@djsp/core",
"name": "@djsp/block-switcher-example",
"homepage": "https://github.com/draft-js-plugins/next#readme",
"version": "0.1.5",
"private": true,
"license": "MIT",
Expand All @@ -9,8 +9,8 @@
"@djsp/core": "^0.1.5",
"@djsp/utils": "^0.1.5",
"prop-types": "^15.6.1",
"react": "^16.5.0",
"react-dom": "^16.2.0",
"react": "16.5.0",
"react-dom": "16.5.0",
"react-scripts": "^1.1.1"
},
"scripts": {
Expand Down
3 changes: 1 addition & 2 deletions examples/block-switcher/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">

<title>@djsp/core</title>
<title>@djsp/block-switcher-example</title>
</head>

<body>
Expand Down
Loading

0 comments on commit a70335a

Please sign in to comment.