Skip to content

Commit

Permalink
Merge pull request #218 from creative-commoners/pulls/master/upgrade-…
Browse files Browse the repository at this point in the history
…depenencies

Upgrading dependencies
  • Loading branch information
bergice committed Nov 7, 2019
2 parents a11825c + ee03373 commit ccba41e
Show file tree
Hide file tree
Showing 7 changed files with 2,455 additions and 1,199 deletions.
2 changes: 1 addition & 1 deletion client/dist/js/bundle-admin.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/dist/js/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/dist/styles/bundle-admin.css

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
},
"devDependencies": {
"@silverstripe/eslint-config": "^0.0.5",
"@silverstripe/webpack-config": "^1.0.0",
"@silverstripe/webpack-config": "^1.3.0",
"@storybook/react": "^3.4.10",
"babel-jest": "^23.6.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.10.0",
"expose-loader": "^0.7.4",
"mime": "^1.4.1",
"jest-cli": "^23.6.0",
"mime": "^1.4.1",
"raf": "^3.4.1",
"sass-loader": "^6.0.7"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/ResourceLocatorField.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace SilverStripe\CKANRegistry\Forms;

use InvalidArgumentException;
Expand Down Expand Up @@ -141,7 +142,6 @@ public function dataValue()
return json_encode($this->Value());
}


public function saveInto(DataObjectInterface $dataObject)
{
// Duplicate existing logic where the field is skipped given there's no name on this field.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace SilverStripe\CKANRegistry\Tests\Forms\GridField\GridFieldDetailForm;

use SilverStripe\Admin\LeftAndMain;
Expand Down

0 comments on commit ccba41e

Please sign in to comment.