NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into remove_colors

Browse source
This commit is contained in:
Eric Schultz 2019-02-26 14:31:09 -06:00 committed by GitHub
commit 5f898fdf2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
package-lock.json generated
View file

@ -568,7 +568,8 @@
"@types/jquery": { "@types/jquery": {
"version": "3.3.1", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.1.tgz", "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.1.tgz",
"integrity": "sha512-N3h+rzN518yl2xKrW0o6KKdNmWZ+OwG6SoM5TBEQFF0tTv5wXPEsoOuYQ2Kt3/89XbcSZUJLdjiT/2c3BR/ApQ==" "integrity": "sha512-N3h+rzN518yl2xKrW0o6KKdNmWZ+OwG6SoM5TBEQFF0tTv5wXPEsoOuYQ2Kt3/89XbcSZUJLdjiT/2c3BR/ApQ==",
"dev": true
}, },
"@types/jsdom": { "@types/jsdom": {
"version": "11.0.4", "version": "11.0.4",
@ -676,6 +677,7 @@
"version": "1.2.33", "version": "1.2.33",
"resolved": "https://registry.npmjs.org/@types/velocity-animate/-/velocity-animate-1.2.33.tgz", "resolved": "https://registry.npmjs.org/@types/velocity-animate/-/velocity-animate-1.2.33.tgz",
"integrity": "sha512-0UAWZSIAT7QE2kR1tcCJcfed3VY2m7VDbLhXEFt+5yog9mb+JSTAukBJVGOqptm5vuXJhvyOFzVkeNU4mjqcvg==", "integrity": "sha512-0UAWZSIAT7QE2kR1tcCJcfed3VY2m7VDbLhXEFt+5yog9mb+JSTAukBJVGOqptm5vuXJhvyOFzVkeNU4mjqcvg==",
"dev": true,
"requires": { "requires": {
"@types/jquery": "*" "@types/jquery": "*"
} }
@ -6705,9 +6707,12 @@
"dev": true "dev": true
}, },
"hoist-non-react-statics": { "hoist-non-react-statics": {
"version": "2.5.5", "version": "3.3.0",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
"integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
"requires": {
"react-is": "^16.7.0"
}
}, },
"home-or-tmp": { "home-or-tmp": {
"version": "2.0.0", "version": "2.0.0",
@ -14157,11 +14162,11 @@
"integrity": "sha1-M05aq0kWsdQ/D682BaZLG0s8y40=" "integrity": "sha1-M05aq0kWsdQ/D682BaZLG0s8y40="
}, },
"mobx-react": { "mobx-react": {
"version": "5.2.3", "version": "5.4.3",
"resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.2.3.tgz", "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.3.tgz",
"integrity": "sha512-OuSlF2nJEa1PGookZcZnINbvEK4iWNNYiqUh6aebk2AkWxj3sG8OafDOQMcMYApQALTHRsrBIjOx/K8TFxcz7w==", "integrity": "sha512-WC8yFlwvJ91hy8j6CrydAuFteUafcuvdITFQeHl3LRIf5ayfT/4W3M/byhEYD2BcJWejeXr8y4Rh2H26RunCRQ==",
"requires": { "requires": {
"hoist-non-react-statics": "^2.5.0", "hoist-non-react-statics": "^3.0.0",
"react-lifecycles-compat": "^3.0.2" "react-lifecycles-compat": "^3.0.2"
} }
}, },
@ -17012,8 +17017,7 @@
"react-is": { "react-is": {
"version": "16.8.1", "version": "16.8.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.1.tgz", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.1.tgz",
"integrity": "sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA==", "integrity": "sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA=="
"dev": true
}, },
"react-lifecycles-compat": { "react-lifecycles-compat": {
"version": "3.0.4", "version": "3.0.4",

4
package.json
View file

@ -34,6 +34,7 @@
"@types/react-text-mask": "^5.4.2", "@types/react-text-mask": "^5.4.2",
"@types/sinon": "^4.3.3", "@types/sinon": "^4.3.3",
"@types/validator": "^9.4.1", "@types/validator": "^9.4.1",
"@types/velocity-animate": "^1.2.33",
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
"babel-loader": "^7.1.4", "babel-loader": "^7.1.4",
"babel-preset-env": "^1.6.1", "babel-preset-env": "^1.6.1",
@ -83,7 +84,6 @@
"webpack-sweet-entry": "^1.1.4" "webpack-sweet-entry": "^1.1.4"
}, },
"dependencies": { "dependencies": {
"@types/velocity-animate": "^1.2.33",
"attr-binder": "0.3.1", "attr-binder": "0.3.1",
"aws-sdk": "^2.402.0", "aws-sdk": "^2.402.0",
"chart.js": "2.1.4", "chart.js": "2.1.4",
@ -116,7 +116,7 @@
"jquery.cookie": "1.4.1", "jquery.cookie": "1.4.1",
"marked": "^0.3.18", "marked": "^0.3.18",
"mobx": "^4.3.1", "mobx": "^4.3.1",
"mobx-react": "^5.2.3", "mobx-react": "^5.4.3",
"mobx-react-devtools": "^5.0.1", "mobx-react-devtools": "^5.0.1",
"mobx-react-form": "github:houdiniproject/mobx-react-form#our_fix", "mobx-react-form": "github:houdiniproject/mobx-react-form#our_fix",
"mobx-utils": "^5.0.1", "mobx-utils": "^5.0.1",