From 9b2b3c3402dff2a66719fabd3c948b33f011061a Mon Sep 17 00:00:00 2001 From: Okechi Onyeje Date: Wed, 16 Jan 2019 20:33:35 -0500 Subject: [PATCH] UPS8: Added ProfileView Form with header, footer -still working on menu press functionality that renders menus - working on rendering profile switching modal popup - working on integrating getProfile calls from server --- .gitignore | 2 + assets/GreenCheck.png | Bin 0 -> 738 bytes package-lock.json | 9022 ++++++++++++++++- package.json | 1 + src/components/BizCard/BizCardView.js | 60 + src/components/BizCard/styles.js | 37 + src/components/common/Footer.js | 35 +- .../forms/ProfileForms/ProfileForm.js | 86 + .../ProfileForm_old.js} | 67 +- .../forms/ProfileForms/ProfileViewForm.js | 329 + src/components/forms/ProfileForms/styles.js | 93 + src/components/styleVars.js | 6 + src/config/apiEndpoints.js | 6 +- src/config/router.js | 2 + src/screens/profile/ProfileHomeScreen.js | 111 + src/screens/profile/styles.js | 19 + src/utils/fetch.js | 10 +- src/utils/profile.js | 18 + 18 files changed, 9810 insertions(+), 94 deletions(-) create mode 100644 assets/GreenCheck.png create mode 100644 src/components/BizCard/BizCardView.js create mode 100644 src/components/BizCard/styles.js create mode 100644 src/components/forms/ProfileForms/ProfileForm.js rename src/components/forms/{ProfileForm.js => ProfileForms/ProfileForm_old.js} (95%) create mode 100644 src/components/forms/ProfileForms/ProfileViewForm.js create mode 100644 src/components/forms/ProfileForms/styles.js create mode 100644 src/components/styleVars.js create mode 100644 src/screens/profile/ProfileHomeScreen.js create mode 100644 src/screens/profile/styles.js create mode 100644 src/utils/profile.js diff --git a/.gitignore b/.gitignore index bf579dd..42015b5 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,8 @@ node_modules/ npm-debug.log yarn-error.log .envrc +.vscode/ +storybook/ # BUCK buck-out/ diff --git a/assets/GreenCheck.png b/assets/GreenCheck.png new file mode 100644 index 0000000000000000000000000000000000000000..100765c1e14b442de29568d1984c140f10f4d1f6 GIT binary patch literal 738 zcmV<80v-K{P)x)izUP)@B=!Hii7L9@ZIneOTEvV5Ie&e8Aq zJkR@i|NrOVeO@77Vtx~Wa>`3;q{r0f{#f{xP?041xx&hPd0}x_<4-OSA;GlA%Bkq1W%@FsO z$2hxm1<(n8Q=?FhP%)?=+;R8OX@;0ch3WcvEi+S!LAydYSqwVlzC^d#!9*%dTfB!~ zI%Qwcs(=Ik7X=`ofW7vS5;3TA*5*VNihJ$>y3G#8QZb5L8L0N)hId;7@Cm3OrMIFBJt zo_X&QH0l|4U#81!|JR;o7d$I01iH}-XHOk>9b>HgHikHH;wYqjTl6_0+E|7wJrC^4 zo^B~=;)!R7S1VHmRtlgKxJ;jQ2`x1AqxE2}Wk(D@v#XyAL;;ZjDyOenuyqHAfyTm~ z&YKAFwIKeFE9=+hVxX2ZF92VW=vQ>QnW_&l$lPuK6*EypwSY_)RjCc#2m@3`=13-k zXa+$iw)S)akpbdsK|2b${&|^vsV~Ri3?e7c)Pwed>;PgQvygs@%N)h~HfI5U04Oil U>#NsI-T(jq07*qoM6N<$f_Q&DlmGw# literal 0 HcmV?d00001 diff --git a/package-lock.json b/package-lock.json index 7c1e2f7..03d41ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -312,7 +312,12 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.2.0.tgz", "integrity": "sha512-QFmtcCShFkyAsNtdCM3lJPmRe1iB+vPZymlB4LnDIKEBj2yKQLQKtoxXxJ8ePT5fwMl4QGg303p4mB0UsSI2/g==", "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-plugin-utils": "7.0.0" +<<<<<<< refs/remotes/origin/master +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-proposal-async-generator-functions": { @@ -321,9 +326,17 @@ "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==", "dev": true, "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0", "@babel/helper-remap-async-to-generator": "^7.1.0", "@babel/plugin-syntax-async-generators": "^7.2.0" +======= + "@babel/helper-plugin-utils": "7.0.0", + "@babel/helper-remap-async-to-generator": "7.1.0", + "@babel/plugin-syntax-async-generators": "7.2.0" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-proposal-class-properties": { @@ -340,8 +353,14 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.2.0.tgz", "integrity": "sha512-NVfNe7F6nsasG1FnvcFxh2FN0l04ZNe75qTOAVOILWPam0tw9a63RtT/Dab8dPjedZa4fTQaQ83yMMywF9OSug==", "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-syntax-export-default-from": "^7.2.0" +======= + "@babel/helper-plugin-utils": "7.0.0", + "@babel/plugin-syntax-export-default-from": "7.2.0" +<<<<<<< refs/remotes/origin/master +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-proposal-json-strings": { @@ -350,8 +369,15 @@ "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==", "dev": true, "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-syntax-json-strings": "^7.2.0" +======= + "@babel/helper-plugin-utils": "7.0.0", + "@babel/plugin-syntax-json-strings": "7.2.0" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-proposal-nullish-coalescing-operator": { @@ -386,8 +412,14 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz", "integrity": "sha512-ea3Q6edZC/55wEBVZAEz42v528VulyO0eir+7uky/sT4XRcdkWJcFi1aPtitTlwUzGnECWJNExWww1SStt+yWw==", "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-syntax-optional-chaining": "^7.2.0" +======= + "@babel/helper-plugin-utils": "7.0.0", + "@babel/plugin-syntax-optional-chaining": "7.2.0" +<<<<<<< refs/remotes/origin/master +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-proposal-unicode-property-regex": { @@ -407,7 +439,13 @@ "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==", "dev": true, "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-plugin-utils": "7.0.0" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-syntax-class-properties": { @@ -439,7 +477,12 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz", "integrity": "sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==", "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-plugin-utils": "7.0.0" +<<<<<<< refs/remotes/origin/master +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-syntax-json-strings": { @@ -448,7 +491,13 @@ "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==", "dev": true, "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-plugin-utils": "7.0.0" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-syntax-jsx": { @@ -562,7 +611,12 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz", "integrity": "sha512-coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ==", "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-plugin-utils": "7.0.0" +<<<<<<< refs/remotes/origin/master +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-transform-dotall-regex": { @@ -582,7 +636,13 @@ "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==", "dev": true, "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-plugin-utils": "7.0.0" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-transform-exponentiation-operator": { @@ -633,7 +693,12 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz", "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==", "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-plugin-utils": "7.0.0" +<<<<<<< refs/remotes/origin/master +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-transform-modules-amd": { @@ -642,8 +707,15 @@ "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==", "dev": true, "requires": { +<<<<<<< master "@babel/helper-module-transforms": "^7.1.0", "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-module-transforms": "7.2.2", + "@babel/helper-plugin-utils": "7.0.0" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-transform-modules-commonjs": { @@ -651,9 +723,16 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz", "integrity": "sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==", "requires": { +<<<<<<< master "@babel/helper-module-transforms": "^7.1.0", "@babel/helper-plugin-utils": "^7.0.0", "@babel/helper-simple-access": "^7.1.0" +======= + "@babel/helper-module-transforms": "7.2.2", + "@babel/helper-plugin-utils": "7.0.0", + "@babel/helper-simple-access": "7.1.0" +<<<<<<< refs/remotes/origin/master +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-transform-modules-systemjs": { @@ -691,7 +770,13 @@ "integrity": "sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==", "dev": true, "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-plugin-utils": "7.0.0" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-transform-object-assign": { @@ -805,8 +890,14 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz", "integrity": "sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==", "requires": { +<<<<<<< master "@babel/helper-annotate-as-pure": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-annotate-as-pure": "7.0.0", + "@babel/helper-plugin-utils": "7.0.0" +<<<<<<< refs/remotes/origin/master +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-transform-typeof-symbol": { @@ -815,7 +906,13 @@ "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==", "dev": true, "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0" +======= + "@babel/helper-plugin-utils": "7.0.0" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/plugin-transform-typescript": { @@ -832,6 +929,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz", "integrity": "sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==", "requires": { +<<<<<<< master "@babel/helper-plugin-utils": "^7.0.0", "@babel/helper-regex": "^7.0.0", "regexpu-core": "^4.1.3" @@ -898,6 +996,63 @@ "@babel/plugin-syntax-object-rest-spread": "^7.2.0" } } +======= + "@babel/helper-plugin-utils": "7.0.0", + "@babel/helper-regex": "7.0.0", + "regexpu-core": "4.4.0" +<<<<<<< refs/remotes/origin/master + } + }, + "@babel/preset-env": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.2.3.tgz", + "integrity": "sha512-AuHzW7a9rbv5WXmvGaPX7wADxFkZIqKlbBh1dmZUQp4iwiPpkE/Qnrji6SC4UQCQzvWY/cpHET29eUhXS9cLPw==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "7.0.0", + "@babel/helper-plugin-utils": "7.0.0", + "@babel/plugin-proposal-async-generator-functions": "7.2.0", + "@babel/plugin-proposal-json-strings": "7.2.0", + "@babel/plugin-proposal-object-rest-spread": "7.2.0", + "@babel/plugin-proposal-optional-catch-binding": "7.2.0", + "@babel/plugin-proposal-unicode-property-regex": "7.2.0", + "@babel/plugin-syntax-async-generators": "7.2.0", + "@babel/plugin-syntax-object-rest-spread": "7.2.0", + "@babel/plugin-syntax-optional-catch-binding": "7.2.0", + "@babel/plugin-transform-arrow-functions": "7.2.0", + "@babel/plugin-transform-async-to-generator": "7.2.0", + "@babel/plugin-transform-block-scoped-functions": "7.2.0", + "@babel/plugin-transform-block-scoping": "7.2.0", + "@babel/plugin-transform-classes": "7.2.2", + "@babel/plugin-transform-computed-properties": "7.2.0", + "@babel/plugin-transform-destructuring": "7.2.0", + "@babel/plugin-transform-dotall-regex": "7.2.0", + "@babel/plugin-transform-duplicate-keys": "7.2.0", + "@babel/plugin-transform-exponentiation-operator": "7.2.0", + "@babel/plugin-transform-for-of": "7.2.0", + "@babel/plugin-transform-function-name": "7.2.0", + "@babel/plugin-transform-literals": "7.2.0", + "@babel/plugin-transform-modules-amd": "7.2.0", + "@babel/plugin-transform-modules-commonjs": "7.2.0", + "@babel/plugin-transform-modules-systemjs": "7.2.0", + "@babel/plugin-transform-modules-umd": "7.2.0", + "@babel/plugin-transform-new-target": "7.0.0", + "@babel/plugin-transform-object-super": "7.2.0", + "@babel/plugin-transform-parameters": "7.2.0", + "@babel/plugin-transform-regenerator": "7.0.0", + "@babel/plugin-transform-shorthand-properties": "7.2.0", + "@babel/plugin-transform-spread": "7.2.2", + "@babel/plugin-transform-sticky-regex": "7.2.0", + "@babel/plugin-transform-template-literals": "7.2.0", + "@babel/plugin-transform-typeof-symbol": "7.2.0", + "@babel/plugin-transform-unicode-regex": "7.2.0", + "browserslist": "4.4.0", + "invariant": "2.2.4", + "js-levenshtein": "1.1.6", + "semver": "5.6.0" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@babel/register": { @@ -993,9 +1148,24 @@ "integrity": "sha512-yaQQjNAVkKclMX6D8jTU3rhQKjCnXU1KS+Ok0lgZcarGHI2yydU/kKHyF3PZnQhbTpIFBK5W4+HmLCtCie7ESw==", "dev": true, "requires": { +<<<<<<< master "@emotion/sheet": "^0.8.1", "@emotion/stylis": "^0.7.1", "@emotion/utils": "^0.8.2" +======= +<<<<<<< refs/remotes/origin/master + "@emotion/sheet": "0.8.1", + "@emotion/stylis": "0.7.1", + "@emotion/utils": "0.8.2" +======= + "create-react-context": "0.2.2", + "hoist-non-react-statics": "3.2.1", + "path-to-regexp": "1.7.0", + "query-string": "6.2.0", + "react-is": "16.7.0", + "react-lifecycles-compat": "3.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@emotion/core": { @@ -1004,11 +1174,26 @@ "integrity": "sha512-5qzKP6bTe2Ah7Wvh1sgtzgy6ycdpxwgMAjQ/K/VxvqBxveG9PCpq+Z0GdVg7Houb1AwYjTfNtXstjSk4sqi/7g==", "dev": true, "requires": { +<<<<<<< master "@emotion/cache": "^0.8.8", "@emotion/css": "^0.9.8", "@emotion/serialize": "^0.9.1", "@emotion/sheet": "^0.8.1", "@emotion/utils": "^0.8.2" +======= +<<<<<<< refs/remotes/origin/master + "@emotion/cache": "0.8.8", + "@emotion/css": "0.9.8", + "@emotion/serialize": "0.9.1", + "@emotion/sheet": "0.8.1", + "@emotion/utils": "0.8.2" +======= + "hoist-non-react-statics": "3.2.1", + "react-native-gesture-handler": "1.0.12", + "react-native-safe-area-view": "0.11.0", + "react-native-screens": "1.0.0-alpha.19" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@emotion/css": { @@ -1048,8 +1233,18 @@ "integrity": "sha512-y/BRd6cJ9tyxsy4EK8WheD2X1/RfmudMYILpa8sgI3dKCjVWeEZuQM17wXRVEyhrisaRaIp1qT4h0eWUaaqNLg==", "dev": true, "requires": { +<<<<<<< master "@emotion/cache": "^0.8.8", "@emotion/weak-memoize": "^0.1.3" +======= +<<<<<<< refs/remotes/origin/master + "@emotion/cache": "0.8.8", + "@emotion/weak-memoize": "0.1.3" +======= + "mime-types": "2.1.21", + "negotiator": "0.6.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@emotion/serialize": { @@ -1076,7 +1271,24 @@ "integrity": "sha512-DFNW8jlMjy1aYCj/PKsvBoJVZAQXzjmSCwtKXLs31qZzNPaUEPbTYSIKnMUtIiAOYsu0pUTGXM+l0a+MYNm4lA==", "dev": true, "requires": { +<<<<<<< master "@emotion/styled-base": "^0.10.6" +======= +<<<<<<< refs/remotes/origin/master + "@emotion/styled-base": "0.10.6" +======= + "acorn": "6.0.4", + "acorn-walk": "6.1.1" + }, + "dependencies": { + "acorn": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz", + "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==", + "dev": true + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@emotion/styled-base": { @@ -1085,9 +1297,27 @@ "integrity": "sha512-7RfdJm2oEXiy3isFRY63mHRmWWjScFXFoZTFkCJPaL8NhX+H724WwIoQOt3WA1Jd+bb97xkJg31JbYYsSqnEaQ==", "dev": true, "requires": { +<<<<<<< master "@emotion/is-prop-valid": "^0.6.8", "@emotion/serialize": "^0.9.1", "@emotion/utils": "^0.8.2" +======= +<<<<<<< refs/remotes/origin/master + "@emotion/is-prop-valid": "0.6.8", + "@emotion/serialize": "0.9.1", + "@emotion/utils": "0.8.2" +======= + "acorn": "3.3.0" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@emotion/stylis": { @@ -1120,8 +1350,20 @@ "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", "dev": true, "requires": { +<<<<<<< master "call-me-maybe": "^1.0.1", "glob-to-regexp": "^0.3.0" +======= +<<<<<<< refs/remotes/origin/master + "call-me-maybe": "1.0.1", + "glob-to-regexp": "0.3.0" +======= + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@nodelib/fs.stat": { @@ -1135,12 +1377,24 @@ "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-3.0.2.tgz", "integrity": "sha512-E0ETZJUuJRHvjtb0f0U416NcDxt9T5HvRLxXu5K4DNxtmjpOfkT9Sh+Q309/zrCwSkHY85ZpGKvewZTSGI7Q1Q==", "requires": { +<<<<<<< refs/remotes/origin/master "create-react-context": "0.2.2", +<<<<<<< master "hoist-non-react-statics": "^3.0.1", "path-to-regexp": "^1.7.0", "query-string": "^6.2.0", "react-is": "^16.5.2", "react-lifecycles-compat": "^3.0.4" +======= + "hoist-non-react-statics": "3.2.1", + "path-to-regexp": "1.7.0", + "query-string": "6.2.0", + "react-is": "16.7.0", + "react-lifecycles-compat": "3.0.4" +======= + "ansi-wrap": "0.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@react-navigation/native": { @@ -1218,6 +1472,7 @@ } }, "@storybook/core": { +<<<<<<< master "version": "4.1.11", "resolved": "https://registry.npmjs.org/@storybook/core/-/core-4.1.11.tgz", "integrity": "sha512-iUrtFCav7xJicCLhp4zdqbhaOXRWXrx4wMPSs0keBD2G7NQtSg/TQMUdx2VYFBl5thIFT1jt5dAm66y0Q2OCTQ==", @@ -1287,6 +1542,82 @@ "webpack": "^4.23.1", "webpack-dev-middleware": "^3.4.0", "webpack-hot-middleware": "^2.24.3" +======= + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/@storybook/core/-/core-4.1.6.tgz", + "integrity": "sha512-0T4mDt3Wzyg8UIrF0kPvP5kA+S+fGhaZI/vWGUPvmxsYuVQHGhvna1ZiayIW8R9TdHx1g+uSYkUxb8wVVUmwQA==", + "dev": true, + "requires": { +<<<<<<< refs/remotes/origin/master + "@babel/plugin-proposal-class-properties": "7.2.3", + "@babel/preset-env": "7.2.3", + "@emotion/core": "0.13.1", + "@emotion/provider": "0.11.2", + "@emotion/styled": "0.10.6", + "@storybook/addons": "4.1.6", + "@storybook/channel-postmessage": "4.1.6", + "@storybook/client-logger": "4.1.6", + "@storybook/core-events": "4.1.6", + "@storybook/node-logger": "4.1.6", + "@storybook/ui": "4.1.6", + "airbnb-js-shims": "2.1.1", + "autoprefixer": "9.4.4", + "babel-plugin-macros": "2.4.5", + "babel-preset-minify": "0.5.0", + "boxen": "2.1.0", + "case-sensitive-paths-webpack-plugin": "2.1.2", + "chalk": "2.4.2", + "child-process-promise": "2.2.1", + "cli-table3": "0.5.1", + "commander": "2.19.0", + "common-tags": "1.8.0", + "core-js": "2.6.2", + "css-loader": "1.0.1", + "detect-port": "1.3.0", + "dotenv-webpack": "1.6.0", + "ejs": "2.6.1", + "eventemitter3": "3.1.0", + "express": "4.16.4", + "file-loader": "2.0.0", + "file-system-cache": "1.0.5", + "find-cache-dir": "2.0.0", + "fs-extra": "7.0.1", + "global": "4.3.2", + "html-webpack-plugin": "4.0.0-beta.5", + "inquirer": "6.2.1", + "interpret": "1.1.0", + "ip": "1.1.5", + "json5": "2.1.0", + "lazy-universal-dotenv": "2.0.0", + "node-fetch": "2.3.0", + "opn": "5.4.0", + "postcss-flexbugs-fixes": "4.1.0", + "postcss-loader": "3.0.0", + "pretty-hrtime": "1.0.3", + "prop-types": "15.6.2", + "qs": "6.5.2", + "raw-loader": "0.5.1", + "react-dev-utils": "6.1.1", + "redux": "4.0.1", + "regenerator-runtime": "0.12.1", + "resolve": "1.9.0", + "resolve-from": "4.0.0", + "semver": "5.6.0", + "serve-favicon": "2.5.0", + "shelljs": "0.8.3", + "spawn-promise": "0.1.8", + "style-loader": "0.23.1", + "svg-url-loader": "2.3.2", + "terser-webpack-plugin": "1.2.1", + "url-loader": "1.1.2", + "webpack": "4.28.4", + "webpack-dev-middleware": "3.5.0", + "webpack-hot-middleware": "2.24.3" +======= + "micromatch": "3.1.10", + "normalize-path": "2.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-regex": { @@ -1310,9 +1641,38 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { +<<<<<<< master "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" +======= +<<<<<<< refs/remotes/origin/master + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" +======= + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "chardet": { @@ -1333,9 +1693,94 @@ "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==", "dev": true, "requires": { +<<<<<<< master "chardet": "^0.7.0", "iconv-lite": "^0.4.24", "tmp": "^0.0.33" +======= +<<<<<<< refs/remotes/origin/master + "chardet": "0.7.0", + "iconv-lite": "0.4.24", + "tmp": "0.0.33" +======= + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "find-cache-dir": { @@ -1344,9 +1789,30 @@ "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==", "dev": true, "requires": { +<<<<<<< master "commondir": "^1.0.1", "make-dir": "^1.0.0", "pkg-dir": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "3.0.0" +======= + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "find-up": { @@ -1355,7 +1821,40 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { +<<<<<<< master "locate-path": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "locate-path": "3.0.0" +======= + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "fs-extra": { @@ -1396,7 +1895,28 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { +<<<<<<< master "graceful-fs": "^4.1.6" +======= +<<<<<<< refs/remotes/origin/master + "graceful-fs": "4.1.15" +======= + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "locate-path": { @@ -1405,8 +1925,17 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { +<<<<<<< master "p-locate": "^3.0.0", "path-exists": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "p-locate": "3.0.0", + "path-exists": "3.0.0" +======= + "kind-of": "6.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "opn": { @@ -1415,7 +1944,15 @@ "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==", "dev": true, "requires": { +<<<<<<< master "is-wsl": "^1.1.0" +======= +<<<<<<< refs/remotes/origin/master + "is-wsl": "1.1.0" +======= + "kind-of": "6.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "p-limit": { @@ -1424,7 +1961,17 @@ "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", "dev": true, "requires": { +<<<<<<< master "p-try": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "p-try": "2.0.0" +======= + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "p-locate": { @@ -1433,7 +1980,25 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { +<<<<<<< master "p-limit": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "p-limit": "2.1.0" +======= + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "p-try": { @@ -1480,7 +2045,12 @@ "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", "dev": true, "requires": { +<<<<<<< master "ansi-regex": "^4.0.0" +======= +<<<<<<< refs/remotes/origin/master + "ansi-regex": "4.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "supports-color": { @@ -1489,16 +2059,60 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { +<<<<<<< master "has-flag": "^3.0.0" +======= + "has-flag": "3.0.0" +======= + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } }, +<<<<<<< refs/remotes/origin/master "@storybook/core-events": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-4.1.11.tgz", "integrity": "sha512-rVb76xFLJkTFcBHL1oTdJW8O2N7q+Cc6Mo7v9u3TnM4WuRk08/GyzzO7sRvEg3Mvo59AOLu1uqYovRMo4tZEnQ==", "dev": true +======= + "append-transform": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", + "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", + "dev": true, + "requires": { + "default-require-extensions": "1.0.0" + } + }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.6" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "@storybook/mantra-core": { "version": "1.7.2", @@ -1506,9 +2120,19 @@ "integrity": "sha512-GD4OYJ8GsayVhIg306sfgcKDk9j8YfuSKIAWvdB/g7IDlw0pDgueONALVEEE2XWJtCwcsUyDtCYzXFgCBWLEjA==", "dev": true, "requires": { +<<<<<<< master "@storybook/react-komposer": "^2.0.1", "@storybook/react-simple-di": "^1.2.1", "babel-runtime": "6.x.x" +======= +<<<<<<< refs/remotes/origin/master + "@storybook/react-komposer": "2.0.5", + "@storybook/react-simple-di": "1.3.0", + "babel-runtime": "6.26.0" +======= + "sprintf-js": "1.0.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@storybook/node-logger": { @@ -1517,11 +2141,20 @@ "integrity": "sha512-rCXk1PUcakkV72oyTR+nOVDUGnkk1On8/sm9u3NtBEUuwsCtm4p+jh42Pp4jsTtWpG36AVABDtiN65VgCfS+9w==", "dev": true, "requires": { +<<<<<<< master "chalk": "^2.4.1", "core-js": "^2.5.7", "npmlog": "^4.1.2", "pretty-hrtime": "^1.0.3", "regenerator-runtime": "^0.12.1" +======= +<<<<<<< refs/remotes/origin/master + "chalk": "2.4.2", + "core-js": "2.6.2", + "npmlog": "4.1.2", + "pretty-hrtime": "1.0.3", + "regenerator-runtime": "0.12.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-styles": { @@ -1614,6 +2247,21 @@ } } } +======= + "arr-flatten": "1.1.0", + "array-slice": "0.2.3" + } + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + }, + "arr-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "@storybook/podda": { "version": "1.2.3", @@ -1621,8 +2269,17 @@ "integrity": "sha512-g7dsdsn50AhlGZ8iIDKdF8bi7Am++iFOq+QN+hNKz3FvgLuf8Dz+mpC/BFl90eE9bEYxXqXKeMf87399Ec5Qhw==", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.11.6", "immutable": "^3.8.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "immutable": "3.8.2" +======= + "typical": "2.6.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@storybook/react-komposer": { @@ -1879,9 +2536,14 @@ "integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@webassemblyjs/helper-module-context": "1.7.11", "@webassemblyjs/helper-wasm-bytecode": "1.7.11", "@webassemblyjs/wast-parser": "1.7.11" +======= + "define-properties": "1.1.3", + "es-abstract": "1.12.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@webassemblyjs/floating-point-hex-parser": { @@ -1908,7 +2570,11 @@ "integrity": "sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@webassemblyjs/wast-printer": "1.7.11" +======= + "safer-buffer": "2.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@webassemblyjs/helper-fsm": { @@ -1935,10 +2601,14 @@ "integrity": "sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@webassemblyjs/ast": "1.7.11", "@webassemblyjs/helper-buffer": "1.7.11", "@webassemblyjs/helper-wasm-bytecode": "1.7.11", "@webassemblyjs/wasm-gen": "1.7.11" +======= + "lodash": "4.17.11" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@webassemblyjs/ieee754": { @@ -1971,6 +2641,7 @@ "integrity": "sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@webassemblyjs/ast": "1.7.11", "@webassemblyjs/helper-buffer": "1.7.11", "@webassemblyjs/helper-wasm-bytecode": "1.7.11", @@ -1979,6 +2650,19 @@ "@webassemblyjs/wasm-opt": "1.7.11", "@webassemblyjs/wasm-parser": "1.7.11", "@webassemblyjs/wast-printer": "1.7.11" +======= + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + }, + "dependencies": { + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@webassemblyjs/wasm-gen": { @@ -1987,11 +2671,41 @@ "integrity": "sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@webassemblyjs/ast": "1.7.11", "@webassemblyjs/helper-wasm-bytecode": "1.7.11", "@webassemblyjs/ieee754": "1.7.11", "@webassemblyjs/leb128": "1.7.11", "@webassemblyjs/utf8": "1.7.11" +======= + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.6.0", + "debug": "2.6.9", + "json5": "0.5.1", + "lodash": "4.17.11", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "slash": "1.0.0", + "source-map": "0.5.7" + }, + "dependencies": { + "json5": { + "version": "0.5.1", + "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "dev": true + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@webassemblyjs/wasm-opt": { @@ -2000,10 +2714,18 @@ "integrity": "sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@webassemblyjs/ast": "1.7.11", "@webassemblyjs/helper-buffer": "1.7.11", "@webassemblyjs/wasm-gen": "1.7.11", "@webassemblyjs/wasm-parser": "1.7.11" +======= + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash.assign": "4.2.0", + "lodash.pickby": "4.6.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@webassemblyjs/wasm-parser": { @@ -2012,12 +2734,31 @@ "integrity": "sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@webassemblyjs/ast": "1.7.11", "@webassemblyjs/helper-api-error": "1.7.11", "@webassemblyjs/helper-wasm-bytecode": "1.7.11", "@webassemblyjs/ieee754": "1.7.11", "@webassemblyjs/leb128": "1.7.11", "@webassemblyjs/utf8": "1.7.11" +======= + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.11", + "source-map": "0.5.7", + "trim-right": "1.0.1" + }, + "dependencies": { + "jsesc": { + "version": "1.3.0", + "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "dev": true + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@webassemblyjs/wast-parser": { @@ -2026,12 +2767,17 @@ "integrity": "sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@webassemblyjs/ast": "1.7.11", "@webassemblyjs/floating-point-hex-parser": "1.7.11", "@webassemblyjs/helper-api-error": "1.7.11", "@webassemblyjs/helper-code-frame": "1.7.11", "@webassemblyjs/helper-fsm": "1.7.11", "@xtuc/long": "4.2.1" +======= + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@webassemblyjs/wast-printer": { @@ -2040,9 +2786,14 @@ "integrity": "sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@webassemblyjs/ast": "1.7.11", "@webassemblyjs/wast-parser": "1.7.11", "@xtuc/long": "4.2.1" +======= + "babel-plugin-istanbul": "4.1.6", + "babel-preset-jest": "23.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "@xtuc/ieee754": { @@ -2078,8 +2829,16 @@ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "requires": { +<<<<<<< master "mime-types": "~2.1.18", +======= +<<<<<<< refs/remotes/origin/master + "mime-types": "2.1.21", +>>>>>>> UPS8: Added ProfileView Form with header, footer "negotiator": "0.6.1" +======= + "babel-runtime": "6.26.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "acorn": { @@ -2088,10 +2847,35 @@ "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==" }, "acorn-dynamic-import": { +<<<<<<< master "version": "4.0.0", "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", "dev": true +======= + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz", + "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==", + "dev": true, + "requires": { +<<<<<<< refs/remotes/origin/master + "acorn": "5.7.3" + }, + "dependencies": { + "acorn": { + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", + "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", + "dev": true + } +======= + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "find-up": "2.1.0", + "istanbul-lib-instrument": "1.10.2", + "test-exclude": "4.2.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "acorn-globals": { "version": "4.3.0", @@ -2099,8 +2883,19 @@ "integrity": "sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==", "dev": true, "requires": { +<<<<<<< master "acorn": "^6.0.1", "acorn-walk": "^6.0.1" +======= +<<<<<<< refs/remotes/origin/master + "acorn": "6.0.4", + "acorn-walk": "6.1.1" +======= + "babel-runtime": "6.26.0", + "core-js": "2.6.1", + "regenerator-runtime": "0.10.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "acorn": { @@ -2117,7 +2912,12 @@ "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { +<<<<<<< master "acorn": "^3.0.4" +======= +<<<<<<< refs/remotes/origin/master + "acorn": "3.3.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "acorn": { @@ -2126,6 +2926,35 @@ "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", "dev": true } +======= + "@babel/plugin-proposal-class-properties": "7.2.3", + "@babel/plugin-proposal-object-rest-spread": "7.2.0", + "@babel/plugin-syntax-class-properties": "7.2.0", + "@babel/plugin-syntax-flow": "7.2.0", + "@babel/plugin-syntax-jsx": "7.2.0", + "@babel/plugin-syntax-object-rest-spread": "7.2.0", + "@babel/plugin-transform-arrow-functions": "7.2.0", + "@babel/plugin-transform-block-scoped-functions": "7.2.0", + "@babel/plugin-transform-block-scoping": "7.2.0", + "@babel/plugin-transform-classes": "7.2.2", + "@babel/plugin-transform-computed-properties": "7.2.0", + "@babel/plugin-transform-destructuring": "7.2.0", + "@babel/plugin-transform-flow-strip-types": "7.2.3", + "@babel/plugin-transform-for-of": "7.2.0", + "@babel/plugin-transform-function-name": "7.2.0", + "@babel/plugin-transform-literals": "7.2.0", + "@babel/plugin-transform-member-expression-literals": "7.2.0", + "@babel/plugin-transform-modules-commonjs": "7.2.0", + "@babel/plugin-transform-object-super": "7.2.0", + "@babel/plugin-transform-parameters": "7.2.0", + "@babel/plugin-transform-property-literals": "7.2.0", + "@babel/plugin-transform-react-display-name": "7.2.0", + "@babel/plugin-transform-react-jsx": "7.2.0", + "@babel/plugin-transform-shorthand-properties": "7.2.0", + "@babel/plugin-transform-spread": "7.2.2", + "@babel/plugin-transform-template-literals": "7.2.0", + "babel-plugin-syntax-trailing-function-commas": "7.0.0-beta.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "acorn-walk": { @@ -2146,6 +2975,7 @@ "integrity": "sha512-h8UtyB/TCdOwWoEPQJGHgsWwSnTqPrRZbhyZYjAwY9/AbjdjfkKy9L/T3fIFS6MKX8YrpWFRm6xqFSgU+2DRGw==", "dev": true, "requires": { +<<<<<<< master "array-includes": "^3.0.3", "array.prototype.flat": "^1.2.1", "array.prototype.flatmap": "^1.2.1", @@ -2161,6 +2991,28 @@ "string.prototype.padend": "^3.0.0", "string.prototype.padstart": "^3.0.0", "symbol.prototype.description": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "array-includes": "3.0.3", + "array.prototype.flat": "1.2.1", + "array.prototype.flatmap": "1.2.1", + "es5-shim": "4.5.12", + "es6-shim": "0.35.4", + "function.prototype.name": "1.1.0", + "object.entries": "1.1.0", + "object.fromentries": "1.0.0", + "object.getownpropertydescriptors": "2.0.3", + "object.values": "1.1.0", + "promise.prototype.finally": "3.1.0", + "string.prototype.matchall": "3.0.1", + "string.prototype.padend": "3.0.0", + "string.prototype.padstart": "3.0.0", + "symbol.prototype.description": "1.0.0" +======= + "babel-plugin-jest-hoist": "23.2.0", + "babel-plugin-syntax-object-rest-spread": "6.13.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "ajv": { @@ -2197,7 +3049,21 @@ "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", "dev": true, "requires": { +<<<<<<< master "string-width": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "string-width": "3.0.0" +======= + "babel-core": "6.26.3", + "babel-runtime": "6.26.0", + "core-js": "2.6.1", + "home-or-tmp": "2.0.0", + "lodash": "4.17.11", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-regex": { @@ -2212,9 +3078,20 @@ "integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==", "dev": true, "requires": { +<<<<<<< master "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.0.0" +======= +<<<<<<< refs/remotes/origin/master + "emoji-regex": "7.0.3", + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "5.0.0" +======= + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "strip-ansi": { @@ -2223,7 +3100,15 @@ "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", "dev": true, "requires": { +<<<<<<< master "ansi-regex": "^4.0.0" +======= +<<<<<<< refs/remotes/origin/master + "ansi-regex": "4.0.0" +======= + "source-map": "0.5.7" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -2233,7 +3118,23 @@ "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", "requires": { +<<<<<<< master "ansi-wrap": "^0.1.0" +======= +<<<<<<< refs/remotes/origin/master + "ansi-wrap": "0.1.0" +======= + "core-js": "2.6.1", + "regenerator-runtime": "0.11.1" + }, + "dependencies": { + "core-js": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz", + "integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "ansi-cyan": { @@ -2241,6 +3142,7 @@ "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=", "requires": { +<<<<<<< refs/remotes/origin/master "ansi-wrap": "0.1.0" } }, @@ -2248,13 +3150,61 @@ "version": "3.1.0", "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==" +======= + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.11" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.4", + "lodash": "4.17.11" + }, + "dependencies": { + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "ansi-gray": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", "requires": { +<<<<<<< refs/remotes/origin/master "ansi-wrap": "0.1.0" +======= + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "1.0.3" + }, + "dependencies": { + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "dev": true + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "ansi-html": { @@ -2291,8 +3241,23 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "requires": { +<<<<<<< master "micromatch": "^3.1.4", "normalize-path": "^2.1.1" +======= +<<<<<<< refs/remotes/origin/master + "micromatch": "3.1.10", + "normalize-path": "2.1.1" +======= + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "arr-diff": { @@ -2472,10 +3437,18 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { +<<<<<<< master "extend-shallow": "^2.0.1", "is-number": "^3.0.0", "repeat-string": "^1.6.1", "to-regex-range": "^2.1.0" +======= +<<<<<<< refs/remotes/origin/master + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "extend-shallow": { @@ -2486,6 +3459,9 @@ "is-extendable": "^0.1.0" } } +======= + "is-descriptor": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-accessor-descriptor": { @@ -2509,9 +3485,16 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { +<<<<<<< master "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" +======= + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" +<<<<<<< refs/remotes/origin/master +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-number": { @@ -2530,6 +3513,8 @@ "is-buffer": "^1.1.5" } } +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "isobject": { @@ -2579,18 +3564,43 @@ "default-require-extensions": "^1.0.0" } }, +<<<<<<< refs/remotes/origin/master "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" +======= + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "requires": { + "tweetnacl": "0.14.5" + } + }, + "big-integer": { + "version": "1.6.40", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.40.tgz", + "integrity": "sha512-CjhtJp0BViLzP1ZkEnoywjgtFQXS2pomKjAJtIISTCnuHILkLcAXLdFLG/nxsHc4s9kJfc+82Xpg8WNyhfACzQ==" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "are-we-there-yet": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "requires": { +<<<<<<< master "delegates": "^1.0.0", "readable-stream": "^2.0.6" +======= +<<<<<<< refs/remotes/origin/master + "delegates": "1.0.0", + "readable-stream": "2.3.6" +======= + "readable-stream": "2.3.6", + "safe-buffer": "5.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "argparse": { @@ -2598,7 +3608,15 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "requires": { +<<<<<<< master "sprintf-js": "~1.0.2" +======= +<<<<<<< refs/remotes/origin/master + "sprintf-js": "1.0.3" +======= + "stream-buffers": "2.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "arr-diff": { @@ -2606,14 +3624,33 @@ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", "requires": { +<<<<<<< master "arr-flatten": "^1.0.1", "array-slice": "^0.2.3" +======= +<<<<<<< refs/remotes/origin/master + "arr-flatten": "1.1.0", + "array-slice": "0.2.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" +======= + "big-integer": "1.6.40" + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "arr-union": { "version": "2.1.0", @@ -2625,7 +3662,17 @@ "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz", "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==", "requires": { +<<<<<<< master "typical": "^2.6.1" +======= +<<<<<<< refs/remotes/origin/master + "typical": "2.6.1" +======= + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "array-equal": { @@ -2676,7 +3723,15 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { +<<<<<<< master "array-uniq": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "array-uniq": "1.0.3" +======= + "node-int64": "0.4.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "array-uniq": { @@ -2696,8 +3751,26 @@ "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=", "dev": true, "requires": { +<<<<<<< master "define-properties": "^1.1.2", "es-abstract": "^1.7.0" +======= +<<<<<<< refs/remotes/origin/master + "define-properties": "1.1.3", + "es-abstract": "1.12.0" +======= + "base64-js": "0.0.8", + "ieee754": "1.1.12", + "isarray": "1.0.0" + }, + "dependencies": { + "base64-js": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", + "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "array.prototype.flat": { @@ -2706,9 +3779,20 @@ "integrity": "sha512-rVqIs330nLJvfC7JqYvEWwqVr5QjYF1ib02i3YJtR/fICO6527Tjpc/e4Mvmxh3GIePPreRXMdaGyC99YphWEw==", "dev": true, "requires": { +<<<<<<< master "define-properties": "^1.1.2", "es-abstract": "^1.10.0", "function-bind": "^1.1.1" +======= +<<<<<<< refs/remotes/origin/master + "define-properties": "1.1.3", + "es-abstract": "1.12.0", + "function-bind": "1.1.1" +======= + "buffer-alloc-unsafe": "1.1.0", + "buffer-fill": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "array.prototype.flatmap": { @@ -2743,7 +3827,30 @@ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "requires": { +<<<<<<< master "safer-buffer": "~2.1.0" +======= +<<<<<<< refs/remotes/origin/master + "safer-buffer": "2.1.2" +======= + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "asn1.js": { @@ -2752,9 +3859,19 @@ "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", "dev": true, "requires": { +<<<<<<< master "bn.js": "^4.0.0", "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "bn.js": "4.11.8", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" +======= + "callsites": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "assert": { @@ -2763,6 +3880,7 @@ "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "util": "0.10.3" }, "dependencies": { @@ -2781,6 +3899,9 @@ "inherits": "2.0.1" } } +======= + "caller-callsite": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "assert-plus": { @@ -2804,7 +3925,15 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "requires": { +<<<<<<< master "lodash": "^4.17.10" +======= +<<<<<<< refs/remotes/origin/master + "lodash": "4.17.11" +======= + "rsvp": "3.6.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "async-each": { @@ -2813,10 +3942,24 @@ "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", "dev": true }, +<<<<<<< refs/remotes/origin/master "async-limiter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==" +======= + "chalk": { + "version": "1.1.3", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "asynckit": { "version": "0.4.0", @@ -2858,9 +4001,16 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { +<<<<<<< master "chalk": "^1.1.3", "esutils": "^2.0.2", "js-tokens": "^3.0.2" +======= +<<<<<<< refs/remotes/origin/master + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "js-tokens": { @@ -2868,6 +4018,34 @@ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", "dev": true +<<<<<<< master +======= +======= + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" + }, + "dependencies": { + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + }, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, @@ -2877,6 +4055,7 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { +<<<<<<< master "babel-code-frame": "^6.26.0", "babel-generator": "^6.26.0", "babel-helpers": "^6.24.1", @@ -2896,6 +4075,28 @@ "private": "^0.1.8", "slash": "^1.0.0", "source-map": "^0.5.7" +======= +<<<<<<< refs/remotes/origin/master + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.6.0", + "debug": "2.6.9", + "json5": "0.5.1", + "lodash": "4.17.11", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "slash": "1.0.0", + "source-map": "0.5.7" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "json5": { @@ -2904,6 +4105,9 @@ "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true } +======= + "restore-cursor": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-eslint": { @@ -2925,6 +4129,7 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { +<<<<<<< master "babel-messages": "^6.23.0", "babel-runtime": "^6.26.0", "babel-types": "^6.26.0", @@ -2933,6 +4138,17 @@ "lodash": "^4.17.4", "source-map": "^0.5.7", "trim-right": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.11", + "source-map": "0.5.7", + "trim-right": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "jsesc": { @@ -2940,6 +4156,30 @@ "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true +======= + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, @@ -2949,9 +4189,20 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { +<<<<<<< master "babel-helper-explode-assignable-expression": "^6.24.1", "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +======= + "map-visit": "1.0.0", + "object-visit": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-builder-react-jsx": { @@ -2971,10 +4222,21 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { +<<<<<<< master "babel-helper-hoist-variables": "^6.24.1", "babel-runtime": "^6.22.0", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +======= + "delayed-stream": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-define-map": { @@ -2983,10 +4245,23 @@ "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", "dev": true, "requires": { +<<<<<<< master "babel-helper-function-name": "^6.24.1", "babel-runtime": "^6.26.0", "babel-types": "^6.26.0", "lodash": "^4.17.4" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.11" +======= + "array-back": "2.0.0", + "find-replace": "1.0.3", + "typical": "2.6.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-evaluate-path": { @@ -3001,9 +4276,19 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +======= + "mime-db": "1.37.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-flip-expressions": { @@ -3018,11 +4303,29 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { +<<<<<<< master "babel-helper-get-function-arity": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +======= + "accepts": "1.3.5", + "bytes": "3.0.0", + "compressible": "2.0.15", + "debug": "2.6.9", + "on-headers": "1.0.1", + "safe-buffer": "5.1.2", + "vary": "1.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-get-function-arity": { @@ -3031,8 +4334,20 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +======= + "buffer-from": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-hoist-variables": { @@ -3041,8 +4356,20 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +======= + "debug": "2.6.9", + "finalhandler": "1.1.0", + "parseurl": "1.3.2", + "utils-merge": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-is-nodes-equiv": { @@ -3069,8 +4396,17 @@ "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +======= + "safe-buffer": "5.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-regex": { @@ -3079,9 +4415,22 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.26.0", "babel-types": "^6.26.0", "lodash": "^4.17.4" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.11" +======= + "import-fresh": "2.0.0", + "is-directory": "0.3.1", + "js-yaml": "3.12.0", + "parse-json": "4.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-remap-async-to-generator": { @@ -3090,11 +4439,20 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { +<<<<<<< master "babel-helper-function-name": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-remove-or-void": { @@ -3102,6 +4460,53 @@ "resolved": "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz", "integrity": "sha1-pPA7QAd6D/6I5F0HAQ3uJB/1rmA=", "dev": true +======= + "fbjs": "0.8.17", + "loose-envify": "1.4.0", + "object-assign": "4.1.1" + }, + "dependencies": { + "fbjs": { + "version": "0.8.17", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", + "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", + "requires": { + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.19" + } + } + } + }, + "create-react-context": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.2.tgz", + "integrity": "sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==", + "requires": { + "fbjs": "0.8.17", + "gud": "1.0.0" + }, + "dependencies": { + "fbjs": { + "version": "0.8.17", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", + "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", + "requires": { + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.19" + } + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "babel-helper-replace-supers": { "version": "6.24.1", @@ -3109,12 +4514,27 @@ "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", "dev": true, "requires": { +<<<<<<< master "babel-helper-optimise-call-expression": "^6.24.1", "babel-messages": "^6.23.0", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-optimise-call-expression": "6.24.1", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +======= + "lru-cache": "4.1.5", + "shebang-command": "1.2.0", + "which": "1.3.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-helper-to-multiple-sequence-expressions": { @@ -3129,8 +4549,17 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0", "babel-template": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" +======= + "cssom": "0.3.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-jest": { @@ -3139,8 +4568,31 @@ "integrity": "sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==", "dev": true, "requires": { +<<<<<<< master "babel-plugin-istanbul": "^4.1.6", "babel-preset-jest": "^23.2.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-plugin-istanbul": "4.1.6", + "babel-preset-jest": "23.2.0" +======= + "es5-ext": "0.10.46" + } + }, + "damerau-levenshtein": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz", + "integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=", + "dev": true + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-loader": { @@ -3149,10 +4601,23 @@ "integrity": "sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==", "dev": true, "requires": { +<<<<<<< master "find-cache-dir": "^2.0.0", "loader-utils": "^1.0.2", "mkdirp": "^0.5.1", "util.promisify": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "find-cache-dir": "2.0.0", + "loader-utils": "1.2.3", + "mkdirp": "0.5.1", + "util.promisify": "1.0.0" +======= + "abab": "2.0.0", + "whatwg-mimetype": "2.3.0", + "whatwg-url": "7.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "find-cache-dir": { @@ -3215,7 +4680,17 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { +<<<<<<< master "find-up": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "find-up": "3.0.0" +======= + "lodash.sortby": "4.7.0", + "tr46": "1.0.1", + "webidl-conversions": "4.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -3262,8 +4737,24 @@ "integrity": "sha512-+/9yteNQw3yuZ3krQUfjAeoT/f4EAdn3ELwhFfDj0rTMIaoHfIdrcLePOfIaL0qmFLpIcgPIL2Lzm58h+CGWaw==", "dev": true, "requires": { +<<<<<<< master "cosmiconfig": "^5.0.5", "resolve": "^1.8.1" +======= +<<<<<<< refs/remotes/origin/master + "cosmiconfig": "5.0.7", + "resolve": "1.9.0" +======= + "decompress-tar": "4.1.1", + "decompress-tarbz2": "4.1.1", + "decompress-targz": "4.1.1", + "decompress-unzip": "4.0.1", + "graceful-fs": "4.1.15", + "make-dir": "1.3.0", + "pify": "2.3.0", + "strip-dirs": "2.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-minify-builtins": { @@ -3278,7 +4769,17 @@ "integrity": "sha512-Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ==", "dev": true, "requires": { +<<<<<<< master "babel-helper-evaluate-path": "^0.5.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-evaluate-path": "0.5.0" +======= + "file-type": "5.2.0", + "is-stream": "1.1.0", + "tar-stream": "1.6.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-minify-dead-code-elimination": { @@ -3287,10 +4788,32 @@ "integrity": "sha512-XQteBGXlgEoAKc/BhO6oafUdT4LBa7ARi55mxoyhLHNuA+RlzRmeMAfc31pb/UqU01wBzRc36YqHQzopnkd/6Q==", "dev": true, "requires": { +<<<<<<< master "babel-helper-evaluate-path": "^0.5.0", "babel-helper-mark-eval-scopes": "^0.4.3", "babel-helper-remove-or-void": "^0.4.3", "lodash.some": "^4.6.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-evaluate-path": "0.5.0", + "babel-helper-mark-eval-scopes": "0.4.3", + "babel-helper-remove-or-void": "0.4.3", + "lodash.some": "4.6.0" +======= + "decompress-tar": "4.1.1", + "file-type": "6.2.0", + "is-stream": "1.1.0", + "seek-bzip": "1.0.5", + "unbzip2-stream": "1.3.1" + }, + "dependencies": { + "file-type": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", + "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-minify-flip-comparisons": { @@ -3299,7 +4822,17 @@ "integrity": "sha1-AMqHDLjxO0XAOLPB68DyJyk8llo=", "dev": true, "requires": { +<<<<<<< master "babel-helper-is-void-0": "^0.4.3" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-is-void-0": "0.4.3" +======= + "decompress-tar": "4.1.1", + "file-type": "5.2.0", + "is-stream": "1.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-minify-guarded-expressions": { @@ -3308,7 +4841,34 @@ "integrity": "sha1-zHCbRFP9IbHzAod0RMifiEJ845c=", "dev": true, "requires": { +<<<<<<< master "babel-helper-flip-expressions": "^0.4.3" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-flip-expressions": "0.4.3" +======= + "file-type": "3.9.0", + "get-stream": "2.3.1", + "pify": "2.3.0", + "yauzl": "2.10.0" + }, + "dependencies": { + "file-type": { + "version": "3.9.0", + "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + }, + "get-stream": { + "version": "2.3.1", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", + "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "requires": { + "object-assign": "4.1.1", + "pinkie-promise": "2.0.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-minify-infinity": { @@ -3344,9 +4904,30 @@ "integrity": "sha512-TM01J/YcKZ8XIQd1Z3nF2AdWHoDsarjtZ5fWPDksYZNsoOjQ2UO2EWm824Ym6sp127m44gPlLFiO5KFxU8pA5Q==", "dev": true, "requires": { +<<<<<<< master "babel-helper-flip-expressions": "^0.4.3", "babel-helper-is-nodes-equiv": "^0.0.1", "babel-helper-to-multiple-sequence-expressions": "^0.5.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-flip-expressions": "0.4.3", + "babel-helper-is-nodes-equiv": "0.0.1", + "babel-helper-to-multiple-sequence-expressions": "0.5.0" +======= + "strip-bom": "2.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-minify-type-constructors": { @@ -3355,7 +4936,12 @@ "integrity": "sha1-G8bxW4f3qxCF1CszC3F2V6IVZQA=", "dev": true, "requires": { +<<<<<<< master "babel-helper-is-void-0": "^0.4.3" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-is-void-0": "0.4.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-syntax-async-functions": { @@ -3363,6 +4949,57 @@ "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", "dev": true +======= + "object-keys": "1.0.12" + } + }, + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "requires": { + "is-descriptor": "1.0.2", + "isobject": "3.0.1" + }, + "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "babel-plugin-syntax-class-properties": { "version": "6.13.0", @@ -3405,9 +5042,19 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { +<<<<<<< master "babel-helper-remap-async-to-generator": "^6.24.1", "babel-plugin-syntax-async-functions": "^6.8.0", "babel-runtime": "^6.22.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.26.0" +======= + "repeating": "2.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-class-properties": { @@ -3428,7 +5075,15 @@ "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0" +======= + "esutils": "2.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-block-scoped-functions": { @@ -3446,11 +5101,23 @@ "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.26.0", "babel-template": "^6.26.0", "babel-traverse": "^6.26.0", "babel-types": "^6.26.0", "lodash": "^4.17.4" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.11" +======= + "webidl-conversions": "4.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-classes": { @@ -3459,6 +5126,7 @@ "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", "dev": true, "requires": { +<<<<<<< master "babel-helper-define-map": "^6.24.1", "babel-helper-function-name": "^6.24.1", "babel-helper-optimise-call-expression": "^6.24.1", @@ -3468,6 +5136,22 @@ "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-define-map": "6.26.0", + "babel-helper-function-name": "6.24.1", + "babel-helper-optimise-call-expression": "6.24.1", + "babel-helper-replace-supers": "6.24.1", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +======= + "jsbn": "0.1.1", + "safer-buffer": "2.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-computed-properties": { @@ -3495,8 +5179,17 @@ "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +======= + "iconv-lite": "0.4.24" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-for-of": { @@ -3505,7 +5198,15 @@ "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0" +======= + "once": "1.4.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-function-name": { @@ -3525,7 +5226,15 @@ "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0" +======= + "is-arrayish": "0.2.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-modules-amd": { @@ -3534,9 +5243,20 @@ "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", "dev": true, "requires": { +<<<<<<< master "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" +======= + "accepts": "1.3.5", + "escape-html": "1.0.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -3545,10 +5265,25 @@ "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "dev": true, "requires": { +<<<<<<< master "babel-plugin-transform-strict-mode": "^6.24.1", "babel-runtime": "^6.26.0", "babel-template": "^6.26.0", "babel-types": "^6.26.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-plugin-transform-strict-mode": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" +======= + "es-to-primitive": "1.2.0", + "function-bind": "1.1.1", + "has": "1.0.3", + "is-callable": "1.1.4", + "is-regex": "1.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-modules-systemjs": { @@ -3557,9 +5292,21 @@ "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", "dev": true, "requires": { +<<<<<<< master "babel-helper-hoist-variables": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" +======= + "is-callable": "1.1.4", + "is-date-object": "1.0.1", + "is-symbol": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-modules-umd": { @@ -3568,9 +5315,21 @@ "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", "dev": true, "requires": { +<<<<<<< master "babel-plugin-transform-es2015-modules-amd": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" +======= + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-object-super": { @@ -3579,8 +5338,19 @@ "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", "dev": true, "requires": { +<<<<<<< master "babel-helper-replace-supers": "^6.24.1", "babel-runtime": "^6.22.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-replace-supers": "6.24.1", + "babel-runtime": "6.26.0" +======= + "d": "1.0.0", + "es5-ext": "0.10.46", + "es6-symbol": "3.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-parameters": { @@ -3589,12 +5359,30 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { +<<<<<<< master "babel-helper-call-delegate": "^6.24.1", "babel-helper-get-function-arity": "^6.24.1", "babel-runtime": "^6.22.0", "babel-template": "^6.24.1", "babel-traverse": "^6.24.1", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-call-delegate": "6.24.1", + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" +======= + "d": "1.0.0", + "es5-ext": "0.10.46", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-shorthand-properties": { @@ -3603,8 +5391,21 @@ "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +======= + "d": "1.0.0", + "es5-ext": "0.10.46", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-spread": { @@ -3613,7 +5414,16 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.22.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0" +======= + "d": "1.0.0", + "es5-ext": "0.10.46" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -3622,9 +5432,22 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { +<<<<<<< master "babel-helper-regex": "^6.24.1", "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" +======= + "d": "1.0.0", + "es5-ext": "0.10.46", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-es2015-template-literals": { @@ -3651,9 +5474,23 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { +<<<<<<< master "babel-helper-regex": "^6.24.1", "babel-runtime": "^6.22.0", "regexpu-core": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "regexpu-core": "2.0.0" +======= + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.6.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "jsesc": { @@ -3696,9 +5533,22 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { +<<<<<<< master "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", "babel-plugin-syntax-exponentiation-operator": "^6.8.0", "babel-runtime": "^6.22.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.26.0" +======= + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.1", + "estraverse": "4.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "babel-plugin-transform-flow-strip-types": { @@ -3800,7 +5650,12 @@ "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "dev": true, "requires": { +<<<<<<< master "regenerator-transform": "^0.10.0" +======= +<<<<<<< refs/remotes/origin/master + "regenerator-transform": "0.10.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "regenerator-transform": { @@ -3809,9 +5664,77 @@ "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.18.0", "babel-types": "^6.19.0", "private": "^0.1.6" +======= + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "private": "0.1.8" +======= + "babel-code-frame": "6.26.0", + "chalk": "1.1.3", + "concat-stream": "1.6.2", + "debug": "2.6.9", + "doctrine": "2.1.0", + "escope": "3.6.0", + "espree": "3.5.4", + "esquery": "1.0.1", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "glob": "7.1.3", + "globals": "9.18.0", + "ignore": "3.3.10", + "imurmurhash": "0.1.4", + "inquirer": "0.12.0", + "is-my-json-valid": "2.19.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.12.0", + "json-stable-stringify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.11", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "1.2.1", + "progress": "1.1.8", + "require-uncached": "1.0.3", + "shelljs": "0.7.8", + "strip-bom": "3.0.0", + "strip-json-comments": "2.0.1", + "table": "3.8.3", + "text-table": "0.2.0", + "user-home": "2.0.0" + }, + "dependencies": { + "ansi-escapes": { + "version": "1.4.0", + "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", + "dev": true + }, + "cli-cursor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "dev": true, + "requires": { + "restore-cursor": "1.0.1" + } + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -3940,14 +5863,50 @@ "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", "dev": true }, +<<<<<<< refs/remotes/origin/master "browserslist": { "version": "3.2.8", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", "dev": true, "requires": { +<<<<<<< master "caniuse-lite": "^1.0.30000844", "electron-to-chromium": "^1.3.47" +======= + "caniuse-lite": "1.0.30000928", + "electron-to-chromium": "1.3.102" +======= + "inquirer": { + "version": "0.12.0", + "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", + "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", + "dev": true, + "requires": { + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", + "cli-width": "2.2.0", + "figures": "1.7.0", + "lodash": "4.17.11", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "through": "2.3.8" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -4077,8 +6036,18 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { +<<<<<<< master "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" +======= + "exit-hook": "1.1.1", + "onetime": "1.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "source-map-support": { @@ -4087,7 +6056,15 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { +<<<<<<< master "source-map": "^0.5.6" +======= +<<<<<<< refs/remotes/origin/master + "source-map": "0.5.7" +======= + "once": "1.4.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -4143,6 +6120,20 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", "dev": true +<<<<<<< refs/remotes/origin/master +======= + }, + "string-width": { + "version": "1.0.2", + "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, @@ -4152,16 +6143,65 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.26.0", "esutils": "^2.0.2", "lodash": "^4.17.4", "to-fast-properties": "^1.0.3" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "1.0.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "to-fast-properties": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", +======= + "babel-eslint": "6.1.2", + "eslint": "3.19.0", + "eslint-plugin-class-property": "1.1.0", + "eslint-plugin-import": "1.16.0", + "eslint-plugin-jsx-a11y": "2.2.3", + "eslint-plugin-react": "6.10.3" + }, + "dependencies": { + "acorn-jsx": { + "version": "3.0.1", + "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dev": true, + "requires": { + "acorn": "3.3.0" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } + } + }, + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-escapes": { + "version": "1.4.0", + "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", +>>>>>>> UPS8: Added ProfileView Form with header, footer "dev": true } } @@ -4196,7 +6236,15 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { +<<<<<<< master "is-descriptor": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "is-descriptor": "1.0.2" +======= + "restore-cursor": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-accessor-descriptor": { @@ -4204,7 +6252,49 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { +<<<<<<< master "kind-of": "^6.0.0" +======= +<<<<<<< refs/remotes/origin/master + "kind-of": "6.0.2" +======= + "babel-code-frame": "6.26.0", + "chalk": "1.1.3", + "concat-stream": "1.6.2", + "debug": "2.6.9", + "doctrine": "2.1.0", + "escope": "3.6.0", + "espree": "3.5.4", + "esquery": "1.0.1", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "glob": "7.1.3", + "globals": "9.18.0", + "ignore": "3.3.10", + "imurmurhash": "0.1.4", + "inquirer": "0.12.0", + "is-my-json-valid": "2.19.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.12.0", + "json-stable-stringify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.11", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "1.2.1", + "progress": "1.1.8", + "require-uncached": "1.0.3", + "shelljs": "0.7.8", + "strip-bom": "3.0.0", + "strip-json-comments": "2.0.1", + "table": "3.8.3", + "text-table": "0.2.0", + "user-home": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-data-descriptor": { @@ -4212,7 +6302,24 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { +<<<<<<< master "kind-of": "^6.0.0" +======= +<<<<<<< refs/remotes/origin/master + "kind-of": "6.0.2" +======= + "acorn": "5.7.3", + "acorn-jsx": "3.0.1" + }, + "dependencies": { + "acorn": { + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", + "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", + "dev": true + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-descriptor": { @@ -4220,9 +6327,20 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { +<<<<<<< master "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" +======= +<<<<<<< refs/remotes/origin/master + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" +======= + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "isobject": { @@ -4320,7 +6438,27 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { +<<<<<<< master "safer-buffer": ">= 2.1.2 < 3" +======= +<<<<<<< refs/remotes/origin/master + "safer-buffer": "2.1.2" +======= + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", + "cli-width": "2.2.0", + "figures": "1.7.0", + "lodash": "4.17.11", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "through": "2.3.8" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -4358,7 +6496,15 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { +<<<<<<< master "color-convert": "^1.9.0" +======= +<<<<<<< refs/remotes/origin/master + "color-convert": "1.9.3" +======= + "number-is-nan": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "camelcase": { @@ -4373,9 +6519,20 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { +<<<<<<< master "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" +======= +<<<<<<< refs/remotes/origin/master + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" +======= + "exit-hook": "1.1.1", + "onetime": "1.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "string-width": { @@ -4384,9 +6541,19 @@ "integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==", "dev": true, "requires": { +<<<<<<< master "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.0.0" +======= +<<<<<<< refs/remotes/origin/master + "emoji-regex": "7.0.3", + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "5.0.0" +======= + "once": "1.4.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "strip-ansi": { @@ -4395,7 +6562,17 @@ "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", "dev": true, "requires": { +<<<<<<< master "ansi-regex": "^4.0.0" +======= +<<<<<<< refs/remotes/origin/master + "ansi-regex": "4.0.0" +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "supports-color": { @@ -4404,7 +6581,53 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { +<<<<<<< master "has-flag": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "has-flag": "3.0.0" +======= + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "chalk": "1.1.3", + "lodash": "4.17.11", + "slice-ansi": "0.0.4", + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -4462,6 +6685,7 @@ "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "resolve": "1.1.7" }, "dependencies": { @@ -4471,6 +6695,11 @@ "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", "dev": true } +======= + "debug": "2.6.9", + "object-assign": "4.1.1", + "resolve": "1.9.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "browserify-aes": { @@ -4637,6 +6866,7 @@ "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", "dev": true, "requires": { +<<<<<<< master "bluebird": "^3.5.3", "chownr": "^1.1.1", "figgy-pudding": "^3.5.1", @@ -4651,6 +6881,23 @@ "ssri": "^6.0.1", "unique-filename": "^1.1.1", "y18n": "^4.0.0" +======= +<<<<<<< refs/remotes/origin/master + "bluebird": "3.5.3", + "chownr": "1.1.1", + "figgy-pudding": "3.5.1", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "lru-cache": "5.1.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.2", + "ssri": "6.0.1", + "unique-filename": "1.1.1", + "y18n": "4.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "lru-cache": { @@ -4659,7 +6906,41 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { +<<<<<<< master "yallist": "^3.0.2" +======= + "yallist": "3.0.3" +======= + "eslint": "3.19.0" + }, + "dependencies": { + "acorn-jsx": { + "version": "3.0.1", + "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dev": true, + "requires": { + "acorn": "3.3.0" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } + } + }, + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "y18n": { @@ -4668,6 +6949,7 @@ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", "dev": true }, +<<<<<<< refs/remotes/origin/master "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", @@ -4800,6 +7082,7 @@ "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", "dev": true, "requires": { +<<<<<<< master "lru-cache": "^4.0.1", "which": "^1.2.9" } @@ -4849,6 +7132,187 @@ "snapdragon-node": "^2.0.1", "split-string": "^3.0.2", "to-regex": "^3.0.1" +======= + "lru-cache": "4.1.5", + "which": "1.3.1" +======= + "cli-cursor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "dev": true, + "requires": { + "restore-cursor": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer + } + }, + "eslint": { + "version": "3.19.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz", + "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=", + "dev": true, + "requires": { +<<<<<<< master + "is-extendable": "^0.1.0" +======= + "babel-code-frame": "6.26.0", + "chalk": "1.1.3", + "concat-stream": "1.6.2", + "debug": "2.6.9", + "doctrine": "2.1.0", + "escope": "3.6.0", + "espree": "3.5.4", + "esquery": "1.0.1", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "glob": "7.1.3", + "globals": "9.18.0", + "ignore": "3.3.10", + "imurmurhash": "0.1.4", + "inquirer": "0.12.0", + "is-my-json-valid": "2.19.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.12.0", + "json-stable-stringify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.11", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "1.2.1", + "progress": "1.1.8", + "require-uncached": "1.0.3", + "shelljs": "0.7.8", + "strip-bom": "3.0.0", + "strip-json-comments": "2.0.1", + "table": "3.8.3", + "text-table": "0.2.0", + "user-home": "2.0.0" + } + }, + "espree": { + "version": "3.5.4", + "resolved": "http://registry.npmjs.org/espree/-/espree-3.5.4.tgz", + "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", + "dev": true, + "requires": { + "acorn": "5.7.3", + "acorn-jsx": "3.0.1" + }, + "dependencies": { + "acorn": { + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", + "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", + "dev": true + } + } + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" + } + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + }, + "ignore": { + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", + "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", + "dev": true + }, + "inquirer": { + "version": "0.12.0", + "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", + "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", + "dev": true, + "requires": { + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", + "cli-width": "2.2.0", + "figures": "1.7.0", + "lodash": "4.17.11", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "through": "2.3.8" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer + } + } + } + }, + "chokidar": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", + "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", + "dev": true, + "requires": { + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.4", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "lodash.debounce": "4.0.8", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.2.1", + "upath": "1.1.0" + }, + "dependencies": { + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { +<<<<<<< refs/remotes/origin/master + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" +======= + "exit-hook": "1.1.1", + "onetime": "1.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "extend-shallow": { @@ -4857,7 +7321,12 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" +<<<<<<< refs/remotes/origin/master + "is-extendable": "0.1.1" +======= + "once": "1.4.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "fill-range": { @@ -4866,10 +7335,23 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { +<<<<<<< master "extend-shallow": "^2.0.1", "is-number": "^3.0.0", "repeat-string": "^1.6.1", "to-regex-range": "^2.1.0" +======= +<<<<<<< refs/remotes/origin/master + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "glob-parent": { @@ -4878,8 +7360,14 @@ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { +<<<<<<< master "is-glob": "^3.1.0", "path-dirname": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "is-glob": "3.1.0", + "path-dirname": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "is-glob": { @@ -4892,6 +7380,84 @@ } } } +======= + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "chalk": "1.1.3", + "lodash": "4.17.11", + "slice-ansi": "0.0.4", + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + } + } + }, + "eslint-plugin-import": { + "version": "1.16.0", + "resolved": "http://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-1.16.0.tgz", + "integrity": "sha1-svoH68xTUE0PKkR3WC7Iv/GHG58=", + "dev": true, + "requires": { + "builtin-modules": "1.1.1", + "contains-path": "0.1.0", + "debug": "2.6.9", + "doctrine": "1.3.0", + "es6-map": "0.1.5", + "es6-set": "0.1.5", + "eslint-import-resolver-node": "0.2.3", + "has": "1.0.3", + "lodash.cond": "4.5.2", + "lodash.endswith": "4.2.1", + "lodash.find": "4.6.0", + "lodash.findindex": "4.6.0", + "minimatch": "3.0.4", + "object-assign": "4.1.1", + "pkg-dir": "1.0.0", + "pkg-up": "1.0.0" + }, + "dependencies": { + "doctrine": { + "version": "1.3.0", + "resolved": "http://registry.npmjs.org/doctrine/-/doctrine-1.3.0.tgz", + "integrity": "sha1-E+dWgrVVGEJCdvfBc3g0Vu+RPSY=", + "dev": true, + "requires": { + "esutils": "2.0.2", + "isarray": "1.0.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "is-extglob": { "version": "2.1.1", @@ -4905,7 +7471,16 @@ "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "dev": true, "requires": { +<<<<<<< master "is-extglob": "^2.1.1" +======= +<<<<<<< refs/remotes/origin/master + "is-extglob": "2.1.1" +======= + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-number": { @@ -4914,7 +7489,15 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { +<<<<<<< master "kind-of": "^3.0.2" +======= +<<<<<<< refs/remotes/origin/master + "kind-of": "3.2.2" +======= + "pinkie-promise": "2.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "isobject": { @@ -4929,7 +7512,15 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { +<<<<<<< master "is-buffer": "^1.1.5" +======= +<<<<<<< refs/remotes/origin/master + "is-buffer": "1.1.6" +======= + "find-up": "1.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -4945,7 +7536,17 @@ "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==", "dev": true, "requires": { +<<<<<<< master "tslib": "^1.9.0" +======= +<<<<<<< refs/remotes/origin/master + "tslib": "1.9.3" +======= + "damerau-levenshtein": "1.0.4", + "jsx-ast-utils": "1.4.1", + "object-assign": "4.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "ci-info": { @@ -4960,8 +7561,14 @@ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { +<<<<<<< master "inherits": "^2.0.1", "safe-buffer": "^5.0.1" +======= +<<<<<<< refs/remotes/origin/master + "inherits": "2.0.3", + "safe-buffer": "5.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "circular-json": { @@ -4975,10 +7582,24 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "requires": { +<<<<<<< master "arr-union": "^3.1.0", "define-property": "^0.2.5", "isobject": "^3.0.0", "static-extend": "^0.1.1" +======= + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" +======= + "array.prototype.find": "2.0.4", + "doctrine": "1.5.0", + "has": "1.0.3", + "jsx-ast-utils": "1.4.1", + "object.assign": "4.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "arr-union": { @@ -4991,7 +7612,16 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { +<<<<<<< master "is-descriptor": "^0.1.0" +======= +<<<<<<< refs/remotes/origin/master + "is-descriptor": "0.1.6" +======= + "esutils": "2.0.2", + "isarray": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "isobject": { @@ -5013,7 +7643,16 @@ "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", "dev": true, "requires": { +<<<<<<< master "source-map": "~0.6.0" +======= +<<<<<<< refs/remotes/origin/master + "source-map": "0.6.1" +======= + "acorn": "5.7.3", + "acorn-jsx": "3.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "source-map": { @@ -5035,7 +7674,15 @@ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "requires": { +<<<<<<< master "restore-cursor": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "restore-cursor": "2.0.0" +======= + "estraverse": "4.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "cli-table3": { @@ -5044,9 +7691,19 @@ "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", "dev": true, "requires": { +<<<<<<< master "colors": "^1.1.2", "object-assign": "^4.1.0", "string-width": "^2.1.1" +======= +<<<<<<< refs/remotes/origin/master + "colors": "1.3.3", + "object-assign": "4.1.1", + "string-width": "2.1.1" +======= + "estraverse": "4.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "cli-width": { @@ -5059,9 +7716,16 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "requires": { +<<<<<<< master "string-width": "^1.0.1", "strip-ansi": "^3.0.1", "wrap-ansi": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "is-fullwidth-code-point": { @@ -5082,6 +7746,10 @@ "strip-ansi": "^3.0.0" } } +======= + "d": "1.0.0", + "es5-ext": "0.10.46" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "co": { @@ -5100,8 +7768,17 @@ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "requires": { +<<<<<<< master "map-visit": "^1.0.0", "object-visit": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "map-visit": "1.0.0", + "object-visit": "1.0.1" +======= + "merge": "1.2.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "color-convert": { @@ -5109,7 +7786,17 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "requires": { +<<<<<<< refs/remotes/origin/master "color-name": "1.1.3" +======= + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "color-name": { @@ -5122,18 +7809,41 @@ "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" }, +<<<<<<< refs/remotes/origin/master "colors": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==", +<<<<<<< master "dev": true +======= + "dev": true, + "optional": true +======= + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "requires": { + "is-posix-bracket": "0.1.1" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "combined-stream": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", "requires": { +<<<<<<< master "delayed-stream": "~1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "delayed-stream": "1.0.0" +======= + "fill-range": "2.2.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "command-line-args": { @@ -5141,9 +7851,35 @@ "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-4.0.7.tgz", "integrity": "sha512-aUdPvQRAyBvQd2n7jXcsMDz68ckBJELXNzBybCHOibUWEg0mWTnaYCSRU8h9R+aNRSvDihJtssSRCiDRpLaezA==", "requires": { +<<<<<<< master "array-back": "^2.0.0", "find-replace": "^1.0.3", "typical": "^2.6.1" +======= +<<<<<<< refs/remotes/origin/master + "array-back": "2.0.0", + "find-replace": "1.0.3", + "typical": "2.6.1" +======= + "ansi-styles": "3.2.1", + "jest-diff": "23.6.0", + "jest-get-type": "22.4.3", + "jest-matcher-utils": "23.6.0", + "jest-message-util": "23.4.0", + "jest-regex-util": "23.3.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "commander": { @@ -5151,11 +7887,21 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==" }, +<<<<<<< refs/remotes/origin/master "common-tags": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==", "dev": true +======= + "extend-shallow": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", + "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "requires": { + "kind-of": "1.1.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "commondir": { "version": "1.0.1", @@ -5172,7 +7918,17 @@ "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==", "requires": { +<<<<<<< master "mime-db": ">= 1.36.0 < 2" +======= +<<<<<<< refs/remotes/origin/master + "mime-db": "1.37.0" +======= + "chardet": "0.4.2", + "iconv-lite": "0.4.24", + "tmp": "0.0.33" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "compression": { @@ -5180,13 +7936,25 @@ "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz", "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==", "requires": { +<<<<<<< master "accepts": "~1.3.5", +======= +<<<<<<< refs/remotes/origin/master + "accepts": "1.3.5", +>>>>>>> UPS8: Added ProfileView Form with header, footer "bytes": "3.0.0", "compressible": "~2.0.14", "debug": "2.6.9", "on-headers": "~1.0.1", "safe-buffer": "5.1.2", +<<<<<<< master "vary": "~1.1.2" +======= + "vary": "1.1.2" +======= + "is-extglob": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "concat-map": { @@ -5199,10 +7967,24 @@ "resolved": "http://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "requires": { +<<<<<<< master "buffer-from": "^1.0.0", "inherits": "^2.0.3", "readable-stream": "^2.2.2", "typedarray": "^0.0.6" +======= +<<<<<<< refs/remotes/origin/master + "buffer-from": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" +======= + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "parse-node-version": "1.0.0", + "time-stamp": "1.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "connect": { @@ -5210,10 +7992,14 @@ "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz", "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=", "requires": { +<<<<<<< refs/remotes/origin/master "debug": "2.6.9", "finalhandler": "1.1.0", "parseurl": "~1.3.2", "utils-merge": "1.0.1" +======= + "bser": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "console-browserify": { @@ -5222,7 +8008,29 @@ "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "dev": true, "requires": { +<<<<<<< master "date-now": "^0.1.4" +======= +<<<<<<< refs/remotes/origin/master + "date-now": "0.1.4" +======= + "core-js": "2.6.1", + "fbjs-css-vars": "1.0.2", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.19" + }, + "dependencies": { + "core-js": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz", + "integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "console-control-strings": { @@ -5230,6 +8038,7 @@ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, +<<<<<<< refs/remotes/origin/master "constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", @@ -5241,6 +8050,39 @@ "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", "dev": true +======= + "fbjs-scripts": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fbjs-scripts/-/fbjs-scripts-1.0.1.tgz", + "integrity": "sha512-x8bfX7k0z5B24Ue0YqjZq/2QxxaKZUNbkGdX//zbQDElMJFqBRrvRi8O3qds7UNNzs78jYqIYCS32Sk/wu5UJg==", + "requires": { + "@babel/core": "7.2.2", + "ansi-colors": "1.1.0", + "babel-preset-fbjs": "3.1.0", + "core-js": "2.6.1", + "cross-spawn": "5.1.0", + "fancy-log": "1.3.3", + "object-assign": "4.1.1", + "plugin-error": "0.1.2", + "semver": "5.6.0", + "through2": "2.0.5" + }, + "dependencies": { + "core-js": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz", + "integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==" + } + } + }, + "fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "requires": { + "pend": "1.2.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "content-disposition": { "version": "0.5.2", @@ -5259,7 +8101,15 @@ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", "requires": { +<<<<<<< master "safe-buffer": "~5.1.1" +======= +<<<<<<< refs/remotes/origin/master + "safe-buffer": "5.1.2" +======= + "escape-string-regexp": "1.0.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "cookie": { @@ -5280,12 +8130,26 @@ "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", "dev": true, "requires": { +<<<<<<< master "aproba": "^1.1.1", "fs-write-stream-atomic": "^1.0.8", "iferr": "^0.1.5", "mkdirp": "^0.5.1", "rimraf": "^2.5.4", "run-queue": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "aproba": "1.2.0", + "fs-write-stream-atomic": "1.0.10", + "iferr": "0.1.5", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "run-queue": "1.0.3" +======= + "flat-cache": "1.3.4", + "object-assign": "4.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "copy-descriptor": { @@ -5320,8 +8184,18 @@ "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", "dev": true, "requires": { +<<<<<<< master "bn.js": "^4.1.0", "elliptic": "^6.0.0" +======= +<<<<<<< refs/remotes/origin/master + "bn.js": "4.11.8", + "elliptic": "6.4.1" +======= + "glob": "7.1.3", + "minimatch": "3.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "create-hash": { @@ -5330,11 +8204,27 @@ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { +<<<<<<< master "cipher-base": "^1.0.1", "inherits": "^2.0.1", "md5.js": "^1.3.4", "ripemd160": "^2.0.1", "sha.js": "^2.4.0" +======= +<<<<<<< refs/remotes/origin/master + "cipher-base": "1.0.4", + "inherits": "2.0.3", + "md5.js": "1.3.5", + "ripemd160": "2.0.2", + "sha.js": "2.4.11" +======= + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "3.1.1", + "repeat-element": "1.1.3", + "repeat-string": "1.6.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "create-hmac": { @@ -5343,12 +8233,31 @@ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { +<<<<<<< master "cipher-base": "^1.0.3", "create-hash": "^1.1.0", "inherits": "^2.0.1", "ripemd160": "^2.0.0", "safe-buffer": "^5.0.1", "sha.js": "^2.4.8" +======= +<<<<<<< refs/remotes/origin/master + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "inherits": "2.0.3", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" +======= + "debug": "2.6.9", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.3.1", + "unpipe": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "create-react-class": { @@ -5356,9 +8265,16 @@ "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz", "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==", "requires": { +<<<<<<< master "fbjs": "^0.8.9", "loose-envify": "^1.3.1", "object-assign": "^4.1.1" +======= +<<<<<<< refs/remotes/origin/master + "fbjs": "0.8.17", + "loose-envify": "1.4.0", + "object-assign": "4.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "fbjs": { @@ -5375,6 +8291,11 @@ "ua-parser-js": "^0.7.18" } } +======= + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "create-react-context": { @@ -5382,8 +8303,18 @@ "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.2.tgz", "integrity": "sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==", "requires": { +<<<<<<< master "fbjs": "^0.8.0", "gud": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "fbjs": "0.8.17", + "gud": "1.0.0" +======= + "array-back": "1.0.4", + "test-value": "2.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "fbjs": { @@ -5391,6 +8322,7 @@ "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", "requires": { +<<<<<<< master "core-js": "^1.0.0", "isomorphic-fetch": "^2.1.1", "loose-envify": "^1.0.0", @@ -5398,6 +8330,19 @@ "promise": "^7.1.1", "setimmediate": "^1.0.5", "ua-parser-js": "^0.7.18" +======= +<<<<<<< refs/remotes/origin/master + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.19" +======= + "typical": "2.6.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -5407,9 +8352,19 @@ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "requires": { +<<<<<<< master "lru-cache": "^4.0.1", "shebang-command": "^1.2.0", "which": "^1.2.9" +======= +<<<<<<< refs/remotes/origin/master + "lru-cache": "4.1.5", + "shebang-command": "1.2.0", + "which": "1.3.1" +======= + "locate-path": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "crypto-browserify": { @@ -5418,6 +8373,7 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dev": true, "requires": { +<<<<<<< master "browserify-cipher": "^1.0.0", "browserify-sign": "^4.0.0", "create-ecdh": "^4.0.0", @@ -5429,6 +8385,26 @@ "public-encrypt": "^4.0.0", "randombytes": "^2.0.0", "randomfill": "^1.0.3" +======= +<<<<<<< refs/remotes/origin/master + "browserify-cipher": "1.0.1", + "browserify-sign": "4.0.4", + "create-ecdh": "4.0.3", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "diffie-hellman": "5.0.3", + "inherits": "2.0.3", + "pbkdf2": "3.0.17", + "public-encrypt": "4.0.3", + "randombytes": "2.0.6", + "randomfill": "1.0.4" +======= + "circular-json": "0.3.3", + "graceful-fs": "4.1.15", + "rimraf": "2.6.2", + "write": "0.2.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "css-loader": { @@ -5505,10 +8481,21 @@ "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "dev": true, "requires": { +<<<<<<< master "boolbase": "~1.0.0", "css-what": "2.1", "domutils": "1.5.1", "nth-check": "~1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "boolbase": "1.0.0", + "css-what": "2.1.2", + "domutils": "1.5.1", + "nth-check": "1.0.2" +======= + "for-in": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "css-selector-tokenizer": { @@ -5517,9 +8504,16 @@ "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", "dev": true, "requires": { +<<<<<<< master "cssesc": "^0.1.0", "fastparse": "^1.1.1", "regexpu-core": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "cssesc": "0.1.0", + "fastparse": "1.1.2", + "regexpu-core": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "jsesc": { @@ -5554,6 +8548,11 @@ "jsesc": "~0.5.0" } } +======= + "asynckit": "0.4.0", + "combined-stream": "1.0.7", + "mime-types": "2.1.21" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "css-what": { @@ -5580,7 +8579,15 @@ "integrity": "sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==", "dev": true, "requires": { +<<<<<<< master "cssom": "0.3.x" +======= +<<<<<<< refs/remotes/origin/master + "cssom": "0.3.4" +======= + "map-cache": "0.2.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "cyclist": { @@ -5609,7 +8616,17 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { +<<<<<<< master "assert-plus": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "assert-plus": "1.0.0" +======= + "graceful-fs": "4.1.15", + "jsonfile": "2.4.0", + "klaw": "1.3.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "data-urls": { @@ -5647,7 +8664,11 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { +<<<<<<< refs/remotes/origin/master "ms": "2.0.0" +======= + "minipass": "2.3.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "decamelize": { @@ -5690,11 +8711,24 @@ "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", "requires": { +<<<<<<< master "decompress-tar": "^4.1.0", "file-type": "^6.1.0", "is-stream": "^1.1.0", "seek-bzip": "^1.0.5", "unbzip2-stream": "^1.0.9" +======= +<<<<<<< refs/remotes/origin/master + "decompress-tar": "4.1.1", + "file-type": "6.2.0", + "is-stream": "1.1.0", + "seek-bzip": "1.0.5", + "unbzip2-stream": "1.3.1" +======= + "nan": "2.12.1", + "node-pre-gyp": "0.10.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "file-type": { @@ -5735,8 +8769,18 @@ "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", "requires": { +<<<<<<< master "object-assign": "^4.0.1", "pinkie-promise": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "object-assign": "4.1.1", + "pinkie-promise": "2.0.1" +======= + "delegates": "1.0.0", + "readable-stream": "2.3.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -5778,7 +8822,16 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { +<<<<<<< master "is-utf8": "^0.2.0" +======= +<<<<<<< refs/remotes/origin/master + "is-utf8": "0.2.1" +======= + "balanced-match": "1.0.0", + "concat-map": "0.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -5806,15 +8859,59 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { +<<<<<<< master "kind-of": "^6.0.0" +======= +<<<<<<< refs/remotes/origin/master + "kind-of": "6.0.2" +======= + "minipass": "2.2.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-data-descriptor": { "version": "1.0.0", +<<<<<<< refs/remotes/origin/master "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { +<<<<<<< master "kind-of": "^6.0.0" +======= + "kind-of": "6.0.2" +======= + "bundled": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "optional": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "optional": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-descriptor": { @@ -5822,16 +8919,133 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { +<<<<<<< master "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" +======= +<<<<<<< refs/remotes/origin/master + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" +======= + "safer-buffer": "2.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "isobject": { "version": "3.0.1", +<<<<<<< refs/remotes/origin/master "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" +======= + "bundled": true, + "optional": true, + "requires": { + "minimatch": "3.0.4" + } }, +<<<<<<< master +======= + "inflight": { + "version": "1.0.6", + "bundled": true, + "optional": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.11" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true + }, + "minipass": { + "version": "2.2.4", + "bundled": true, + "requires": { + "safe-buffer": "5.1.1", + "yallist": "3.0.2" + } + }, + "minizlib": { + "version": "1.1.0", + "bundled": true, + "optional": true, + "requires": { + "minipass": "2.2.4" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "optional": true + }, + "needle": { + "version": "2.2.0", + "bundled": true, + "optional": true, + "requires": { + "debug": "2.6.9", + "iconv-lite": "0.4.21", + "sax": "1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.10.0", + "bundled": true, + "optional": true, + "requires": { + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.0", + "nopt": "4.0.1", + "npm-packlist": "1.1.10", + "npmlog": "4.1.2", + "rc": "1.2.7", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "4.4.1" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer + }, +>>>>>>> UPS8: Added ProfileView Form with header, footer "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", @@ -5865,8 +9079,13 @@ "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", "dev": true, "requires": { +<<<<<<< master "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" +======= + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "destroy": { @@ -5880,7 +9099,11 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { +<<<<<<< master "repeating": "^2.0.0" +======= + "repeating": "2.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "detect-libc": { @@ -5935,7 +9158,12 @@ "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, "requires": { +<<<<<<< master "pify": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "pify": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "pify": { @@ -5943,6 +9171,217 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "dev": true +<<<<<<< master +======= +======= + "abbrev": "1.1.1", + "osenv": "0.1.5" + } + }, + "npm-bundled": { + "version": "1.0.3", + "bundled": true, + "optional": true + }, + "npm-packlist": { + "version": "1.1.10", + "bundled": true, + "optional": true, + "requires": { + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "optional": true + }, + "process-nextick-args": { + "version": "2.0.0", + "bundled": true, + "optional": true + }, + "rc": { + "version": "1.2.7", + "bundled": true, + "optional": true, + "requires": { + "deep-extend": "0.5.1", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "optional": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "optional": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.1.1", + "bundled": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "optional": true + }, + "semver": { + "version": "5.5.0", + "bundled": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "optional": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "optional": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "optional": true + }, + "tar": { + "version": "4.4.1", + "bundled": true, + "optional": true, + "requires": { + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.2.4", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.1", + "yallist": "3.0.2" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "optional": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + }, + "yallist": { + "version": "3.0.2", + "bundled": true +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, @@ -5952,7 +9391,11 @@ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { +<<<<<<< master "esutils": "^2.0.2" +======= + "esutils": "2.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "dom-converter": { @@ -5961,7 +9404,19 @@ "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", "dev": true, "requires": { +<<<<<<< master "utila": "~0.4" +======= +<<<<<<< refs/remotes/origin/master + "utila": "0.4.0" +======= + "ansi": "0.3.1", + "has-unicode": "2.0.1", + "lodash.pad": "4.5.1", + "lodash.padend": "4.6.1", + "lodash.padstart": "4.6.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "dom-helpers": { @@ -5970,7 +9425,15 @@ "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", "dev": true, "requires": { +<<<<<<< master "@babel/runtime": "^7.1.2" +======= +<<<<<<< refs/remotes/origin/master + "@babel/runtime": "7.2.0" +======= + "is-property": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "dom-serializer": { @@ -5979,8 +9442,14 @@ "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, "requires": { +<<<<<<< master "domelementtype": "~1.1.1", "entities": "~1.1.1" +======= +<<<<<<< refs/remotes/origin/master + "domelementtype": "1.1.3", + "entities": "1.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "domelementtype": { @@ -5989,6 +9458,12 @@ "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", "dev": true } +<<<<<<< master +======= +======= + "is-property": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "dom-walk": { @@ -6014,7 +9489,15 @@ "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", "dev": true, "requires": { +<<<<<<< master "webidl-conversions": "^4.0.2" +======= +<<<<<<< refs/remotes/origin/master + "webidl-conversions": "4.0.2" +======= + "assert-plus": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "domhandler": { @@ -6023,7 +9506,20 @@ "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=", "dev": true, "requires": { +<<<<<<< master "domelementtype": "1" +======= +<<<<<<< refs/remotes/origin/master + "domelementtype": "1.3.1" +======= + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "domutils": { @@ -6032,6 +9528,7 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { +<<<<<<< master "dom-serializer": "0", "domelementtype": "1" } @@ -6040,6 +9537,21 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz", "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==", +======= +<<<<<<< refs/remotes/origin/master + "dom-serializer": "0.1.0", + "domelementtype": "1.3.1" +======= + "glob-parent": "2.0.0", + "is-glob": "2.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer + } + }, + "dotenv": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz", + "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==", +>>>>>>> UPS8: Added ProfileView Form with header, footer "dev": true }, "dotenv-defaults": { @@ -6063,7 +9575,16 @@ "integrity": "sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==", "dev": true, "requires": { +<<<<<<< master "dotenv-defaults": "^1.0.2" +======= +<<<<<<< refs/remotes/origin/master + "dotenv": "5.0.1", + "dotenv-expand": "4.2.0" +======= + "is-glob": "2.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "duplexer": { @@ -6078,10 +9599,22 @@ "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==", "dev": true, "requires": { +<<<<<<< master "end-of-stream": "^1.0.0", "inherits": "^2.0.1", "readable-stream": "^2.0.0", "stream-shift": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "stream-shift": "1.0.0" +======= + "min-document": "2.19.0", + "process": "0.5.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "ecc-jsbn": { @@ -6116,6 +9649,7 @@ "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==", "dev": true, "requires": { +<<<<<<< master "bn.js": "^4.4.0", "brorand": "^1.0.1", "hash.js": "^1.0.0", @@ -6123,6 +9657,48 @@ "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0", "minimalistic-crypto-utils": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "bn.js": "4.11.8", + "brorand": "1.1.0", + "hash.js": "1.1.7", + "hmac-drbg": "1.0.1", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" +======= + "async": "2.6.1", + "optimist": "0.6.1", + "source-map": "0.6.1", + "uglify-js": "3.4.9" + }, + "dependencies": { + "commander": { + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", + "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", + "dev": true, + "optional": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "uglify-js": { + "version": "3.4.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", + "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", + "dev": true, + "optional": true, + "requires": { + "commander": "2.17.1", + "source-map": "0.6.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "emoji-regex": { @@ -6147,7 +9723,16 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "requires": { +<<<<<<< master "iconv-lite": "~0.4.13" +======= +<<<<<<< refs/remotes/origin/master + "iconv-lite": "0.4.24" +======= + "ajv": "6.6.2", + "har-schema": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "end-of-stream": { @@ -6155,7 +9740,15 @@ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "requires": { +<<<<<<< master "once": "^1.4.0" +======= +<<<<<<< refs/remotes/origin/master + "once": "1.4.0" +======= + "function-bind": "1.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "enhanced-resolve": { @@ -6164,9 +9757,19 @@ "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", "dev": true, "requires": { +<<<<<<< master "graceful-fs": "^4.1.2", "memory-fs": "^0.4.0", "tapable": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "graceful-fs": "4.1.15", + "memory-fs": "0.4.1", + "tapable": "1.1.1" +======= + "ansi-regex": "2.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "entities": { @@ -6186,7 +9789,24 @@ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", "dev": true, "requires": { +<<<<<<< master "prr": "~1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "prr": "1.0.1" +======= + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "error-ex": { @@ -6194,7 +9814,44 @@ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "requires": { +<<<<<<< master "is-arrayish": "^0.2.1" +======= +<<<<<<< refs/remotes/origin/master + "is-arrayish": "0.2.1" +======= + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "requires": { + "is-buffer": "1.1.6" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "errorhandler": { @@ -6202,8 +9859,17 @@ "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz", "integrity": "sha1-6rpkyl1UKjEayUX1gt78M2Fl2fQ=", "requires": { +<<<<<<< master "accepts": "~1.3.3", "escape-html": "~1.0.3" +======= +<<<<<<< refs/remotes/origin/master + "accepts": "1.3.5", + "escape-html": "1.0.3" +======= + "react-is": "16.7.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "es-abstract": { @@ -6212,11 +9878,23 @@ "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", "dev": true, "requires": { +<<<<<<< master "es-to-primitive": "^1.1.1", "function-bind": "^1.1.1", "has": "^1.0.1", "is-callable": "^1.1.3", "is-regex": "^1.0.4" +======= +<<<<<<< refs/remotes/origin/master + "es-to-primitive": "1.2.0", + "function-bind": "1.1.1", + "has": "1.0.3", + "is-callable": "1.1.4", + "is-regex": "1.0.4" +======= + "whatwg-encoding": "1.0.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "es-to-primitive": { @@ -6225,9 +9903,28 @@ "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", "dev": true, "requires": { +<<<<<<< master "is-callable": "^1.1.4", "is-date-object": "^1.0.1", "is-symbol": "^1.0.2" +======= +<<<<<<< refs/remotes/origin/master + "is-callable": "1.1.4", + "is-date-object": "1.0.1", + "is-symbol": "1.0.2" +======= + "caseless": "0.11.0", + "concat-stream": "1.6.2", + "http-response-object": "1.1.0" + }, + "dependencies": { + "caseless": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "es5-ext": { @@ -6236,9 +9933,29 @@ "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==", "dev": true, "requires": { +<<<<<<< master "es6-iterator": "~2.0.3", "es6-symbol": "~3.1.1", "next-tick": "1" +======= +<<<<<<< refs/remotes/origin/master + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" +======= + "depd": "1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": "1.5.0" + }, + "dependencies": { + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "es5-shim": { @@ -6253,9 +9970,21 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { +<<<<<<< master "d": "1", "es5-ext": "^0.10.35", "es6-symbol": "^3.1.1" +======= +<<<<<<< refs/remotes/origin/master + "d": "1.0.0", + "es5-ext": "0.10.46", + "es6-symbol": "3.1.1" +======= + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.16.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "es6-map": { @@ -6278,11 +10007,23 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { +<<<<<<< master "d": "1", "es5-ext": "~0.10.14", "es6-iterator": "~2.0.1", "es6-symbol": "3.1.1", "event-emitter": "~0.3.5" +======= +<<<<<<< refs/remotes/origin/master + "d": "1.0.0", + "es5-ext": "0.10.46", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" +======= + "safer-buffer": "2.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "es6-shim": { @@ -6297,8 +10038,17 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { +<<<<<<< master "d": "1", "es5-ext": "~0.10.14" +======= +<<<<<<< refs/remotes/origin/master + "d": "1.0.0", + "es5-ext": "0.10.46" +======= + "minimatch": "3.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "es6-weak-map": { @@ -6307,10 +10057,22 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { +<<<<<<< master "d": "1", "es5-ext": "^0.10.14", "es6-iterator": "^2.0.1", "es6-symbol": "^3.1.1" +======= +<<<<<<< refs/remotes/origin/master + "d": "1.0.0", + "es5-ext": "0.10.46", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" +======= + "caller-path": "2.0.0", + "resolve-from": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "escape-html": { @@ -6329,11 +10091,20 @@ "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==", "dev": true, "requires": { +<<<<<<< master "esprima": "^3.1.3", "estraverse": "^4.2.0", "esutils": "^2.0.2", "optionator": "^0.8.1", "source-map": "~0.6.1" +======= +<<<<<<< refs/remotes/origin/master + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.6.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "esprima": { @@ -6349,6 +10120,10 @@ "dev": true, "optional": true } +======= + "pkg-dir": "2.0.0", + "resolve-cwd": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "escope": { @@ -6357,10 +10132,22 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { +<<<<<<< master "es6-map": "^0.1.3", "es6-weak-map": "^2.0.1", "esrecurse": "^4.1.0", "estraverse": "^4.1.1" +======= +<<<<<<< refs/remotes/origin/master + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.1", + "estraverse": "4.2.0" +======= + "once": "1.4.0", + "wrappy": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "eslint": { @@ -6369,6 +10156,7 @@ "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=", "dev": true, "requires": { +<<<<<<< master "babel-code-frame": "^6.16.0", "chalk": "^1.1.3", "concat-stream": "^1.5.2", @@ -6404,6 +10192,60 @@ "table": "^3.7.8", "text-table": "~0.2.0", "user-home": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "babel-code-frame": "6.26.0", + "chalk": "1.1.3", + "concat-stream": "1.6.2", + "debug": "2.6.9", + "doctrine": "2.1.0", + "escope": "3.6.0", + "espree": "3.5.4", + "esquery": "1.0.1", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "glob": "7.1.3", + "globals": "9.18.0", + "ignore": "3.3.10", + "imurmurhash": "0.1.4", + "inquirer": "0.12.0", + "is-my-json-valid": "2.19.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.12.0", + "json-stable-stringify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.11", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "1.2.1", + "progress": "1.1.8", + "require-uncached": "1.0.3", + "shelljs": "0.7.8", + "strip-bom": "3.0.0", + "strip-json-comments": "2.0.1", + "table": "3.8.3", + "text-table": "0.2.0", + "user-home": "2.0.0" +======= + "ansi-escapes": "3.1.0", + "chalk": "2.4.1", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "2.2.0", + "figures": "2.0.0", + "lodash": "4.17.11", + "mute-stream": "0.0.7", + "run-async": "2.3.0", + "rx-lite": "4.0.8", + "rx-lite-aggregates": "4.0.8", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "through": "2.3.8" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-escapes": { @@ -6418,7 +10260,15 @@ "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", "dev": true, "requires": { +<<<<<<< master "restore-cursor": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "restore-cursor": "1.0.1" +======= + "color-convert": "1.9.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "figures": { @@ -6427,8 +10277,19 @@ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", "dev": true, "requires": { +<<<<<<< master "escape-string-regexp": "^1.0.5", "object-assign": "^4.1.0" +======= +<<<<<<< refs/remotes/origin/master + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" +======= + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "globals": { @@ -6443,6 +10304,7 @@ "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", "dev": true, "requires": { +<<<<<<< master "ansi-escapes": "^1.1.0", "ansi-regex": "^2.0.0", "chalk": "^1.0.0", @@ -6456,6 +10318,25 @@ "string-width": "^1.0.1", "strip-ansi": "^3.0.0", "through": "^2.3.6" +======= +<<<<<<< refs/remotes/origin/master + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", + "cli-width": "2.2.0", + "figures": "1.7.0", + "lodash": "4.17.11", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "through": "2.3.8" +======= + "ansi-regex": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-fullwidth-code-point": { @@ -6510,25 +10391,72 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { +<<<<<<< master "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" +======= + "has-flag": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } }, +<<<<<<< refs/remotes/origin/master "eslint-config-rallycoding": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/eslint-config-rallycoding/-/eslint-config-rallycoding-3.2.0.tgz", "integrity": "sha1-Elb4AXQroOlXV2gOgf0U/x2+/4Y=", "dev": true, "requires": { +<<<<<<< master "babel-eslint": "^6.1.2", "eslint": "^3.2.2", "eslint-plugin-class-property": "^1.0.1", "eslint-plugin-import": "^1.13.0", "eslint-plugin-jsx-a11y": "^2.1.0", "eslint-plugin-react": "^6.0.0" +======= + "babel-eslint": "6.1.2", + "eslint": "3.19.0", + "eslint-plugin-class-property": "1.1.0", + "eslint-plugin-import": "1.16.0", + "eslint-plugin-jsx-a11y": "2.2.3", + "eslint-plugin-react": "6.10.3" +======= + "interpret": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", + "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", + "dev": true + }, + "invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "requires": { + "loose-envify": "1.4.0" + } + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "acorn-jsx": { @@ -6537,7 +10465,12 @@ "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { +<<<<<<< master "acorn": "^3.0.4" +======= +<<<<<<< refs/remotes/origin/master + "acorn": "3.3.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "acorn": { @@ -6546,6 +10479,9 @@ "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", "dev": true } +======= + "is-buffer": "1.1.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "ajv": { @@ -11141,7 +15077,15 @@ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-23.2.0.tgz", "integrity": "sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=", "requires": { +<<<<<<< master "merge-stream": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "merge-stream": "1.0.1" +======= + "builtin-modules": "1.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "js-levenshtein": { @@ -11160,8 +15104,17 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", "requires": { +<<<<<<< master "argparse": "^1.0.7", "esprima": "^4.0.0" +======= +<<<<<<< refs/remotes/origin/master + "argparse": "1.0.10", + "esprima": "4.0.1" +======= + "ci-info": "1.6.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "jsbn": { @@ -11175,6 +15128,7 @@ "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==", "dev": true, "requires": { +<<<<<<< master "abab": "^2.0.0", "acorn": "^5.5.3", "acorn-globals": "^4.1.0", @@ -11201,6 +15155,38 @@ "whatwg-url": "^6.4.1", "ws": "^5.2.0", "xml-name-validator": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "abab": "2.0.0", + "acorn": "5.7.3", + "acorn-globals": "4.3.0", + "array-equal": "1.0.0", + "cssom": "0.3.4", + "cssstyle": "1.1.1", + "data-urls": "1.1.0", + "domexception": "1.0.1", + "escodegen": "1.11.0", + "html-encoding-sniffer": "1.0.2", + "left-pad": "1.3.0", + "nwsapi": "2.0.9", + "parse5": "4.0.0", + "pn": "1.1.0", + "request": "2.88.0", + "request-promise-native": "1.0.5", + "sax": "1.2.4", + "symbol-tree": "3.2.2", + "tough-cookie": "2.5.0", + "w3c-hr-time": "1.0.1", + "webidl-conversions": "4.0.2", + "whatwg-encoding": "1.0.5", + "whatwg-mimetype": "2.3.0", + "whatwg-url": "6.5.0", + "ws": "5.2.2", + "xml-name-validator": "3.0.0" +======= + "kind-of": "3.2.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "acorn": { @@ -11221,7 +15207,15 @@ "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", "dev": true, "requires": { +<<<<<<< master "async-limiter": "~1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "async-limiter": "1.0.0" +======= + "is-buffer": "1.1.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -11270,7 +15264,24 @@ "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz", "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==", "requires": { +<<<<<<< master "minimist": "^1.2.0" +======= +<<<<<<< refs/remotes/origin/master + "minimist": "1.2.0" +======= + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "jsonfile": { @@ -11297,10 +15308,14 @@ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "requires": { +<<<<<<< refs/remotes/origin/master "assert-plus": "1.0.0", "extsprintf": "1.3.0", "json-schema": "0.2.3", "verror": "1.10.0" +======= + "is-primitive": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "jsx-ast-utils": { @@ -11325,7 +15340,15 @@ "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "requires": { +<<<<<<< master "graceful-fs": "^4.1.9" +======= +<<<<<<< refs/remotes/origin/master + "graceful-fs": "4.1.15" +======= + "number-is-nan": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "kleur": { @@ -11340,11 +15363,20 @@ "integrity": "sha512-1Wi0zgZMfRLaRAK21g3odYuU+HE1d85Loe2tb44YhcNwIzhmD49mTPR9aKckpB9Q9Q9mA+hUMLI2xlkcCAe3yw==", "dev": true, "requires": { +<<<<<<< master "@babel/runtime": "^7.0.0", "app-root-dir": "^1.0.2", "core-js": "^2.5.7", "dotenv": "^6.0.0", "dotenv-expand": "^4.2.0" +======= +<<<<<<< refs/remotes/origin/master + "@babel/runtime": "7.2.0", + "app-root-dir": "1.0.2", + "core-js": "2.6.2", + "dotenv": "6.2.0", + "dotenv-expand": "4.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "core-js": { @@ -11353,6 +15385,9 @@ "integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ==", "dev": true } +======= + "is-extglob": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "lcid": { @@ -11381,8 +15416,21 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { +<<<<<<< master "prelude-ls": "~1.1.2", "type-check": "~0.3.2" +======= +<<<<<<< refs/remotes/origin/master + "prelude-ls": "1.1.2", + "type-check": "0.3.2" +======= + "generate-function": "2.3.1", + "generate-object-property": "1.2.0", + "is-my-ip-valid": "1.0.0", + "jsonpointer": "4.0.1", + "xtend": "4.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "load-json-file": { @@ -11390,10 +15438,21 @@ "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "requires": { +<<<<<<< master "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", "pify": "^2.0.0", "strip-bom": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "graceful-fs": "4.1.15", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" +======= + "kind-of": "3.2.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "parse-json": { @@ -11401,7 +15460,15 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "requires": { +<<<<<<< master "error-ex": "^1.2.0" +======= +<<<<<<< refs/remotes/origin/master + "error-ex": "1.3.2" +======= + "is-buffer": "1.1.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -11418,9 +15485,19 @@ "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", "dev": true, "requires": { +<<<<<<< master "big.js": "^5.2.2", "emojis-list": "^2.0.0", "json5": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "big.js": "5.2.2", + "emojis-list": "2.1.0", + "json5": "1.0.1" +======= + "isobject": "3.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "json5": { @@ -11454,10 +15531,26 @@ "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", "dev": true }, +<<<<<<< refs/remotes/origin/master "lodash.cond": { "version": "4.5.2", "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz", "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=", +======= + "is-regex": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", + "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "dev": true, + "requires": { + "has": "1.0.3" + } + }, + "is-resolvable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", +>>>>>>> UPS8: Added ProfileView Form with header, footer "dev": true }, "lodash.debounce": { @@ -11466,11 +15559,22 @@ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, +<<<<<<< refs/remotes/origin/master "lodash.endswith": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz", "integrity": "sha1-/tWawXOO0+I27dcGTsRWRIs3vAk=", "dev": true +======= + "is-symbol": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", + "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "dev": true, + "requires": { + "has-symbols": "1.0.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "lodash.find": { "version": "4.6.0", @@ -11505,10 +15609,32 @@ "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=" }, +<<<<<<< refs/remotes/origin/master "lodash.padstart": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz", "integrity": "sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs=" +======= + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "1.7.3", + "whatwg-fetch": "3.0.0" + }, + "dependencies": { + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "0.1.12", + "is-stream": "1.1.0" + } + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "lodash.pickby": { "version": "4.6.0", @@ -11516,11 +15642,32 @@ "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=", "dev": true }, +<<<<<<< refs/remotes/origin/master "lodash.some": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=", "dev": true +======= + "istanbul-api": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.7.tgz", + "integrity": "sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==", + "dev": true, + "requires": { + "async": "2.6.1", + "fileset": "2.0.3", + "istanbul-lib-coverage": "1.2.1", + "istanbul-lib-hook": "1.2.2", + "istanbul-lib-instrument": "1.10.2", + "istanbul-lib-report": "1.1.5", + "istanbul-lib-source-maps": "1.2.6", + "istanbul-reports": "1.5.1", + "js-yaml": "3.12.0", + "mkdirp": "0.5.1", + "once": "1.4.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "lodash.sortby": { "version": "4.7.0", @@ -11528,10 +15675,21 @@ "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", "dev": true }, +<<<<<<< refs/remotes/origin/master "lodash.throttle": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" +======= + "istanbul-lib-hook": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz", + "integrity": "sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==", + "dev": true, + "requires": { + "append-transform": "0.4.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "lodash.times": { "version": "4.3.2", @@ -11548,7 +15706,12 @@ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "requires": { +<<<<<<< master "js-tokens": "^3.0.0 || ^4.0.0" +======= +<<<<<<< refs/remotes/origin/master + "js-tokens": "4.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "lower-case": { @@ -11562,8 +15725,51 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "requires": { +<<<<<<< master "pseudomap": "^1.0.2", "yallist": "^2.1.2" +======= + "pseudomap": "1.0.2", + "yallist": "2.1.2" +======= + "babel-generator": "6.26.1", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.2.1", + "semver": "5.6.0" + } + }, + "istanbul-lib-report": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz", + "integrity": "sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "1.2.1", + "mkdirp": "0.5.1", + "path-parse": "1.0.6", + "supports-color": "3.2.3" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "make-dir": { @@ -11571,16 +15777,220 @@ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "requires": { +<<<<<<< master "pify": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "pify": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" +======= + "debug": "3.2.6", + "istanbul-lib-coverage": "1.2.1", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "2.1.1" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, + "makeerror": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", + "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=", + "requires": { +<<<<<<< refs/remotes/origin/master + "tmpl": "1.0.4" +======= + "handlebars": "4.0.12" +>>>>>>> UPS8: Added ProfileView Form with header, footer + } + }, + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + }, + "map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "requires": { +<<<<<<< refs/remotes/origin/master + "object-visit": "1.0.1" +======= + "import-local": "1.0.0", + "jest-cli": "23.6.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "dev": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" + } + }, + "jest-cli": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-23.6.0.tgz", + "integrity": "sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==", + "dev": true, + "requires": { + "ansi-escapes": "3.1.0", + "chalk": "2.4.1", + "exit": "0.1.2", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "import-local": "1.0.0", + "is-ci": "1.2.1", + "istanbul-api": "1.3.7", + "istanbul-lib-coverage": "1.2.1", + "istanbul-lib-instrument": "1.10.2", + "istanbul-lib-source-maps": "1.2.6", + "jest-changed-files": "23.4.2", + "jest-config": "23.6.0", + "jest-environment-jsdom": "23.4.0", + "jest-get-type": "22.4.3", + "jest-haste-map": "23.6.0", + "jest-message-util": "23.4.0", + "jest-regex-util": "23.3.0", + "jest-resolve-dependencies": "23.6.0", + "jest-runner": "23.6.0", + "jest-runtime": "23.6.0", + "jest-snapshot": "23.6.0", + "jest-util": "23.4.0", + "jest-validate": "23.6.0", + "jest-watcher": "23.4.0", + "jest-worker": "23.2.0", + "micromatch": "2.3.11", + "node-notifier": "5.3.0", + "prompts": "0.1.14", + "realpath-native": "1.0.2", + "rimraf": "2.6.2", + "slash": "1.0.0", + "string-length": "2.0.0", + "strip-ansi": "4.0.0", + "which": "1.3.1", + "yargs": "11.1.0" + } + }, + "jest-haste-map": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.6.0.tgz", + "integrity": "sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==", + "dev": true, + "requires": { + "fb-watchman": "2.0.0", + "graceful-fs": "4.1.15", + "invariant": "2.2.4", + "jest-docblock": "23.2.0", + "jest-serializer": "23.0.1", + "jest-worker": "23.2.0", + "micromatch": "2.3.11", + "sane": "2.5.2" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + }, + "yargs": { + "version": "11.1.0", + "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", + "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", + "dev": true, + "requires": { + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.3", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" + } + }, + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + } + } +<<<<<<< master + } + }, "makeerror": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", @@ -11609,6 +16019,9 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { "object-visit": "^1.0.0" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "math-random": { @@ -11622,9 +16035,19 @@ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { +<<<<<<< master "hash-base": "^3.0.0", "inherits": "^2.0.1", "safe-buffer": "^5.1.2" +======= +<<<<<<< refs/remotes/origin/master + "hash-base": "3.0.4", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" +======= + "throat": "4.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "media-typer": { @@ -11638,7 +16061,75 @@ "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "requires": { +<<<<<<< master "mimic-fn": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "mimic-fn": "1.2.0" +======= + "babel-core": "6.26.3", + "babel-jest": "23.6.0", + "chalk": "2.4.1", + "glob": "7.1.3", + "jest-environment-jsdom": "23.4.0", + "jest-environment-node": "23.4.0", + "jest-get-type": "22.4.3", + "jest-jasmine2": "23.6.0", + "jest-regex-util": "23.3.0", + "jest-resolve": "23.6.0", + "jest-util": "23.4.0", + "jest-validate": "23.6.0", + "micromatch": "2.3.11", + "pretty-format": "23.6.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "pretty-format": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz", + "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==", + "dev": true, + "requires": { + "ansi-regex": "3.0.0", + "ansi-styles": "3.2.1" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "memory-fs": { @@ -11647,8 +16138,14 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { +<<<<<<< master "errno": "^0.1.3", "readable-stream": "^2.0.1" +======= +<<<<<<< refs/remotes/origin/master + "errno": "0.1.7", + "readable-stream": "2.3.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "merge": { @@ -11743,7 +16240,32 @@ "resolved": "https://registry.npmjs.org/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.48.5.tgz", "integrity": "sha512-S0cA0msHBGw7PSwB6nAsvtHEpQXVwzKBaE4AibLpaBiIVdWkYpIOok653zs9x+E9QvQgcghAnlVnDV+MDM+rSw==", "requires": { +<<<<<<< master "@babel/helper-module-imports": "^7.0.0" +======= + "@babel/helper-module-imports": "7.0.0" +======= + "chalk": "2.4.1", + "diff": "3.5.0", + "jest-get-type": "22.4.3", + "pretty-format": "23.6.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "metro-react-native-babel-preset": { @@ -11751,6 +16273,7 @@ "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.48.5.tgz", "integrity": "sha512-ldG1bsusB5zlS1fhAiSLRjUA7I/Chn/dniaXTlkUpgiqyEAaDDmqhkDJ8gyZw3rhlLMVswlBd3o6I8yYti+57w==", "requires": { +<<<<<<< master "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-export-default-from": "^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0", @@ -11784,6 +16307,42 @@ "@babel/plugin-transform-typescript": "^7.0.0", "@babel/plugin-transform-unicode-regex": "^7.0.0", "@babel/template": "^7.0.0", +======= +<<<<<<< refs/remotes/origin/master + "@babel/plugin-proposal-class-properties": "7.2.3", + "@babel/plugin-proposal-export-default-from": "7.2.0", + "@babel/plugin-proposal-nullish-coalescing-operator": "7.2.0", + "@babel/plugin-proposal-object-rest-spread": "7.2.0", + "@babel/plugin-proposal-optional-catch-binding": "7.2.0", + "@babel/plugin-proposal-optional-chaining": "7.2.0", + "@babel/plugin-syntax-dynamic-import": "7.2.0", + "@babel/plugin-syntax-export-default-from": "7.2.0", + "@babel/plugin-transform-arrow-functions": "7.2.0", + "@babel/plugin-transform-block-scoping": "7.2.0", + "@babel/plugin-transform-classes": "7.2.2", + "@babel/plugin-transform-computed-properties": "7.2.0", + "@babel/plugin-transform-destructuring": "7.2.0", + "@babel/plugin-transform-exponentiation-operator": "7.2.0", + "@babel/plugin-transform-flow-strip-types": "7.2.3", + "@babel/plugin-transform-for-of": "7.2.0", + "@babel/plugin-transform-function-name": "7.2.0", + "@babel/plugin-transform-literals": "7.2.0", + "@babel/plugin-transform-modules-commonjs": "7.2.0", + "@babel/plugin-transform-object-assign": "7.2.0", + "@babel/plugin-transform-parameters": "7.2.0", + "@babel/plugin-transform-react-display-name": "7.2.0", + "@babel/plugin-transform-react-jsx": "7.2.0", + "@babel/plugin-transform-react-jsx-source": "7.2.0", + "@babel/plugin-transform-regenerator": "7.0.0", + "@babel/plugin-transform-runtime": "7.2.0", + "@babel/plugin-transform-shorthand-properties": "7.2.0", + "@babel/plugin-transform-spread": "7.2.2", + "@babel/plugin-transform-sticky-regex": "7.2.0", + "@babel/plugin-transform-template-literals": "7.2.0", + "@babel/plugin-transform-typescript": "7.2.0", + "@babel/plugin-transform-unicode-regex": "7.2.0", + "@babel/template": "7.2.2", +>>>>>>> UPS8: Added ProfileView Form with header, footer "metro-babel7-plugin-react-transform": "0.48.5", "react-transform-hmr": "^1.0.4" } @@ -11792,13 +16351,37 @@ "version": "1.23.0", "resolved": "http://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", "integrity": "sha1-oxtAcK2uon1zLqMzdApk0OyaZlk=" +======= + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "pretty-format": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz", + "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==", + "dev": true, + "requires": { + "ansi-regex": "3.0.0", + "ansi-styles": "3.2.1" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "mime-types": { "version": "2.1.11", "resolved": "http://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", "integrity": "sha1-wlnEcb2oCKhdbNGTtDCl+uRHOzw=", "requires": { +<<<<<<< master "mime-db": "~1.23.0" +======= +<<<<<<< refs/remotes/origin/master + "mime-db": "1.23.0" +======= + "has-flag": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -11808,6 +16391,7 @@ "resolved": "https://registry.npmjs.org/metro-babel-register/-/metro-babel-register-0.48.5.tgz", "integrity": "sha512-bJCessd7THqEfXrKEoj284XVjg9AGYbGqZiyV622l6ex9TvtVi1lToDY0TuAAuDXOm+V4vQXV7/HvR6JPP0dTQ==", "requires": { +<<<<<<< master "@babel/core": "^7.0.0", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0", @@ -11820,6 +16404,21 @@ "@babel/register": "^7.0.0", "core-js": "^2.2.2", "escape-string-regexp": "^1.0.5" +======= +<<<<<<< refs/remotes/origin/master + "@babel/core": "7.2.2", + "@babel/plugin-proposal-class-properties": "7.2.3", + "@babel/plugin-proposal-nullish-coalescing-operator": "7.2.0", + "@babel/plugin-proposal-object-rest-spread": "7.2.0", + "@babel/plugin-proposal-optional-catch-binding": "7.2.0", + "@babel/plugin-proposal-optional-chaining": "7.2.0", + "@babel/plugin-transform-async-to-generator": "7.2.0", + "@babel/plugin-transform-flow-strip-types": "7.2.3", + "@babel/plugin-transform-modules-commonjs": "7.2.0", + "@babel/register": "7.0.0", + "core-js": "2.6.1", + "escape-string-regexp": "1.0.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "core-js": { @@ -11827,6 +16426,9 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz", "integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==" } +======= + "detect-newline": "2.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "metro-babel7-plugin-react-transform": { @@ -11835,7 +16437,12 @@ "integrity": "sha512-wzn4X9KgmAMZ7Bi6v9KxA7dw+AHGL0RODPxU5NDJ3A6d0yERvzfZ3qkzWhz8jbFkVBK12cu5DTho3HBazKQDOw==", "dev": true, "requires": { +<<<<<<< master "@babel/helper-module-imports": "^7.0.0" +======= +<<<<<<< refs/remotes/origin/master + "@babel/helper-module-imports": "7.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "metro-cache": { @@ -11858,7 +16465,14 @@ "metro": "0.48.5", "metro-cache": "0.48.5", "metro-core": "0.48.5", +<<<<<<< master "pretty-format": "^23.4.1" +======= +======= + "chalk": "2.4.1", +>>>>>>> UPS8: Added ProfileView Form with header, footer + "pretty-format": "23.6.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-regex": { @@ -11870,18 +16484,51 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", +<<<<<<< refs/remotes/origin/master + "requires": { + "color-convert": "1.9.3" +======= + "dev": true, "requires": { "color-convert": "^1.9.0" } }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer + } + }, "pretty-format": { "version": "23.6.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz", "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==", +<<<<<<< refs/remotes/origin/master + "requires": { + "ansi-regex": "3.0.0", + "ansi-styles": "3.2.1" +======= + "dev": true, "requires": { "ansi-regex": "^3.0.0", "ansi-styles": "^3.2.0" } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer + } } } }, @@ -11890,10 +16537,20 @@ "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.48.5.tgz", "integrity": "sha512-Yp0BOAHhxf/qdNkwJhemVdD2Y59iyaTjwxUimCmeD8u5VEL6mLgEC1S0KczyWEiAgX3Fs48rezCAcx3mo67wXg==", "requires": { +<<<<<<< refs/remotes/origin/master "jest-haste-map": "23.5.0", "lodash.throttle": "^4.1.1", "metro-resolver": "0.48.5", +<<<<<<< master "wordwrap": "^1.0.0" +======= + "wordwrap": "1.0.0" +======= + "jest-mock": "23.2.0", + "jest-util": "23.4.0", + "jsdom": "11.12.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "metro-memory-fs": { @@ -11915,6 +16572,7 @@ "integrity": "sha512-e9tsYDFhU70gar0jQWcZXRPJVCv4k7tEs6Pm74wXO2OO/T1MEumbvniDIGwGG8bG8RUnYdHhjcaiub2Vc5BRWw==", "dev": true, "requires": { +<<<<<<< master "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-export-default-from": "^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0", @@ -11950,6 +16608,48 @@ "@babel/template": "^7.0.0", "metro-babel7-plugin-react-transform": "0.51.1", "react-transform-hmr": "^1.0.4" +======= +<<<<<<< refs/remotes/origin/master + "@babel/plugin-proposal-class-properties": "7.2.3", + "@babel/plugin-proposal-export-default-from": "7.2.0", + "@babel/plugin-proposal-nullish-coalescing-operator": "7.2.0", + "@babel/plugin-proposal-object-rest-spread": "7.2.0", + "@babel/plugin-proposal-optional-catch-binding": "7.2.0", + "@babel/plugin-proposal-optional-chaining": "7.2.0", + "@babel/plugin-syntax-dynamic-import": "7.2.0", + "@babel/plugin-syntax-export-default-from": "7.2.0", + "@babel/plugin-transform-arrow-functions": "7.2.0", + "@babel/plugin-transform-block-scoping": "7.2.0", + "@babel/plugin-transform-classes": "7.2.2", + "@babel/plugin-transform-computed-properties": "7.2.0", + "@babel/plugin-transform-destructuring": "7.2.0", + "@babel/plugin-transform-exponentiation-operator": "7.2.0", + "@babel/plugin-transform-flow-strip-types": "7.2.3", + "@babel/plugin-transform-for-of": "7.2.0", + "@babel/plugin-transform-function-name": "7.2.0", + "@babel/plugin-transform-literals": "7.2.0", + "@babel/plugin-transform-modules-commonjs": "7.2.0", + "@babel/plugin-transform-object-assign": "7.2.0", + "@babel/plugin-transform-parameters": "7.2.0", + "@babel/plugin-transform-react-display-name": "7.2.0", + "@babel/plugin-transform-react-jsx": "7.2.0", + "@babel/plugin-transform-react-jsx-source": "7.2.0", + "@babel/plugin-transform-regenerator": "7.0.0", + "@babel/plugin-transform-runtime": "7.2.0", + "@babel/plugin-transform-shorthand-properties": "7.2.0", + "@babel/plugin-transform-spread": "7.2.2", + "@babel/plugin-transform-sticky-regex": "7.2.0", + "@babel/plugin-transform-template-literals": "7.2.0", + "@babel/plugin-transform-typescript": "7.2.0", + "@babel/plugin-transform-unicode-regex": "7.2.0", + "@babel/template": "7.2.2", + "metro-babel7-plugin-react-transform": "0.51.1", + "react-transform-hmr": "1.0.4" +======= + "jest-mock": "23.2.0", + "jest-util": "23.4.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "metro-resolver": { @@ -11965,7 +16665,22 @@ "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.48.5.tgz", "integrity": "sha512-+BbcU9vfEl/XhMlVV0RwuHuEkai4lq7RmlQkxgoOoWl1u0yXCAPRZ5sqa326fPlJzElOR3cp0y7+Oc2nbIguyg==", "requires": { +<<<<<<< master "source-map": "^0.5.6" +======= +<<<<<<< refs/remotes/origin/master + "source-map": "0.5.7" +======= + "fb-watchman": "2.0.0", + "graceful-fs": "4.1.15", + "invariant": "2.2.4", + "jest-docblock": "23.2.0", + "jest-serializer": "23.0.1", + "jest-worker": "23.2.0", + "micromatch": "2.3.11", + "sane": "2.5.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "micromatch": { @@ -11973,6 +16688,7 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "requires": { +<<<<<<< master "arr-diff": "^2.0.0", "array-unique": "^0.2.1", "braces": "^1.8.2", @@ -11986,6 +16702,22 @@ "object.omit": "^2.0.0", "parse-glob": "^3.0.4", "regex-cache": "^0.4.2" +======= +<<<<<<< refs/remotes/origin/master + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "arr-diff": { @@ -11993,7 +16725,61 @@ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "requires": { +<<<<<<< master "arr-flatten": "^1.0.1" +======= + "arr-flatten": "1.1.0" +======= + "babel-traverse": "6.26.0", + "chalk": "2.4.1", + "co": "4.6.0", + "expect": "23.6.0", + "is-generator-fn": "1.0.0", + "jest-diff": "23.6.0", + "jest-each": "23.6.0", + "jest-matcher-utils": "23.6.0", + "jest-message-util": "23.4.0", + "jest-snapshot": "23.6.0", + "jest-util": "23.4.0", + "pretty-format": "23.6.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "pretty-format": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz", + "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==", + "dev": true, + "requires": { + "ansi-regex": "3.0.0", + "ansi-styles": "3.2.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "kind-of": { @@ -12001,7 +16787,15 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { +<<<<<<< master "is-buffer": "^1.1.5" +======= +<<<<<<< refs/remotes/origin/master + "is-buffer": "1.1.6" +======= + "has-flag": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -12102,6 +16896,7 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { +<<<<<<< master "concat-stream": "^1.5.0", "duplexify": "^3.4.2", "end-of-stream": "^1.1.0", @@ -12112,6 +16907,19 @@ "pumpify": "^1.3.3", "stream-each": "^1.1.0", "through2": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "concat-stream": "1.6.2", + "duplexify": "3.6.1", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.3", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "3.0.0", + "pumpify": "1.5.1", + "stream-each": "1.2.3", + "through2": "2.0.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "mixin-deep": { @@ -12128,7 +16936,39 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { +<<<<<<< master "is-plain-object": "^2.0.4" +======= + "is-plain-object": "2.0.4" +======= + "pretty-format": "23.6.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "pretty-format": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz", + "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==", + "dev": true, + "requires": { + "ansi-regex": "3.0.0", + "ansi-styles": "3.2.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -12166,12 +17006,22 @@ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { +<<<<<<< master "aproba": "^1.1.1", "copy-concurrently": "^1.0.0", "fs-write-stream-atomic": "^1.0.8", "mkdirp": "^0.5.1", "rimraf": "^2.5.4", "run-queue": "^1.0.3" +======= +<<<<<<< refs/remotes/origin/master + "aproba": "1.2.0", + "copy-concurrently": "1.0.5", + "fs-write-stream-atomic": "1.0.10", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "run-queue": "1.0.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "ms": { @@ -12194,6 +17044,7 @@ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "requires": { +<<<<<<< master "arr-diff": "^4.0.0", "array-unique": "^0.3.2", "define-property": "^2.0.2", @@ -12205,6 +17056,24 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.1" +======= + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" +======= + "chalk": "2.4.1", + "jest-get-type": "22.4.3", + "pretty-format": "23.6.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "arr-diff": { @@ -12212,18 +17081,40 @@ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, +<<<<<<< refs/remotes/origin/master "array-unique": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" +======= + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "extend-shallow": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { +<<<<<<< master "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" +======= + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-extendable": { @@ -12231,13 +17122,32 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { +<<<<<<< master "is-plain-object": "^2.0.4" +======= +<<<<<<< refs/remotes/origin/master + "is-plain-object": "2.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" +======= + "ansi-regex": "3.0.0", + "ansi-styles": "3.2.1" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, @@ -12252,15 +17162,59 @@ "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz", "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", "requires": { +<<<<<<< master "debug": "^2.1.2", "iconv-lite": "^0.4.4", "sax": "^1.2.4" +======= +<<<<<<< refs/remotes/origin/master + "debug": "2.6.9", + "iconv-lite": "0.4.24", + "sax": "1.2.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" +======= + "@babel/code-frame": "7.0.0", + "chalk": "2.4.1", + "micromatch": "2.3.11", + "slash": "1.0.0", + "stack-utils": "1.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, @@ -12293,7 +17247,48 @@ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", "dev": true, "requires": { +<<<<<<< master "lower-case": "^1.1.1" +======= +<<<<<<< refs/remotes/origin/master + "lower-case": "1.1.4" +======= + "browser-resolve": "1.11.3", + "chalk": "2.4.1", + "realpath-native": "1.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "node-emoji": { @@ -12301,7 +17296,16 @@ "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz", "integrity": "sha512-+ktMAh1Jwas+TnGodfCfjUbJKoANqPaJFN0z0iqh41eqD8dvguNzcitVSBSVK1pidz0AqGbLKcoVuVLRVZ/aVg==", "requires": { +<<<<<<< master "lodash.toarray": "^4.4.0" +======= +<<<<<<< refs/remotes/origin/master + "lodash.toarray": "4.4.0" +======= + "jest-regex-util": "23.3.0", + "jest-snapshot": "23.6.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "node-fetch": { @@ -12315,6 +17319,7 @@ "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=" }, "node-libs-browser": { +<<<<<<< master "version": "2.2.0", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz", "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==", @@ -12330,6 +17335,24 @@ "events": "^3.0.0", "https-browserify": "^1.0.0", "os-browserify": "^0.3.0", +======= + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", + "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", + "dev": true, + "requires": { +<<<<<<< refs/remotes/origin/master + "assert": "1.4.1", + "browserify-zlib": "0.2.0", + "buffer": "4.9.1", + "console-browserify": "1.1.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.12.0", + "domain-browser": "1.2.0", + "events": "1.1.1", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", +>>>>>>> UPS8: Added ProfileView Form with header, footer "path-browserify": "0.0.0", "process": "^0.11.10", "punycode": "^1.2.4", @@ -12343,6 +17366,21 @@ "url": "^0.11.0", "util": "^0.11.0", "vm-browserify": "0.0.4" +======= + "exit": "0.1.2", + "graceful-fs": "4.1.15", + "jest-config": "23.6.0", + "jest-docblock": "23.2.0", + "jest-haste-map": "23.6.0", + "jest-jasmine2": "23.6.0", + "jest-leak-detector": "23.6.0", + "jest-message-util": "23.4.0", + "jest-runtime": "23.6.0", + "jest-util": "23.4.0", + "jest-worker": "23.2.0", + "source-map-support": "0.5.9", + "throat": "4.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "buffer": { @@ -12351,9 +17389,26 @@ "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { +<<<<<<< master "base64-js": "^1.0.2", "ieee754": "^1.1.4", "isarray": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "base64-js": "1.3.0", + "ieee754": "1.1.12", + "isarray": "1.0.0" +======= + "fb-watchman": "2.0.0", + "graceful-fs": "4.1.15", + "invariant": "2.2.4", + "jest-docblock": "23.2.0", + "jest-serializer": "23.0.1", + "jest-worker": "23.2.0", + "micromatch": "2.3.11", + "sane": "2.5.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "process": { @@ -12385,10 +17440,18 @@ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.3.0.tgz", "integrity": "sha512-AhENzCSGZnZJgBARsUjnQ7DnZbzyP+HxlVXuD0xqAnvL8q+OqtSX7lGg9e8nHzwXkMMXNdVeqq4E2M3EUAqX6Q==", "requires": { +<<<<<<< master "growly": "^1.3.0", "semver": "^5.5.0", "shellwords": "^0.1.1", "which": "^1.3.0" +======= +<<<<<<< refs/remotes/origin/master + "growly": "1.3.0", + "semver": "5.6.0", + "shellwords": "0.1.1", + "which": "1.3.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "node-pre-gyp": { @@ -12413,6 +17476,7 @@ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "requires": { +<<<<<<< master "aproba": "^1.0.3", "console-control-strings": "^1.0.0", "has-unicode": "^2.0.0", @@ -12421,6 +17485,110 @@ "string-width": "^1.0.1", "strip-ansi": "^3.0.1", "wide-align": "^1.1.0" +======= + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" +======= + "babel-core": "6.26.3", + "babel-plugin-istanbul": "4.1.6", + "chalk": "2.4.1", + "convert-source-map": "1.6.0", + "exit": "0.1.2", + "fast-json-stable-stringify": "2.0.0", + "graceful-fs": "4.1.15", + "jest-config": "23.6.0", + "jest-haste-map": "23.6.0", + "jest-message-util": "23.4.0", + "jest-regex-util": "23.3.0", + "jest-resolve": "23.6.0", + "jest-snapshot": "23.6.0", + "jest-util": "23.4.0", + "jest-validate": "23.6.0", + "micromatch": "2.3.11", + "realpath-native": "1.0.2", + "slash": "1.0.0", + "strip-bom": "3.0.0", + "write-file-atomic": "2.3.0", + "yargs": "11.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "dev": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" + } + }, + "jest-haste-map": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.6.0.tgz", + "integrity": "sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==", + "dev": true, + "requires": { + "fb-watchman": "2.0.0", + "graceful-fs": "4.1.15", + "invariant": "2.2.4", + "jest-docblock": "23.2.0", + "jest-serializer": "23.0.1", + "jest-worker": "23.2.0", + "micromatch": "2.3.11", + "sane": "2.5.2" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-fullwidth-code-point": { @@ -12428,7 +17596,17 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { +<<<<<<< master "number-is-nan": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "number-is-nan": "1.0.1" +======= + "graceful-fs": "4.1.15", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "npmlog": { @@ -12436,10 +17614,32 @@ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "requires": { +<<<<<<< master "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", "gauge": "~2.7.3", "set-blocking": "~2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" +======= + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.3", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "string-width": { @@ -12447,9 +17647,19 @@ "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { +<<<<<<< master "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" +======= + "camelcase": "4.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -12541,7 +17751,71 @@ "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", "dev": true, "requires": { +<<<<<<< master "boolbase": "~1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "boolbase": "1.0.0" +======= + "babel-types": "6.26.0", + "chalk": "2.4.1", + "jest-diff": "23.6.0", + "jest-matcher-utils": "23.6.0", + "jest-message-util": "23.4.0", + "jest-resolve": "23.6.0", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "pretty-format": "23.6.0", + "semver": "5.6.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "pretty-format": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz", + "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==", + "dev": true, + "requires": { + "ansi-regex": "3.0.0", + "ansi-styles": "3.2.1" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "nullthrows": { @@ -12581,9 +17855,16 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { +<<<<<<< master "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", "kind-of": "^3.0.3" +======= +<<<<<<< refs/remotes/origin/master + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "define-property": { @@ -12591,7 +17872,41 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { +<<<<<<< master "is-descriptor": "^0.1.0" +======= + "is-descriptor": "0.1.6" +======= + "callsites": "2.0.0", + "chalk": "2.4.1", + "graceful-fs": "4.1.15", + "is-ci": "1.2.1", + "jest-message-util": "23.4.0", + "mkdirp": "0.5.1", + "slash": "1.0.0", + "source-map": "0.6.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "kind-of": { @@ -12599,7 +17914,15 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { +<<<<<<< master "is-buffer": "^1.1.5" +======= +<<<<<<< refs/remotes/origin/master + "is-buffer": "1.1.6" +======= + "has-flag": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -12615,13 +17938,70 @@ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { +<<<<<<< master "isobject": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "isobject": "3.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" +======= + "chalk": "2.4.1", + "jest-get-type": "22.4.3", + "leven": "2.1.0", + "pretty-format": "23.6.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "pretty-format": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz", + "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==", + "dev": true, + "requires": { + "ansi-regex": "3.0.0", + "ansi-styles": "3.2.1" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, @@ -12667,8 +18047,14 @@ "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", "dev": true, "requires": { +<<<<<<< master "define-properties": "^1.1.2", "es-abstract": "^1.5.1" +======= +<<<<<<< refs/remotes/origin/master + "define-properties": "1.1.3", + "es-abstract": "1.12.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "object.omit": { @@ -12692,6 +18078,41 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" +======= + "ansi-escapes": "3.1.0", + "chalk": "2.4.1", + "string-length": "2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, @@ -12701,10 +18122,21 @@ "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==", "dev": true, "requires": { +<<<<<<< master "define-properties": "^1.1.3", "es-abstract": "^1.12.0", "function-bind": "^1.1.1", "has": "^1.0.3" +======= +<<<<<<< refs/remotes/origin/master + "define-properties": "1.1.3", + "es-abstract": "1.12.0", + "function-bind": "1.1.1", + "has": "1.0.3" +======= + "merge-stream": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "on-finished": { @@ -12725,7 +18157,16 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { +<<<<<<< master "wrappy": "1" +======= +<<<<<<< refs/remotes/origin/master + "wrappy": "1.0.2" +======= + "argparse": "1.0.10", + "esprima": "4.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "onetime": { @@ -12741,12 +18182,41 @@ "resolved": "https://registry.npmjs.org/opencollective/-/opencollective-1.0.3.tgz", "integrity": "sha1-ruY3K8KBRFg2kMPKja7PwSDdDvE=", "requires": { +<<<<<<< refs/remotes/origin/master "babel-polyfill": "6.23.0", "chalk": "1.1.3", "inquirer": "3.0.6", "minimist": "1.2.0", "node-fetch": "1.6.3", "opn": "4.0.2" +======= + "abab": "2.0.0", + "acorn": "5.7.3", + "acorn-globals": "4.3.0", + "array-equal": "1.0.0", + "cssom": "0.3.4", + "cssstyle": "1.1.1", + "data-urls": "1.1.0", + "domexception": "1.0.1", + "escodegen": "1.11.0", + "html-encoding-sniffer": "1.0.2", + "left-pad": "1.3.0", + "nwsapi": "2.0.9", + "parse5": "4.0.0", + "pn": "1.1.0", + "request": "2.88.0", + "request-promise-native": "1.0.5", + "sax": "1.2.4", + "symbol-tree": "3.2.2", + "tough-cookie": "2.5.0", + "w3c-hr-time": "1.0.1", + "webidl-conversions": "4.0.2", + "whatwg-encoding": "1.0.5", + "whatwg-mimetype": "2.3.0", + "whatwg-url": "6.5.0", + "ws": "5.2.2", + "xml-name-validator": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-escapes": { @@ -12788,8 +18258,17 @@ "resolved": "http://registry.npmjs.org/opn/-/opn-4.0.2.tgz", "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=", "requires": { +<<<<<<< master "object-assign": "^4.0.1", "pinkie-promise": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "object-assign": "4.1.1", + "pinkie-promise": "2.0.1" +======= + "async-limiter": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -12848,7 +18327,15 @@ "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", "dev": true, "requires": { +<<<<<<< master "url-parse": "^1.4.3" +======= +<<<<<<< refs/remotes/origin/master + "url-parse": "1.4.4" +======= + "jsonify": "0.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "os-browserify": { @@ -12867,9 +18354,19 @@ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "requires": { +<<<<<<< master "execa": "^0.7.0", "lcid": "^1.0.0", "mem": "^1.1.0" +======= +<<<<<<< refs/remotes/origin/master + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" +======= + "minimist": "1.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "os-tmpdir": { @@ -12882,8 +18379,17 @@ "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "requires": { +<<<<<<< master "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" +======= + "graceful-fs": "4.1.15" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "p-defer": { @@ -12936,9 +18442,19 @@ "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", "dev": true, "requires": { +<<<<<<< master "cyclist": "~0.2.2", "inherits": "^2.0.3", "readable-stream": "^2.1.5" +======= +<<<<<<< refs/remotes/origin/master + "cyclist": "0.2.2", + "inherits": "2.0.3", + "readable-stream": "2.3.6" +======= + "graceful-fs": "4.1.15" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "param-case": { @@ -12947,7 +18463,15 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { +<<<<<<< master "no-case": "^2.2.0" +======= +<<<<<<< refs/remotes/origin/master + "no-case": "2.3.2" +======= + "invert-kv": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "parse-asn1": { @@ -12956,12 +18480,25 @@ "integrity": "sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg==", "dev": true, "requires": { +<<<<<<< master "asn1.js": "^4.0.0", "browserify-aes": "^1.0.0", "create-hash": "^1.1.0", "evp_bytestokey": "^1.0.0", "pbkdf2": "^3.0.3", "safe-buffer": "^5.1.1" +======= +<<<<<<< refs/remotes/origin/master + "asn1.js": "4.10.1", + "browserify-aes": "1.2.0", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "pbkdf2": "3.0.17" +======= + "prelude-ls": "1.1.2", + "type-check": "0.3.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "parse-glob": { @@ -12969,10 +18506,34 @@ "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "requires": { +<<<<<<< master "glob-base": "^0.3.0", "is-dotfile": "^1.0.0", "is-extglob": "^1.0.0", "is-glob": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" +======= + "graceful-fs": "4.1.15", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + }, + "dependencies": { + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "1.3.2" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "parse-json": { @@ -12980,8 +18541,18 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "requires": { +<<<<<<< master "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "error-ex": "1.3.2", + "json-parse-better-errors": "1.0.2" +======= + "p-locate": "2.0.0", + "path-exists": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "parse-node-version": { @@ -13110,7 +18681,15 @@ "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "requires": { +<<<<<<< master "pinkie": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "pinkie": "2.0.4" +======= + "js-tokens": "4.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "pirates": { @@ -13118,7 +18697,16 @@ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.0.tgz", "integrity": "sha512-8t5BsXy1LUIjn3WWOlOuFDuKswhQb/tkak641lvBgmPOBUQHXveORtlMCp6OdPV1dtuTaEahKA8VNz6uLfKBtA==", "requires": { +<<<<<<< master "node-modules-regexp": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "node-modules-regexp": "1.0.0" +======= + "pseudomap": "1.0.2", + "yallist": "2.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "pkg-dir": { @@ -13135,7 +18723,15 @@ "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=", "dev": true, "requires": { +<<<<<<< master "find-up": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "find-up": "1.1.2" +======= + "pify": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "find-up": { @@ -13164,9 +18760,19 @@ "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", "requires": { +<<<<<<< master "base64-js": "^1.2.3", "xmlbuilder": "^9.0.7", "xmldom": "0.1.x" +======= +<<<<<<< refs/remotes/origin/master + "base64-js": "1.3.0", + "xmlbuilder": "9.0.7", + "xmldom": "0.1.27" +======= + "tmpl": "1.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "plugin-error": { @@ -13174,11 +18780,23 @@ "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", "requires": { +<<<<<<< master "ansi-cyan": "^0.1.1", "ansi-red": "^0.1.1", "arr-diff": "^1.0.1", "arr-union": "^2.0.1", "extend-shallow": "^1.1.2" +======= +<<<<<<< refs/remotes/origin/master + "ansi-cyan": "0.1.1", + "ansi-red": "0.1.1", + "arr-diff": "1.1.0", + "arr-union": "2.1.0", + "extend-shallow": "1.1.4" +======= + "object-visit": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "pluralize": { @@ -13204,9 +18822,16 @@ "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==", "dev": true, "requires": { +<<<<<<< master "chalk": "^2.4.2", "source-map": "^0.6.1", "supports-color": "^6.1.0" +======= +<<<<<<< refs/remotes/origin/master + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "6.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-styles": { @@ -13255,6 +18880,9 @@ "has-flag": "^3.0.0" } } +======= + "mimic-fn": "1.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "postcss-flexbugs-fixes": { @@ -13296,10 +18924,21 @@ "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", "dev": true, "requires": { +<<<<<<< master "loader-utils": "^1.1.0", "postcss": "^7.0.0", "postcss-load-config": "^2.0.0", "schema-utils": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "loader-utils": "1.2.3", + "postcss": "7.0.10", + "postcss-load-config": "2.0.0", + "schema-utils": "1.0.0" +======= + "readable-stream": "2.3.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "postcss-modules-extract-imports": { @@ -13308,7 +18947,63 @@ "integrity": "sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==", "dev": true, "requires": { +<<<<<<< master "postcss": "^6.0.1" +======= +<<<<<<< refs/remotes/origin/master + "postcss": "6.0.23" +======= + "@babel/core": "7.2.2", + "@babel/generator": "7.2.2", + "@babel/parser": "7.2.3", + "@babel/plugin-external-helpers": "7.2.0", + "@babel/template": "7.2.2", + "@babel/traverse": "7.2.3", + "@babel/types": "7.2.2", + "absolute-path": "0.0.0", + "async": "2.6.1", + "babel-preset-fbjs": "3.1.0", + "chalk": "1.1.3", + "concat-stream": "1.6.2", + "connect": "3.6.6", + "debug": "2.6.9", + "denodeify": "1.2.1", + "eventemitter3": "3.1.0", + "fbjs": "1.0.0", + "fs-extra": "1.0.0", + "graceful-fs": "4.1.15", + "image-size": "0.6.3", + "jest-docblock": "23.2.0", + "jest-haste-map": "23.5.0", + "jest-worker": "23.2.0", + "json-stable-stringify": "1.0.1", + "lodash.throttle": "4.1.1", + "merge-stream": "1.0.1", + "metro-cache": "0.48.5", + "metro-config": "0.48.5", + "metro-core": "0.48.5", + "metro-minify-uglify": "0.48.5", + "metro-react-native-babel-preset": "0.48.5", + "metro-resolver": "0.48.5", + "metro-source-map": "0.48.5", + "mime-types": "2.1.11", + "mkdirp": "0.5.1", + "node-fetch": "2.3.0", + "nullthrows": "1.1.1", + "react-transform-hmr": "1.0.4", + "resolve": "1.9.0", + "rimraf": "2.6.2", + "serialize-error": "2.1.0", + "source-map": "0.5.7", + "temp": "0.8.3", + "throat": "4.1.0", + "wordwrap": "1.0.0", + "write-file-atomic": "1.3.4", + "ws": "1.1.5", + "xpipe": "1.0.5", + "yargs": "9.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-styles": { @@ -13317,7 +19012,15 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { +<<<<<<< master "color-convert": "^1.9.0" +======= +<<<<<<< refs/remotes/origin/master + "color-convert": "1.9.3" +======= + "@babel/helper-module-imports": "7.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "chalk": { @@ -13326,9 +19029,53 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { +<<<<<<< master "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" +======= +<<<<<<< refs/remotes/origin/master + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" +======= + "@babel/plugin-proposal-class-properties": "7.2.3", + "@babel/plugin-proposal-export-default-from": "7.2.0", + "@babel/plugin-proposal-nullish-coalescing-operator": "7.2.0", + "@babel/plugin-proposal-object-rest-spread": "7.2.0", + "@babel/plugin-proposal-optional-catch-binding": "7.2.0", + "@babel/plugin-proposal-optional-chaining": "7.2.0", + "@babel/plugin-syntax-dynamic-import": "7.2.0", + "@babel/plugin-syntax-export-default-from": "7.2.0", + "@babel/plugin-transform-arrow-functions": "7.2.0", + "@babel/plugin-transform-block-scoping": "7.2.0", + "@babel/plugin-transform-classes": "7.2.2", + "@babel/plugin-transform-computed-properties": "7.2.0", + "@babel/plugin-transform-destructuring": "7.2.0", + "@babel/plugin-transform-exponentiation-operator": "7.2.0", + "@babel/plugin-transform-flow-strip-types": "7.2.3", + "@babel/plugin-transform-for-of": "7.2.0", + "@babel/plugin-transform-function-name": "7.2.0", + "@babel/plugin-transform-literals": "7.2.0", + "@babel/plugin-transform-modules-commonjs": "7.2.0", + "@babel/plugin-transform-object-assign": "7.2.0", + "@babel/plugin-transform-parameters": "7.2.0", + "@babel/plugin-transform-react-display-name": "7.2.0", + "@babel/plugin-transform-react-jsx": "7.2.0", + "@babel/plugin-transform-react-jsx-source": "7.2.0", + "@babel/plugin-transform-regenerator": "7.0.0", + "@babel/plugin-transform-runtime": "7.2.0", + "@babel/plugin-transform-shorthand-properties": "7.2.0", + "@babel/plugin-transform-spread": "7.2.2", + "@babel/plugin-transform-sticky-regex": "7.2.0", + "@babel/plugin-transform-template-literals": "7.2.0", + "@babel/plugin-transform-typescript": "7.2.0", + "@babel/plugin-transform-unicode-regex": "7.2.0", + "@babel/template": "7.2.2", + "metro-babel7-plugin-react-transform": "0.48.5", + "react-transform-hmr": "1.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "postcss": { @@ -13354,7 +19101,15 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { +<<<<<<< master "has-flag": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "has-flag": "3.0.0" +======= + "mime-db": "1.23.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -13365,8 +19120,28 @@ "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", "dev": true, "requires": { +<<<<<<< master "css-selector-tokenizer": "^0.7.0", "postcss": "^6.0.1" +======= +<<<<<<< refs/remotes/origin/master + "css-selector-tokenizer": "0.7.1", + "postcss": "6.0.23" +======= + "@babel/core": "7.2.2", + "@babel/plugin-proposal-class-properties": "7.2.3", + "@babel/plugin-proposal-nullish-coalescing-operator": "7.2.0", + "@babel/plugin-proposal-object-rest-spread": "7.2.0", + "@babel/plugin-proposal-optional-catch-binding": "7.2.0", + "@babel/plugin-proposal-optional-chaining": "7.2.0", + "@babel/plugin-transform-async-to-generator": "7.2.0", + "@babel/plugin-transform-flow-strip-types": "7.2.3", + "@babel/plugin-transform-modules-commonjs": "7.2.0", + "@babel/register": "7.0.0", + "core-js": "2.6.1", + "escape-string-regexp": "1.0.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-styles": { @@ -13423,8 +19198,14 @@ "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", "dev": true, "requires": { +<<<<<<< master "css-selector-tokenizer": "^0.7.0", "postcss": "^6.0.1" +======= +<<<<<<< refs/remotes/origin/master + "css-selector-tokenizer": "0.7.1", + "postcss": "6.0.23" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-styles": { @@ -13473,6 +19254,20 @@ "has-flag": "^3.0.0" } } +======= + "@babel/helper-module-imports": "7.0.0" + } + }, + "metro-cache": { + "version": "0.48.5", + "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.48.5.tgz", + "integrity": "sha512-vlUf3A6+U3LXcf6wAn42N22q1h7MMoopA25w5KR4Flwd0xKVokxHwsTo9v06vpn4gqFtpXWCpEJSBaYRrWYJwg==", + "requires": { + "jest-serializer": "23.0.1", + "metro-core": "0.48.5", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "postcss-modules-values": { @@ -13481,8 +19276,21 @@ "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", "dev": true, "requires": { +<<<<<<< master "icss-replace-symbols": "^1.1.0", "postcss": "^6.0.1" +======= +<<<<<<< refs/remotes/origin/master + "icss-replace-symbols": "1.1.0", + "postcss": "6.0.23" +======= + "cosmiconfig": "5.0.7", + "metro": "0.48.5", + "metro-cache": "0.48.5", + "metro-core": "0.48.5", + "pretty-format": "23.6.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-styles": { @@ -13528,7 +19336,16 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { +<<<<<<< master "has-flag": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "has-flag": "3.0.0" +======= + "ansi-regex": "3.0.0", + "ansi-styles": "3.2.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -13556,8 +19373,20 @@ "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", "dev": true, "requires": { +<<<<<<< master "renderkid": "^2.0.1", "utila": "~0.4" +======= +<<<<<<< refs/remotes/origin/master + "renderkid": "2.0.2", + "utila": "0.4.0" +======= + "jest-haste-map": "23.5.0", + "lodash.throttle": "4.1.1", + "metro-resolver": "0.48.5", + "wordwrap": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "pretty-format": { @@ -13637,8 +19466,17 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", "requires": { +<<<<<<< master "loose-envify": "^1.3.1", "object-assign": "^4.1.1" +======= +<<<<<<< refs/remotes/origin/master + "loose-envify": "1.4.0", + "object-assign": "4.1.1" +======= + "uglify-es": "3.3.9" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "proxy-addr": { @@ -13647,8 +19485,50 @@ "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", "dev": true, "requires": { +<<<<<<< master "forwarded": "~0.1.2", +======= +<<<<<<< refs/remotes/origin/master + "forwarded": "0.1.2", +>>>>>>> UPS8: Added ProfileView Form with header, footer "ipaddr.js": "1.8.0" +======= + "@babel/plugin-proposal-class-properties": "7.2.3", + "@babel/plugin-proposal-export-default-from": "7.2.0", + "@babel/plugin-proposal-nullish-coalescing-operator": "7.2.0", + "@babel/plugin-proposal-object-rest-spread": "7.2.0", + "@babel/plugin-proposal-optional-catch-binding": "7.2.0", + "@babel/plugin-proposal-optional-chaining": "7.2.0", + "@babel/plugin-syntax-dynamic-import": "7.2.0", + "@babel/plugin-syntax-export-default-from": "7.2.0", + "@babel/plugin-transform-arrow-functions": "7.2.0", + "@babel/plugin-transform-block-scoping": "7.2.0", + "@babel/plugin-transform-classes": "7.2.2", + "@babel/plugin-transform-computed-properties": "7.2.0", + "@babel/plugin-transform-destructuring": "7.2.0", + "@babel/plugin-transform-exponentiation-operator": "7.2.0", + "@babel/plugin-transform-flow-strip-types": "7.2.3", + "@babel/plugin-transform-for-of": "7.2.0", + "@babel/plugin-transform-function-name": "7.2.0", + "@babel/plugin-transform-literals": "7.2.0", + "@babel/plugin-transform-modules-commonjs": "7.2.0", + "@babel/plugin-transform-object-assign": "7.2.0", + "@babel/plugin-transform-parameters": "7.2.0", + "@babel/plugin-transform-react-display-name": "7.2.0", + "@babel/plugin-transform-react-jsx": "7.2.0", + "@babel/plugin-transform-react-jsx-source": "7.2.0", + "@babel/plugin-transform-regenerator": "7.0.0", + "@babel/plugin-transform-runtime": "7.2.0", + "@babel/plugin-transform-shorthand-properties": "7.2.0", + "@babel/plugin-transform-spread": "7.2.2", + "@babel/plugin-transform-sticky-regex": "7.2.0", + "@babel/plugin-transform-template-literals": "7.2.0", + "@babel/plugin-transform-typescript": "7.2.0", + "@babel/plugin-transform-unicode-regex": "7.2.0", + "@babel/template": "7.2.2", + "metro-babel7-plugin-react-transform": "0.51.1", + "react-transform-hmr": "1.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "prr": { @@ -13673,12 +19553,25 @@ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, "requires": { +<<<<<<< master "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", "create-hash": "^1.1.0", "parse-asn1": "^5.0.0", "randombytes": "^2.0.1", "safe-buffer": "^5.1.2" +======= +<<<<<<< refs/remotes/origin/master + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "parse-asn1": "5.1.1", + "randombytes": "2.0.6", + "safe-buffer": "5.1.2" +======= + "absolute-path": "0.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "pump": { @@ -13687,8 +19580,17 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { +<<<<<<< master "end-of-stream": "^1.1.0", "once": "^1.3.1" +======= +<<<<<<< refs/remotes/origin/master + "end-of-stream": "1.4.1", + "once": "1.4.0" +======= + "source-map": "0.5.7" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "pumpify": { @@ -13697,9 +19599,16 @@ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, "requires": { +<<<<<<< master "duplexify": "^3.6.0", "inherits": "^2.0.3", "pump": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "duplexify": "3.6.1", + "inherits": "2.0.3", + "pump": "2.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "pump": { @@ -13708,8 +19617,44 @@ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, "requires": { +<<<<<<< master "end-of-stream": "^1.1.0", "once": "^1.3.1" +======= + "end-of-stream": "1.4.1", + "once": "1.4.0" +======= + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + }, + "dependencies": { + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "requires": { + "arr-flatten": "1.1.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -13729,8 +19674,17 @@ "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.2.0.tgz", "integrity": "sha512-5wupExkIt8RYL4h/FE+WTg3JHk62e6fFPWtAZA9J5IWK1PfTfKkMS93HBUHcFpeYi9KsY5pFbh+ldvEyaz5MyA==", "requires": { +<<<<<<< master "decode-uri-component": "^0.2.0", "strict-uri-encode": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "decode-uri-component": "0.2.0", + "strict-uri-encode": "2.0.0" +======= + "mime-db": "1.37.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "querystring": { @@ -13761,9 +19715,16 @@ "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==", "requires": { +<<<<<<< master "is-number": "^4.0.0", "kind-of": "^6.0.0", "math-random": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "is-number": "4.0.0", + "kind-of": "6.0.2", + "math-random": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "is-number": { @@ -13776,6 +19737,9 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } +======= + "dom-walk": "0.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "randombytes": { @@ -13784,7 +19748,15 @@ "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", "dev": true, "requires": { +<<<<<<< master "safe-buffer": "^5.1.0" +======= +<<<<<<< refs/remotes/origin/master + "safe-buffer": "5.1.2" +======= + "brace-expansion": "1.1.11" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "randomfill": { @@ -13808,10 +19780,15 @@ "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "bytes": "3.0.0", "http-errors": "1.6.3", "iconv-lite": "0.4.23", "unpipe": "1.0.0" +======= + "safe-buffer": "5.1.2", + "yallist": "3.0.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "iconv-lite": { @@ -13836,10 +19813,21 @@ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "requires": { +<<<<<<< master "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" +======= +<<<<<<< refs/remotes/origin/master + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" +======= + "minipass": "2.3.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react": { @@ -13869,6 +19857,7 @@ "integrity": "sha512-ThbJ86coVd6wV/QiTo8klDTvdAJ1WsFCGQN07+UkN+QN9CtCSsl/+YuDJToKGeG8X4j9HMGXNKbk2QhPAZr43w==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@babel/code-frame": "7.0.0", "address": "1.0.3", "browserslist": "4.1.1", @@ -13893,6 +19882,10 @@ "sockjs-client": "1.1.5", "strip-ansi": "4.0.0", "text-table": "0.2.0" +======= + "for-in": "1.0.2", + "is-extendable": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-regex": { @@ -14137,7 +20130,15 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { +<<<<<<< master "has-flag": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "has-flag": "3.0.0" +======= + "is-plain-object": "2.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -14147,8 +20148,12 @@ "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-3.4.3.tgz", "integrity": "sha512-t3f6cRH5YSKv8qjRl1Z+1e0OwBZwJSdOAhJ9QAJdVKML7SmqAKKv3DxF+Ue03pE1N2UipPsLmaNcPzzMjIdZQg==", "requires": { +<<<<<<< master "shell-quote": "^1.6.1", "ws": "^3.3.1" +======= + "shell-quote": "1.6.1", + "ws": "3.3.3" }, "dependencies": { "ultron": { @@ -14161,6 +20166,102 @@ "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "requires": { + "async-limiter": "1.0.0", + "safe-buffer": "5.1.2", + "ultron": "1.1.1" + } + } + } + }, +<<<<<<< refs/remotes/origin/master + "react-dom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.7.0.tgz", + "integrity": "sha512-D0Ufv1ExCAmF38P2Uh1lwpminZFRXEINJe53zRAbm4KPwSyd6DY/uDoS0Blj9jvPpn1+wivKpZYc8aAAN/nAkg==", + "dev": true, + "requires": { + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "prop-types": "15.6.2", + "scheduler": "0.12.0" + }, + "dependencies": { + "scheduler": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.12.0.tgz", + "integrity": "sha512-t7MBR28Akcp4Jm+QoR63XgAi9YgCUmgvDHqf5otgAj4QvdoBE4ImCX0ffehefePPG+aitiYHp0g/mW6s4Tp+dw==", + "dev": true, + "requires": { + "loose-envify": "1.4.0", + "object-assign": "4.1.1" +======= + "moment": { + "version": "2.19.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.3.tgz", + "integrity": "sha1-vbmdJw1tf9p4zA+6zoVeJ/59pp8=" + }, + "morgan": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz", + "integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==", + "requires": { + "basic-auth": "2.0.1", + "debug": "2.6.9", + "depd": "1.1.2", + "on-finished": "2.3.0", + "on-headers": "1.0.1" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" + }, + "nan": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", + "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==" + }, + "nanomatch": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "requires": { +<<<<<<< master "async-limiter": "~1.0.0", "safe-buffer": "~5.1.0", "ultron": "~1.1.0" @@ -14188,6 +20289,19 @@ "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" +======= + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -14204,10 +20318,23 @@ "integrity": "sha512-qIZZxaCheb/HhcBi5fABbiCFg85+K5r1TCps1D4uaL0LAMMD/1zm/x1/kNR130Tx7nnY9V7mbFyY0DquPYeLAw==", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.23.0", "classnames": "^2.2.5", "fuse.js": "^3.0.1", "prop-types": "^15.5.9" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "classnames": "2.2.6", + "fuse.js": "3.3.0", + "prop-types": "15.6.2" +======= + "debug": "2.6.9", + "iconv-lite": "0.4.24", + "sax": "1.2.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "fuse.js": { @@ -14224,9 +20351,19 @@ "integrity": "sha512-tUUK7t3KWgZEIUktOYko5Ic/oYwvjEvQUFAGC1UeMeDaQ5za2yZFtItJa2RTwBJB//NxPr000WQK6sEbqC6y0Q==", "dev": true, "requires": { +<<<<<<< master "babel-runtime": "^6.26.0", "is-dom": "^1.0.9", "prop-types": "^15.6.1" +======= +<<<<<<< refs/remotes/origin/master + "babel-runtime": "6.26.0", + "is-dom": "1.0.9", + "prop-types": "15.6.2" +======= + "lodash.toarray": "4.4.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-is": { @@ -14256,6 +20393,7 @@ "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.57.8.tgz", "integrity": "sha512-K6DAMTPTq+lxVYC73y4Kh/bgLajddBaIKzwsVeV4JOoS1Fdq48/ISXD3vApV+x+/IBVTXnrT9qlA+9U6MMZCqA==", "requires": { +<<<<<<< master "@babel/runtime": "^7.0.0", "absolute-path": "^0.0.0", "art": "^0.10.0", @@ -14308,6 +20446,67 @@ "xcode": "^1.0.0", "xmldoc": "^0.4.0", "yargs": "^9.0.0" +======= +<<<<<<< refs/remotes/origin/master + "@babel/runtime": "7.2.0", + "absolute-path": "0.0.0", + "art": "0.10.3", + "base64-js": "1.3.0", + "chalk": "1.1.3", + "commander": "2.19.0", + "compression": "1.7.3", + "connect": "3.6.6", + "create-react-class": "15.6.3", + "debug": "2.6.9", + "denodeify": "1.2.1", + "envinfo": "5.12.1", + "errorhandler": "1.5.0", + "escape-string-regexp": "1.0.5", + "event-target-shim": "1.1.1", + "fbjs": "1.0.0", + "fbjs-scripts": "1.0.1", + "fs-extra": "1.0.0", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "inquirer": "3.3.0", + "lodash": "4.17.11", + "metro": "0.48.5", + "metro-babel-register": "0.48.5", + "metro-core": "0.48.5", + "metro-memory-fs": "0.48.5", + "mime": "1.6.0", + "minimist": "1.2.0", + "mkdirp": "0.5.1", + "morgan": "1.9.1", + "node-fetch": "2.3.0", + "node-notifier": "5.3.0", + "npmlog": "2.0.4", + "opn": "3.0.3", + "optimist": "0.6.1", + "plist": "3.0.1", + "pretty-format": "4.3.1", + "promise": "7.3.1", + "prop-types": "15.6.2", + "react-clone-referenced-element": "1.1.0", + "react-devtools-core": "3.4.3", + "react-timer-mixin": "0.13.4", + "regenerator-runtime": "0.11.1", + "rimraf": "2.6.2", + "semver": "5.6.0", + "serve-static": "1.13.2", + "shell-quote": "1.6.1", + "stacktrace-parser": "0.1.4", + "ws": "1.1.5", + "xcode": "1.1.0", + "xmldoc": "0.4.0", + "yargs": "9.0.1" +======= + "growly": "1.3.0", + "semver": "5.6.0", + "shellwords": "0.1.1", + "which": "1.3.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-native-app-settings": { @@ -14333,6 +20532,7 @@ "resolved": "https://registry.npmjs.org/react-native-country-picker-modal/-/react-native-country-picker-modal-0.6.2.tgz", "integrity": "sha1-upcRi+Q3O+DBHNUeRF5r1Eji8co=", "requires": { +<<<<<<< refs/remotes/origin/master "fuse.js": "2.6.2", "lodash": "4.12.0", "node-emoji": "1.8.1", @@ -14359,6 +20559,42 @@ "version": "2.5.5", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" +======= + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.4", + "nopt": "4.0.1", + "npm-packlist": "1.1.12", + "npmlog": "4.1.2", + "rc": "1.2.8", + "rimraf": "2.6.2", + "semver": "5.6.0", + "tar": "4.4.8" + }, + "dependencies": { + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "lodash": { "version": "4.12.0", @@ -14370,9 +20606,22 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", "requires": { +<<<<<<< master "fbjs": "^0.8.16", "loose-envify": "^1.3.1", "object-assign": "^4.1.1" +======= +<<<<<<< refs/remotes/origin/master + "fbjs": "0.8.17", + "loose-envify": "1.4.0", + "object-assign": "4.1.1" +======= + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-native-safe-area-view": { @@ -14380,7 +20629,17 @@ "resolved": "http://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.7.0.tgz", "integrity": "sha512-SjLdW/Th0WVMhyngH4O6yC21S+O4U4AAG3QxBr7fZ2ftgjXSpKbDHAhEpxBdFwei6HsnsC2h9oYMtPpaW9nfGg==", "requires": { +<<<<<<< master "hoist-non-react-statics": "^2.3.1" +======= +<<<<<<< refs/remotes/origin/master + "hoist-non-react-statics": "2.5.5" +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -14390,10 +20649,22 @@ "resolved": "http://registry.npmjs.org/react-native-elements/-/react-native-elements-0.19.1.tgz", "integrity": "sha1-+Stp2GShUCFdAfgf48UqnK2oPkU=", "requires": { +<<<<<<< master "lodash.isempty": "^4.4.0", "lodash.times": "^4.3.2", "opencollective": "^1.0.3", "prop-types": "^15.5.8" +======= +<<<<<<< refs/remotes/origin/master + "lodash.isempty": "4.4.0", + "lodash.times": "4.3.2", + "opencollective": "1.0.3", + "prop-types": "15.6.2" +======= + "abbrev": "1.1.1", + "osenv": "0.1.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-native-flash-message": { @@ -14401,7 +20672,18 @@ "resolved": "https://registry.npmjs.org/react-native-flash-message/-/react-native-flash-message-0.1.10.tgz", "integrity": "sha512-hGOEoViRXLMR6cNry39qlDKG9QI+5rSQsjgzFZHcm+KlnuFoFJDuD2rdI92G8Tp85CHhYzhRGopYdT+RhQuOBA==", "requires": { +<<<<<<< master "prop-types": "^15.6.2" +======= +<<<<<<< refs/remotes/origin/master + "prop-types": "15.6.2" +======= + "hosted-git-info": "2.7.1", + "is-builtin-module": "1.0.0", + "semver": "5.6.0", + "validate-npm-package-license": "3.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-native-gesture-handler": { @@ -14409,9 +20691,16 @@ "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.0.12.tgz", "integrity": "sha512-Qp5FjRmqUFeCevSu2IYQG1Xw+YXZ9YOzqze/ZxaIvWzYAoKsRchlgHhNoxvCqElp/befrnVFIjAEQyUxcmBKJw==", "requires": { +<<<<<<< master "hoist-non-react-statics": "^2.3.1", "invariant": "^2.2.2", "prop-types": "^15.5.10" +======= +<<<<<<< refs/remotes/origin/master + "hoist-non-react-statics": "2.5.5", + "invariant": "2.2.4", + "prop-types": "15.6.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "hoist-non-react-statics": { @@ -14419,6 +20708,9 @@ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" } +======= + "remove-trailing-separator": "1.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-native-image-picker": { @@ -14431,6 +20723,7 @@ "resolved": "https://registry.npmjs.org/react-native-masked-text/-/react-native-masked-text-1.9.2.tgz", "integrity": "sha512-+EctPpbQkXJe3ljWggkMRv4Fn+Oy7WKegFPKzK/N91qV9aZWZZwMosWDiH4u3aU+cO+GAjWAZn9ilSLGDroJrQ==", "requires": { +<<<<<<< refs/remotes/origin/master "moment": "2.19.3", "tinymask": "^1.0.2" }, @@ -14446,13 +20739,31 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-1.1.1.tgz", "integrity": "sha512-t0Ujm177bagjUOSzhpmkSz+LqFW04HnY9TeZFavDCmV521fQvFz82aD+POXqWsAdsJVOK3umJYBNNqCjC3g0hQ==" +======= + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.5" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "2.0.1" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "react-native-safe-area-view": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.11.0.tgz", "integrity": "sha512-N3nElaahu1Me2ltnfc9acpgt1znm6pi8DSadKy79kvdzKwvVIzw0IXueA/Hjr51eCW1BsfNw7D1SgBT9U6qEkA==", "requires": { +<<<<<<< master "hoist-non-react-statics": "^2.3.1" +======= +<<<<<<< refs/remotes/origin/master + "hoist-non-react-statics": "2.5.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "hoist-non-react-statics": { @@ -14460,6 +20771,11 @@ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" } +======= + "ansi": "0.3.1", + "are-we-there-yet": "1.1.5", + "gauge": "1.2.7" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-native-screens": { @@ -14486,9 +20802,21 @@ "resolved": "http://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-4.6.0.tgz", "integrity": "sha512-rpfhfPiXCK2PX1nrNhdxSMrEGB/Gw/SvKoPM0G2wAkSoqynnes19K0VYI+Up7DqR1rFIpE4hP2erpT1tNx2tfg==", "requires": { +<<<<<<< master "lodash": "^4.0.0", "prop-types": "^15.5.10", "yargs": "^8.0.2" +======= +<<<<<<< refs/remotes/origin/master + "lodash": "4.17.11", + "prop-types": "15.6.2", + "yargs": "8.0.2" +======= + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "yargs": { @@ -14496,6 +20824,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", "requires": { +<<<<<<< master "camelcase": "^4.1.0", "cliui": "^3.2.0", "decamelize": "^1.1.1", @@ -14509,6 +20838,25 @@ "which-module": "^2.0.0", "y18n": "^3.2.1", "yargs-parser": "^7.0.0" +======= +<<<<<<< refs/remotes/origin/master + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.3", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" +======= + "is-descriptor": "0.1.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -14527,6 +20875,7 @@ "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", "requires": { +<<<<<<< master "core-js": "^1.0.0", "isomorphic-fetch": "^2.1.1", "loose-envify": "^1.0.0", @@ -14534,6 +20883,19 @@ "promise": "^7.1.1", "setimmediate": "^1.0.5", "ua-parser-js": "^0.7.18" +======= +<<<<<<< refs/remotes/origin/master + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.19" +======= + "is-buffer": "1.1.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -14568,10 +20930,21 @@ "resolved": "https://registry.npmjs.org/react-navigation-tabs/-/react-navigation-tabs-1.0.2.tgz", "integrity": "sha512-ffWPVdo+L0GLbQlLAzH7ITYqh9V9NdqT/juj8QtESH5/2yUqfvqTxQoSowvFIrtiIHHFH6tLoQy1sZZciTxmeg==", "requires": { +<<<<<<< master "hoist-non-react-statics": "^2.5.0", "prop-types": "^15.6.1", "react-lifecycles-compat": "^3.0.4", "react-native-tab-view": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "hoist-non-react-statics": "2.5.5", + "prop-types": "15.6.2", + "react-lifecycles-compat": "3.0.4", + "react-native-tab-view": "1.3.1" +======= + "isobject": "3.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "hoist-non-react-statics": { @@ -14596,11 +20969,26 @@ "integrity": "sha512-3GhaYs6+eVNrewgN4eQKJoNMQ4pcegNMTMhR5bO/NFO91K6/98qdD1sCuWPpsefCjzxNTjkvVYWQC0bMaC45mA==", "dev": true, "requires": { +<<<<<<< master "prop-types": "^15.5.10", "react": "^16.6.3", "react-dom": "^16.6.3", "react-lifecycles-compat": "^3.0.4", "react-style-proptype": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "prop-types": "15.6.2", + "react": "16.6.3", + "react-dom": "16.7.0", + "react-lifecycles-compat": "3.0.4", + "react-style-proptype": "3.2.2" +======= + "define-properties": "1.1.3", + "function-bind": "1.1.1", + "has-symbols": "1.0.0", + "object-keys": "1.0.12" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-style-proptype": { @@ -14609,7 +20997,16 @@ "integrity": "sha512-ywYLSjNkxKHiZOqNlso9PZByNEY+FTyh3C+7uuziK0xFXu9xzdyfHwg4S9iyiRRoPCR4k2LqaBBsWVmSBwCWYQ==", "dev": true, "requires": { +<<<<<<< master "prop-types": "^15.5.4" +======= +<<<<<<< refs/remotes/origin/master + "prop-types": "15.6.2" +======= + "define-properties": "1.1.3", + "es-abstract": "1.12.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-test-renderer": { @@ -14644,8 +21041,18 @@ "resolved": "https://registry.npmjs.org/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz", "integrity": "sha1-4aQL0Krvxy6N/Xp82gmvhQZjl7s=", "requires": { +<<<<<<< master "global": "^4.3.0", "react-proxy": "^1.1.7" +======= +<<<<<<< refs/remotes/origin/master + "global": "4.3.2", + "react-proxy": "1.1.8" +======= + "for-own": "0.1.5", + "is-extendable": "0.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-transition-group": { @@ -14654,10 +21061,28 @@ "integrity": "sha512-2DGFck6h99kLNr8pOFk+z4Soq3iISydwOFeeEVPjTN6+Y01CmvbWmnN02VuTWyFdnRtIDPe+wy2q6Ui8snBPZg==", "dev": true, "requires": { +<<<<<<< master "dom-helpers": "^3.3.1", "loose-envify": "^1.4.0", "prop-types": "^15.6.2", "react-lifecycles-compat": "^3.0.4" +======= +<<<<<<< refs/remotes/origin/master + "dom-helpers": "3.4.0", + "loose-envify": "1.4.0", + "prop-types": "15.6.2", + "react-lifecycles-compat": "3.0.4" +======= + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "react-treebeard": { @@ -14690,8 +21115,17 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "requires": { +<<<<<<< master "find-up": "^2.0.0", "read-pkg": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "find-up": "2.1.0", + "read-pkg": "2.0.0" +======= + "wrappy": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "readable-stream": { @@ -14699,6 +21133,7 @@ "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { +<<<<<<< master "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", @@ -14706,6 +21141,19 @@ "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" +======= + "mimic-fn": "1.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "readdirp": { @@ -14737,6 +21185,7 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { +<<<<<<< master "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", "extend-shallow": "^2.0.1", @@ -14747,6 +21196,19 @@ "snapdragon-node": "^2.0.1", "split-string": "^3.0.2", "to-regex": "^3.0.1" +======= +<<<<<<< refs/remotes/origin/master + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "extend-shallow": { @@ -14758,6 +21220,21 @@ "is-extendable": "^0.1.0" } } +======= + "ansi-escapes": "1.4.0", + "chalk": "1.1.3", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "2.2.0", + "figures": "2.0.0", + "lodash": "4.17.11", + "mute-stream": "0.0.7", + "run-async": "2.3.0", + "rx": "4.1.0", + "string-width": "2.1.1", + "strip-ansi": "3.0.1", + "through": "2.3.8" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "expand-brackets": { @@ -14967,7 +21444,12 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { +<<<<<<< master "kind-of": "^3.0.2" +======= +<<<<<<< refs/remotes/origin/master + "kind-of": "3.2.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "kind-of": { @@ -14979,6 +21461,10 @@ "is-buffer": "^1.1.5" } } +======= + "encoding": "0.1.12", + "is-stream": "1.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "isobject": { @@ -14999,6 +21485,7 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { +<<<<<<< master "arr-diff": "^4.0.0", "array-unique": "^0.3.2", "braces": "^2.3.1", @@ -15012,11 +21499,184 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.2" +======= +<<<<<<< refs/remotes/origin/master + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" +======= + "object-assign": "4.1.1", + "pinkie-promise": "2.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } }, +<<<<<<< refs/remotes/origin/master "readline2": { +======= + "opn": { + "version": "3.0.3", + "resolved": "http://registry.npmjs.org/opn/-/opn-3.0.3.tgz", + "integrity": "sha1-ttmec5n3jWXDuq/+8fsojpuFJDo=", + "requires": { + "object-assign": "4.1.1" + } + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + }, + "dependencies": { + "minimist": { + "version": "0.0.10", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + } + } + }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + } + }, + "options": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", + "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=" + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "requires": { + "p-try": "1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "requires": { + "p-limit": "1.3.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "requires": { + "error-ex": "1.3.2", + "json-parse-better-errors": "1.0.2" + } + }, + "parse-node-version": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.0.tgz", + "integrity": "sha512-02GTVHD1u0nWc20n2G7WX/PgdhNFG04j5fi1OkaJzPWLTcf6vh6229Lta1wTmXG/7Dg42tCssgkccVt7qvd8Kg==" + }, + "parse5": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", + "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", + "dev": true + }, + "parseurl": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", + "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=" + }, + "pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + }, + "path-is-absolute": { +>>>>>>> UPS8: Added ProfileView Form with header, footer "version": "1.0.1", "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", @@ -15044,11 +21704,218 @@ } } }, +<<<<<<< refs/remotes/origin/master "realm": { "version": "2.21.1", "resolved": "https://registry.npmjs.org/realm/-/realm-2.21.1.tgz", "integrity": "sha512-8O+A2DG2RFUuE7noRuaDa45v5fwwr6/CU/HVdMbv1w/DJV+4RxPkSiwF9OhecZ34KkAsWUbUPYZVdj5JNq3Aag==", "requires": { + "command-line-args": "4.0.7", + "decompress": "4.2.0", + "deepmerge": "2.1.0", + "fs-extra": "4.0.3", + "ini": "1.3.5", + "nan": "2.12.1", + "node-fetch": "1.7.3", + "node-machine-id": "1.1.10", + "node-pre-gyp": "0.11.0", + "progress": "2.0.3", + "prop-types": "15.6.2", + "request": "2.88.0", + "stream-counter": "1.0.0", + "sync-request": "3.0.1", + "url-parse": "1.4.4" +======= + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "requires": { + "pify": "2.3.0" + } + }, + "pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "pify": { + "version": "2.3.0", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "requires": { + "pinkie": "2.0.4" + } + }, + "pirates": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.0.tgz", + "integrity": "sha512-8t5BsXy1LUIjn3WWOlOuFDuKswhQb/tkak641lvBgmPOBUQHXveORtlMCp6OdPV1dtuTaEahKA8VNz6uLfKBtA==", + "requires": { + "node-modules-regexp": "1.0.0" + } + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "requires": { + "find-up": "2.1.0" + } + }, + "pkg-up": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz", + "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=", + "dev": true, + "requires": { + "find-up": "1.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer + }, + "dependencies": { + "fs-extra": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", + "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "requires": { +<<<<<<< refs/remotes/origin/master + "graceful-fs": "4.1.15", + "jsonfile": "4.0.0", + "universalify": "0.1.2" +======= + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "4.1.15" + } + }, + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { +<<<<<<< refs/remotes/origin/master + "encoding": "0.1.12", + "is-stream": "1.1.0" +======= + "pinkie-promise": "2.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer + } + } + } + }, +<<<<<<< refs/remotes/origin/master + "realpath-native": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.2.tgz", + "integrity": "sha512-+S3zTvVt9yTntFrBpm7TQmQ3tzpCrnA1a/y+3cUHAc9ZR6aIjG0WNLR+Rj79QpJktY+VeW/TQtFlQ1bzsehI8g==", + "dev": true, + "requires": { + "util.promisify": "1.0.0" +======= + "plist": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", + "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", + "requires": { + "base64-js": "1.3.0", + "xmlbuilder": "9.0.7", + "xmldom": "0.1.27" + } + }, + "plugin-error": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", + "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "requires": { + "ansi-cyan": "0.1.1", + "ansi-red": "0.1.1", + "arr-diff": "1.1.0", + "arr-union": "2.1.0", + "extend-shallow": "1.1.4" + } + }, + "pluralize": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz", + "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=", + "dev": true + }, + "pn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz", + "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==", + "dev": true + }, + "posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "preserve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" + }, + "pretty-format": { + "version": "4.3.1", + "resolved": "http://registry.npmjs.org/pretty-format/-/pretty-format-4.3.1.tgz", + "integrity": "sha1-UwvlxCs8BbNkFKeipDN6qArNDo0=" + }, + "private": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==" + }, + "process": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", + "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=" + }, + "process-nextick-args": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { +<<<<<<< master "command-line-args": "^4.0.6", "decompress": "^4.2.0", "deepmerge": "2.1.0", @@ -15093,15 +21960,24 @@ "is-stream": "^1.0.1" } } +======= + "asap": "2.0.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, - "realpath-native": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.2.tgz", - "integrity": "sha512-+S3zTvVt9yTntFrBpm7TQmQ3tzpCrnA1a/y+3cUHAc9ZR6aIjG0WNLR+Rj79QpJktY+VeW/TQtFlQ1bzsehI8g==", + "prompts": { + "version": "0.1.14", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-0.1.14.tgz", + "integrity": "sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==", "dev": true, "requires": { +<<<<<<< master "util.promisify": "^1.0.0" +======= + "kleur": "2.0.2", + "sisteransi": "0.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "rechoir": { @@ -15110,7 +21986,16 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { +<<<<<<< master "resolve": "^1.1.6" +======= +<<<<<<< refs/remotes/origin/master + "resolve": "1.9.0" +======= + "loose-envify": "1.4.0", + "object-assign": "4.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "recursive-readdir": { @@ -15119,7 +22004,12 @@ "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "minimatch": "3.0.4" +======= + "decode-uri-component": "0.2.0", + "strict-uri-encode": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "redux": { @@ -15128,21 +22018,72 @@ "integrity": "sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==", "dev": true, "requires": { +<<<<<<< master "loose-envify": "^1.4.0", "symbol-observable": "^1.2.0" +======= +<<<<<<< refs/remotes/origin/master + "loose-envify": "1.4.0", + "symbol-observable": "1.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==" +======= + "is-number": "4.0.0", + "kind-of": "6.0.2", + "math-random": "1.0.1" + }, + "dependencies": { + "is-number": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" + }, + "rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "requires": { + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "regenerate-unicode-properties": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz", "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==", "requires": { +<<<<<<< master "regenerate": "^1.4.0" +======= +<<<<<<< refs/remotes/origin/master + "regenerate": "1.4.0" +======= + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "prop-types": "15.6.2", + "scheduler": "0.11.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "regenerator-runtime": { @@ -15155,7 +22096,33 @@ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz", "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==", "requires": { +<<<<<<< master "private": "^0.1.6" +======= +<<<<<<< refs/remotes/origin/master + "private": "0.1.8" +======= + "shell-quote": "1.6.1", + "ws": "3.3.3" + }, + "dependencies": { + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" + }, + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "requires": { + "async-limiter": "1.0.0", + "safe-buffer": "5.1.2", + "ultron": "1.1.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "regex-cache": { @@ -15163,7 +22130,66 @@ "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "requires": { +<<<<<<< master "is-equal-shallow": "^0.1.3" +======= +<<<<<<< refs/remotes/origin/master + "is-equal-shallow": "0.1.3" +======= + "@babel/runtime": "7.2.0", + "absolute-path": "0.0.0", + "art": "0.10.3", + "base64-js": "1.3.0", + "chalk": "1.1.3", + "commander": "2.19.0", + "compression": "1.7.3", + "connect": "3.6.6", + "create-react-class": "15.6.3", + "debug": "2.6.9", + "denodeify": "1.2.1", + "envinfo": "5.12.1", + "errorhandler": "1.5.0", + "escape-string-regexp": "1.0.5", + "event-target-shim": "1.1.1", + "fbjs": "1.0.0", + "fbjs-scripts": "1.0.1", + "fs-extra": "1.0.0", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "inquirer": "3.3.0", + "lodash": "4.17.11", + "metro": "0.48.5", + "metro-babel-register": "0.48.5", + "metro-core": "0.48.5", + "metro-memory-fs": "0.48.5", + "mime": "1.6.0", + "minimist": "1.2.0", + "mkdirp": "0.5.1", + "morgan": "1.9.1", + "node-fetch": "2.3.0", + "node-notifier": "5.3.0", + "npmlog": "2.0.4", + "opn": "3.0.3", + "optimist": "0.6.1", + "plist": "3.0.1", + "pretty-format": "4.3.1", + "promise": "7.3.1", + "prop-types": "15.6.2", + "react-clone-referenced-element": "1.1.0", + "react-devtools-core": "3.4.3", + "react-timer-mixin": "0.13.4", + "regenerator-runtime": "0.11.1", + "rimraf": "2.6.2", + "semver": "5.6.0", + "serve-static": "1.13.2", + "shell-quote": "1.6.1", + "stacktrace-parser": "0.1.4", + "ws": "1.1.5", + "xcode": "1.1.0", + "xmldoc": "0.4.0", + "yargs": "9.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "regex-not": { @@ -15171,8 +22197,14 @@ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { +<<<<<<< master "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" +======= +<<<<<<< refs/remotes/origin/master + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "extend-shallow": { @@ -15180,8 +22212,55 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { +<<<<<<< master "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" +======= + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" +======= + "fuse.js": "2.6.2", + "lodash": "4.12.0", + "node-emoji": "1.8.1", + "prop-types": "15.6.0", + "react-native-safe-area-view": "0.7.0", + "world-countries": "1.8.0" + }, + "dependencies": { + "fbjs": { + "version": "0.8.17", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", + "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", + "requires": { + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.19" + } + }, + "hoist-non-react-statics": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", + "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + }, + "lodash": { + "version": "4.12.0", + "resolved": "http://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz", + "integrity": "sha1-K9bcRqBA9Z5obJcu0h2T3FkFMlg=" + }, + "prop-types": { + "version": "15.6.0", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", + "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "requires": { + "fbjs": "0.8.17", + "loose-envify": "1.4.0", + "object-assign": "4.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-extendable": { @@ -15189,6 +22268,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { +<<<<<<< master "is-plain-object": "^2.0.4" } } @@ -15382,6 +22462,13 @@ "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" +======= +<<<<<<< refs/remotes/origin/master + "is-plain-object": "2.0.4" +======= + "hoist-non-react-statics": "2.5.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -15392,7 +22479,18 @@ "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", "dev": true, "requires": { +<<<<<<< master "define-properties": "^1.1.2" +======= +<<<<<<< refs/remotes/origin/master + "define-properties": "1.1.3" +======= + "lodash.isempty": "4.4.0", + "lodash.times": "4.3.2", + "opencollective": "1.0.3", + "prop-types": "15.6.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "regexpu-core": { @@ -15400,12 +22498,25 @@ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.4.0.tgz", "integrity": "sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==", "requires": { +<<<<<<< master "regenerate": "^1.4.0", "regenerate-unicode-properties": "^7.0.0", "regjsgen": "^0.5.0", "regjsparser": "^0.6.0", "unicode-match-property-ecmascript": "^1.0.4", "unicode-match-property-value-ecmascript": "^1.0.2" +======= +<<<<<<< refs/remotes/origin/master + "regenerate": "1.4.0", + "regenerate-unicode-properties": "7.0.0", + "regjsgen": "0.5.0", + "regjsparser": "0.6.0", + "unicode-match-property-ecmascript": "1.0.4", + "unicode-match-property-value-ecmascript": "1.0.2" +======= + "prop-types": "15.6.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "regjsgen": { @@ -15418,7 +22529,17 @@ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz", "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==", "requires": { +<<<<<<< master "jsesc": "~0.5.0" +======= +<<<<<<< refs/remotes/origin/master + "jsesc": "0.5.0" +======= + "hoist-non-react-statics": "2.5.5", + "invariant": "2.2.4", + "prop-types": "15.6.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "jsesc": { @@ -15428,11 +22549,30 @@ } } }, +<<<<<<< refs/remotes/origin/master "relateurl": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", "dev": true +======= + "react-native-masked-text": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/react-native-masked-text/-/react-native-masked-text-1.9.2.tgz", + "integrity": "sha512-+EctPpbQkXJe3ljWggkMRv4Fn+Oy7WKegFPKzK/N91qV9aZWZZwMosWDiH4u3aU+cO+GAjWAZn9ilSLGDroJrQ==", + "requires": { + "moment": "2.19.3", + "tinymask": "1.0.2" + } + }, + "react-native-modal-dropdown": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/react-native-modal-dropdown/-/react-native-modal-dropdown-0.6.2.tgz", + "integrity": "sha512-1jzByA+ME+q0mZJ2rZrLsf6jVwJhNxNHdg7I50xYZ9oYJsmmKwF9r/ks95tZxxks4Zvd7/FnaveNtyd+uevXAw==", + "requires": { + "prop-types": "15.6.2" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "remove-trailing-separator": { "version": "1.1.0", @@ -15451,11 +22591,30 @@ "integrity": "sha512-FsygIxevi1jSiPY9h7vZmBFUbAOcbYm9UwyiLNdVsLRs/5We9Ob5NMPbGYUTWiLq5L+ezlVdE0A8bbME5CWTpg==", "dev": true, "requires": { +<<<<<<< master "css-select": "^1.1.0", "dom-converter": "~0.2", "htmlparser2": "~3.3.0", "strip-ansi": "^3.0.0", "utila": "^0.4.0" +======= +<<<<<<< refs/remotes/origin/master + "css-select": "1.2.0", + "dom-converter": "0.2.0", + "htmlparser2": "3.3.0", + "strip-ansi": "3.0.1", + "utila": "0.4.0" +======= + "hoist-non-react-statics": "2.5.5" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", + "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "repeat-element": { @@ -15474,7 +22633,12 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { +<<<<<<< master "is-finite": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "is-finite": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "request": { @@ -15482,6 +22646,7 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "requires": { +<<<<<<< master "aws-sign2": "~0.7.0", "aws4": "^1.8.0", "caseless": "~0.12.0", @@ -15502,6 +22667,41 @@ "tough-cookie": "~2.4.3", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" +======= + "aws-sign2": "0.7.0", + "aws4": "1.8.0", + "caseless": "0.12.0", + "combined-stream": "1.0.7", + "extend": "3.0.2", + "forever-agent": "0.6.1", + "form-data": "2.3.3", + "har-validator": "5.1.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.21", + "oauth-sign": "0.9.0", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.4.3", + "tunnel-agent": "0.6.0", + "uuid": "3.3.2" +======= + "prop-types": "15.6.2" + } + }, + "react-native-vector-icons": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-4.6.0.tgz", + "integrity": "sha512-rpfhfPiXCK2PX1nrNhdxSMrEGB/Gw/SvKoPM0G2wAkSoqynnes19K0VYI+Up7DqR1rFIpE4hP2erpT1tNx2tfg==", + "requires": { + "lodash": "4.17.11", + "prop-types": "15.6.2", + "yargs": "8.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "punycode": { @@ -15514,8 +22714,29 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", "requires": { +<<<<<<< master "psl": "^1.1.24", "punycode": "^1.4.1" +======= +<<<<<<< refs/remotes/origin/master + "psl": "1.1.31", + "punycode": "1.4.1" +======= + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.3", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -15562,8 +22783,18 @@ "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "dev": true, "requires": { +<<<<<<< master "caller-path": "^0.1.0", "resolve-from": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "caller-path": "0.1.0", + "resolve-from": "1.0.1" +======= + "escape-string-regexp": "1.0.5", + "fbjs": "0.8.17" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "caller-path": { @@ -15572,7 +22803,21 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { +<<<<<<< master "callsites": "^0.2.0" +======= +<<<<<<< refs/remotes/origin/master + "callsites": "0.2.0" +======= + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.19" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "callsites": { @@ -15650,7 +22895,15 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "requires": { +<<<<<<< master "glob": "^7.0.5" +======= +<<<<<<< refs/remotes/origin/master + "glob": "7.1.3" +======= + "react-native-tab-view": "1.3.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "ripemd160": { @@ -15659,8 +22912,27 @@ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { +<<<<<<< master "hash-base": "^3.0.0", "inherits": "^2.0.1" +======= +<<<<<<< refs/remotes/origin/master + "hash-base": "3.0.4", + "inherits": "2.0.3" +======= + "hoist-non-react-statics": "2.5.5", + "prop-types": "15.6.2", + "react-lifecycles-compat": "3.0.4", + "react-native-tab-view": "1.3.1" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", + "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "rsvp": { @@ -15673,7 +22945,16 @@ "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "requires": { +<<<<<<< master "is-promise": "^2.1.0" +======= +<<<<<<< refs/remotes/origin/master + "is-promise": "2.1.0" +======= + "lodash": "4.17.11", + "react-deep-force-update": "1.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "run-queue": { @@ -15682,7 +22963,18 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { +<<<<<<< master "aproba": "^1.1.1" +======= +<<<<<<< refs/remotes/origin/master + "aproba": "1.2.0" +======= + "object-assign": "4.1.1", + "prop-types": "15.6.2", + "react-is": "16.7.0", + "scheduler": "0.11.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "rx": { @@ -15690,17 +22982,38 @@ "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz", "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=" }, +<<<<<<< refs/remotes/origin/master "rx-lite": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=" +======= + "react-transform-hmr": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz", + "integrity": "sha1-4aQL0Krvxy6N/Xp82gmvhQZjl7s=", + "requires": { + "global": "4.3.2", + "react-proxy": "1.1.8" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "rx-lite-aggregates": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", "requires": { +<<<<<<< master "rx-lite": "*" +======= +<<<<<<< refs/remotes/origin/master + "rx-lite": "4.0.8" +======= + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "rxjs": { @@ -15709,7 +23022,16 @@ "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", "dev": true, "requires": { +<<<<<<< master "tslib": "^1.9.0" +======= +<<<<<<< refs/remotes/origin/master + "tslib": "1.9.3" +======= + "find-up": "2.1.0", + "read-pkg": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "safe-buffer": { @@ -15722,7 +23044,21 @@ "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { +<<<<<<< master "ret": "~0.1.10" +======= +<<<<<<< refs/remotes/origin/master + "ret": "0.1.15" +======= + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "safer-buffer": { @@ -15735,6 +23071,7 @@ "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz", "integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=", "requires": { +<<<<<<< master "anymatch": "^2.0.0", "capture-exit": "^1.2.0", "exec-sh": "^0.2.0", @@ -15744,6 +23081,23 @@ "minimist": "^1.1.1", "walker": "~1.0.5", "watch": "~0.18.0" +======= +<<<<<<< refs/remotes/origin/master + "anymatch": "2.0.0", + "capture-exit": "1.2.0", + "exec-sh": "0.2.2", + "fb-watchman": "2.0.0", + "fsevents": "1.2.4", + "micromatch": "3.1.10", + "minimist": "1.2.0", + "walker": "1.0.7", + "watch": "0.18.0" +======= + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "mute-stream": "0.0.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "arr-diff": { @@ -15923,10 +23277,18 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { +<<<<<<< master "extend-shallow": "^2.0.1", "is-number": "^3.0.0", "repeat-string": "^1.6.1", "to-regex-range": "^2.1.0" +======= +<<<<<<< refs/remotes/origin/master + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "extend-shallow": { @@ -15944,7 +23306,54 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { +<<<<<<< master "kind-of": "^6.0.0" +======= + "kind-of": "6.0.2" +======= + "number-is-nan": "1.0.1" + } + }, + "mute-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", + "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=", + "dev": true + } + } + }, + "realm": { + "version": "2.21.1", + "resolved": "https://registry.npmjs.org/realm/-/realm-2.21.1.tgz", + "integrity": "sha512-8O+A2DG2RFUuE7noRuaDa45v5fwwr6/CU/HVdMbv1w/DJV+4RxPkSiwF9OhecZ34KkAsWUbUPYZVdj5JNq3Aag==", + "requires": { + "command-line-args": "4.0.7", + "decompress": "4.2.0", + "deepmerge": "2.1.0", + "fs-extra": "4.0.3", + "ini": "1.3.5", + "nan": "2.12.1", + "node-fetch": "1.7.3", + "node-machine-id": "1.1.10", + "node-pre-gyp": "0.11.0", + "progress": "2.0.3", + "prop-types": "15.6.2", + "request": "2.88.0", + "stream-counter": "1.0.0", + "sync-request": "3.0.1", + "url-parse": "1.4.4" + }, + "dependencies": { + "fs-extra": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", + "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "requires": { + "graceful-fs": "4.1.15", + "jsonfile": "4.0.0", + "universalify": "0.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-data-descriptor": { @@ -15952,7 +23361,15 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { +<<<<<<< master "kind-of": "^6.0.0" +======= +<<<<<<< refs/remotes/origin/master + "kind-of": "6.0.2" +======= + "graceful-fs": "4.1.15" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-descriptor": { @@ -15960,9 +23377,16 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { +<<<<<<< master "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" +======= +<<<<<<< refs/remotes/origin/master + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-number": { @@ -15981,6 +23405,82 @@ "is-buffer": "^1.1.5" } } +======= + "encoding": "0.1.12", + "is-stream": "1.1.0" + } + } + } + }, + "realpath-native": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.2.tgz", + "integrity": "sha512-+S3zTvVt9yTntFrBpm7TQmQ3tzpCrnA1a/y+3cUHAc9ZR6aIjG0WNLR+Rj79QpJktY+VeW/TQtFlQ1bzsehI8g==", + "dev": true, + "requires": { + "util.promisify": "1.0.0" + } + }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "1.9.0" + } + }, + "regenerate": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", + "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==" + }, + "regenerate-unicode-properties": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz", + "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==", + "requires": { + "regenerate": "1.4.0" + } + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + }, + "regenerator-transform": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz", + "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==", + "requires": { + "private": "0.1.8" + } + }, + "regex-cache": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "requires": { + "is-equal-shallow": "0.1.3" + } + }, + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "requires": { + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "isobject": { @@ -15998,6 +23498,7 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { +<<<<<<< master "arr-diff": "^4.0.0", "array-unique": "^0.3.2", "braces": "^2.3.1", @@ -16011,6 +23512,25 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.2" +======= +<<<<<<< refs/remotes/origin/master + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" +======= + "is-plain-object": "2.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -16025,8 +23545,22 @@ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.3.tgz", "integrity": "sha512-i9X9VRRVZDd3xZw10NY5Z2cVMbdYg6gqFecfj79USv1CFN+YrJ3gIPRKf1qlY+Sxly4djoKdfx1T+m9dnRB8kQ==", "requires": { +<<<<<<< master "loose-envify": "^1.1.0", "object-assign": "^4.1.1" +======= +<<<<<<< refs/remotes/origin/master + "loose-envify": "1.4.0", + "object-assign": "4.1.1" +======= + "regenerate": "1.4.0", + "regenerate-unicode-properties": "7.0.0", + "regjsgen": "0.5.0", + "regjsparser": "0.6.0", + "unicode-match-property-ecmascript": "1.0.4", + "unicode-match-property-value-ecmascript": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "schema-utils": { @@ -16035,9 +23569,19 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { +<<<<<<< master "ajv": "^6.1.0", "ajv-errors": "^1.0.0", "ajv-keywords": "^3.1.0" +======= +<<<<<<< refs/remotes/origin/master + "ajv": "6.6.2", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.2.0" +======= + "jsesc": "0.5.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ajv-keywords": { @@ -16048,12 +23592,68 @@ } } }, +<<<<<<< refs/remotes/origin/master "seek-bzip": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", "requires": { +<<<<<<< master "commander": "~2.8.1" +======= + "commander": "2.8.1" +======= + "remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" + }, + "repeat-element": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", + "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, + "request": { + "version": "2.88.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "requires": { + "aws-sign2": "0.7.0", + "aws4": "1.8.0", + "caseless": "0.12.0", + "combined-stream": "1.0.7", + "extend": "3.0.2", + "forever-agent": "0.6.1", + "form-data": "2.3.3", + "har-validator": "5.1.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.21", + "oauth-sign": "0.9.0", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.4.3", + "tunnel-agent": "0.6.0", + "uuid": "3.3.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "commander": { @@ -16061,21 +23661,42 @@ "resolved": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", "requires": { +<<<<<<< master "graceful-readlink": ">= 1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "graceful-readlink": "1.0.1" +======= + "psl": "1.1.31", + "punycode": "1.4.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } }, +<<<<<<< refs/remotes/origin/master "semver": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" +======= + "request-promise-core": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz", + "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=", + "dev": true, + "requires": { + "lodash": "4.17.11" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "send": { "version": "0.16.2", "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", "requires": { +<<<<<<< refs/remotes/origin/master "debug": "2.6.9", "depd": "~1.1.2", "destroy": "~1.0.4", @@ -16101,6 +23722,11 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" } +======= + "request-promise-core": "1.1.1", + "stealthy-require": "1.1.1", + "tough-cookie": "2.5.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "serialize-error": { @@ -16120,7 +23746,12 @@ "integrity": "sha1-k10kDN/g9YBTB/3+ln2IlCosvPA=", "dev": true, "requires": { +<<<<<<< master "etag": "~1.8.1", +======= +<<<<<<< refs/remotes/origin/master + "etag": "1.8.1", +>>>>>>> UPS8: Added ProfileView Form with header, footer "fresh": "0.5.2", "ms": "2.1.1", "parseurl": "~1.3.2", @@ -16131,6 +23762,25 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", +======= + "caller-path": "0.1.0", + "resolve-from": "1.0.1" + }, + "dependencies": { + "caller-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", + "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "dev": true, + "requires": { + "callsites": "0.2.0" + } + }, + "callsites": { + "version": "0.2.0", + "resolved": "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", +>>>>>>> UPS8: Added ProfileView Form with header, footer "dev": true }, "safe-buffer": { @@ -16146,26 +23796,63 @@ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", "requires": { +<<<<<<< master "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.2", +======= +<<<<<<< refs/remotes/origin/master + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.2", +>>>>>>> UPS8: Added ProfileView Form with header, footer "send": "0.16.2" +======= + "path-parse": "1.0.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "set-blocking": { "version": "2.0.0", +<<<<<<< refs/remotes/origin/master "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" +======= + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", + "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "dev": true, + "requires": { + "resolve-from": "3.0.0" + } + }, + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" + }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "set-value": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "requires": { +<<<<<<< master "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", "is-plain-object": "^2.0.3", "split-string": "^3.0.1" +======= +<<<<<<< refs/remotes/origin/master + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "extend-shallow": { @@ -16182,6 +23869,24 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" +======= + "onetime": "2.0.1", + "signal-exit": "3.0.2" + } + }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + }, + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "requires": { + "glob": "7.1.3" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "setprototypeof": { "version": "1.1.0", @@ -16194,8 +23899,17 @@ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { +<<<<<<< master "inherits": "^2.0.1", "safe-buffer": "^5.0.1" +======= +<<<<<<< refs/remotes/origin/master + "inherits": "2.0.3", + "safe-buffer": "5.1.2" +======= + "is-promise": "2.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "shallowequal": { @@ -16209,7 +23923,15 @@ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "requires": { +<<<<<<< master "shebang-regex": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "shebang-regex": "1.0.0" +======= + "rx-lite": "4.0.8" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "shebang-regex": { @@ -16222,10 +23944,18 @@ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", "requires": { +<<<<<<< master "array-filter": "~0.0.0", "array-map": "~0.0.0", "array-reduce": "~0.0.0", "jsonify": "~0.0.0" +======= +<<<<<<< refs/remotes/origin/master + "array-filter": "0.0.1", + "array-map": "0.0.0", + "array-reduce": "0.0.0", + "jsonify": "0.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "shelljs": { @@ -16263,15 +23993,179 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz", "integrity": "sha1-1kAMrBxMZgl22Q0HoENR2JOV9eg=" +======= + "ret": "0.1.15" + } + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "sane": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz", + "integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=", + "requires": { + "anymatch": "2.0.0", + "capture-exit": "1.2.0", + "exec-sh": "0.2.2", + "fb-watchman": "2.0.0", + "fsevents": "1.2.4", + "micromatch": "3.1.10", + "minimist": "1.2.0", + "walker": "1.0.7", + "watch": "0.18.0" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "plist": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz", "integrity": "sha1-CjLKlIGxw2TpLhjcVch23p0B2os=", "requires": { +<<<<<<< refs/remotes/origin/master "base64-js": "1.1.2", "xmlbuilder": "8.2.2", +<<<<<<< master "xmldom": "0.1.x" +======= + "xmldom": "0.1.27" +======= + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "xmlbuilder": { @@ -16324,7 +24218,40 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { +<<<<<<< master "is-descriptor": "^0.1.0" +======= +<<<<<<< refs/remotes/origin/master + "is-descriptor": "0.1.6" +======= + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "extend-shallow": { @@ -16332,7 +24259,12 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { +<<<<<<< master "is-extendable": "^0.1.0" +======= +<<<<<<< refs/remotes/origin/master + "is-extendable": "0.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -16352,7 +24284,27 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { +<<<<<<< master "is-descriptor": "^1.0.0" +======= + "is-descriptor": "1.0.2" +======= + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-accessor-descriptor": { @@ -16519,8 +24471,27 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { +<<<<<<< master "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" +======= + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "is-extendable": { @@ -16528,7 +24499,27 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { +<<<<<<< master "is-plain-object": "^2.0.4" +======= +<<<<<<< refs/remotes/origin/master + "is-plain-object": "2.0.4" +======= + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -16560,7 +24551,16 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { +<<<<<<< master "figgy-pudding": "^3.5.1" +======= +<<<<<<< refs/remotes/origin/master + "figgy-pudding": "3.5.1" +======= + "loose-envify": "1.4.0", + "object-assign": "4.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "stack-utils": { @@ -16579,8 +24579,17 @@ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { +<<<<<<< master "define-property": "^0.2.5", "object-copy": "^0.1.0" +======= +<<<<<<< refs/remotes/origin/master + "define-property": "0.2.5", + "object-copy": "0.1.0" +======= + "commander": "2.8.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "define-property": { @@ -16588,7 +24597,15 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { +<<<<<<< master "is-descriptor": "^0.1.0" +======= +<<<<<<< refs/remotes/origin/master + "is-descriptor": "0.1.6" +======= + "graceful-readlink": "1.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -16610,8 +24627,14 @@ "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, "requires": { +<<<<<<< master "inherits": "~2.0.1", "readable-stream": "^2.0.2" +======= +<<<<<<< refs/remotes/origin/master + "inherits": "2.0.3", + "readable-stream": "2.3.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "stream-buffers": { @@ -16664,8 +24687,28 @@ "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=", "dev": true, "requires": { +<<<<<<< master "astral-regex": "^1.0.0", "strip-ansi": "^4.0.0" +======= + "astral-regex": "1.0.0", + "strip-ansi": "4.0.0" +======= + "debug": "2.6.9", + "depd": "1.1.2", + "destroy": "1.0.4", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", + "fresh": "0.5.2", + "http-errors": "1.6.3", + "mime": "1.4.1", + "ms": "2.0.0", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.4.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-regex": { @@ -16877,7 +24920,18 @@ "integrity": "sha512-I9mrbZ5M96s7QeJDv95toF1svkUjeBybe8ydhY7foPaBmr0SPJMFupArmMkDrOKTTj0sJVr+nvQNxWLziQ7nDQ==", "dev": true, "requires": { +<<<<<<< master "has-symbols": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "has-symbols": "1.0.0" +======= + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.2", + "send": "0.16.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "sync-request": { @@ -16896,12 +24950,28 @@ "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=", "dev": true, "requires": { +<<<<<<< master "ajv": "^4.7.0", "ajv-keywords": "^1.0.0", "chalk": "^1.1.1", "lodash": "^4.0.0", "slice-ansi": "0.0.4", "string-width": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "chalk": "1.1.3", + "lodash": "4.17.11", + "slice-ansi": "0.0.4", + "string-width": "2.1.1" +======= + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ajv": { @@ -16910,8 +24980,17 @@ "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", "dev": true, "requires": { +<<<<<<< master "co": "^4.6.0", "json-stable-stringify": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "co": "4.6.0", + "json-stable-stringify": "1.0.1" +======= + "is-extendable": "0.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -16927,6 +25006,7 @@ "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "requires": { +<<<<<<< master "chownr": "^1.1.1", "fs-minipass": "^1.2.5", "minipass": "^2.3.4", @@ -16934,6 +25014,16 @@ "mkdirp": "^0.5.0", "safe-buffer": "^5.1.2", "yallist": "^3.0.2" +======= +<<<<<<< refs/remotes/origin/master + "chownr": "1.1.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.5", + "minizlib": "1.2.1", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "yallist": { @@ -16941,6 +25031,9 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" } +======= + "shebang-regex": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "tar-stream": { @@ -16962,8 +25055,14 @@ "resolved": "http://registry.npmjs.org/temp/-/temp-0.8.3.tgz", "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=", "requires": { +<<<<<<< master "os-tmpdir": "^1.0.0", "rimraf": "~2.2.6" +======= +<<<<<<< refs/remotes/origin/master + "os-tmpdir": "1.0.2", + "rimraf": "2.2.8" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "rimraf": { @@ -16971,6 +25070,12 @@ "resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=" } +======= + "array-filter": "0.0.1", + "array-map": "0.0.0", + "array-reduce": "0.0.0", + "jsonify": "0.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "term-size": { @@ -16979,7 +25084,17 @@ "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", "dev": true, "requires": { +<<<<<<< master "execa": "^0.7.0" +======= +<<<<<<< refs/remotes/origin/master + "execa": "0.7.0" +======= + "glob": "7.1.3", + "interpret": "1.1.0", + "rechoir": "0.6.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "terser": { @@ -16993,11 +25108,28 @@ "source-map-support": "~0.5.6" }, "dependencies": { +<<<<<<< refs/remotes/origin/master "commander": { "version": "2.17.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", "dev": true +======= + "base64-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz", + "integrity": "sha1-1kAMrBxMZgl22Q0HoENR2JOV9eg=" + }, + "plist": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz", + "integrity": "sha1-CjLKlIGxw2TpLhjcVch23p0B2os=", + "requires": { + "base64-js": "1.1.2", + "xmlbuilder": "8.2.2", + "xmldom": "0.1.27" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "source-map": { "version": "0.6.1", @@ -17013,6 +25145,7 @@ "integrity": "sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==", "dev": true, "requires": { +<<<<<<< master "cacache": "^11.0.2", "find-cache-dir": "^2.0.0", "schema-utils": "^1.0.0", @@ -17021,6 +25154,27 @@ "terser": "^3.8.1", "webpack-sources": "^1.1.0", "worker-farm": "^1.5.2" +======= +<<<<<<< refs/remotes/origin/master + "cacache": "11.3.2", + "find-cache-dir": "2.0.0", + "schema-utils": "1.0.0", + "serialize-javascript": "1.6.1", + "source-map": "0.6.1", + "terser": "3.14.1", + "webpack-sources": "1.3.0", + "worker-farm": "1.6.0" +======= + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.2", + "use": "3.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "find-cache-dir": { @@ -17029,9 +25183,19 @@ "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==", "dev": true, "requires": { +<<<<<<< master "commondir": "^1.0.1", "make-dir": "^1.0.0", "pkg-dir": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "3.0.0" +======= + "is-descriptor": "0.1.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "find-up": { @@ -17083,7 +25247,15 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { +<<<<<<< master "find-up": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "find-up": "3.0.0" +======= + "is-extendable": "0.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "source-map": { @@ -17100,11 +25272,25 @@ "integrity": "sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==", "dev": true, "requires": { +<<<<<<< master "arrify": "^1.0.1", "micromatch": "^2.3.11", "object-assign": "^4.1.0", "read-pkg-up": "^1.0.1", "require-main-filename": "^1.0.1" +======= +<<<<<<< refs/remotes/origin/master + "arrify": "1.0.1", + "micromatch": "2.3.11", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" +======= + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "find-up": { @@ -17123,11 +25309,23 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { +<<<<<<< master "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", "pify": "^2.0.0", "pinkie-promise": "^2.0.0", "strip-bom": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "graceful-fs": "4.1.15", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" +======= + "is-descriptor": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "parse-json": { @@ -17136,7 +25334,15 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { +<<<<<<< master "error-ex": "^1.2.0" +======= +<<<<<<< refs/remotes/origin/master + "error-ex": "1.3.2" +======= + "kind-of": "6.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "path-exists": { @@ -17145,7 +25351,15 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { +<<<<<<< master "pinkie-promise": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "pinkie-promise": "2.0.1" +======= + "kind-of": "6.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "path-type": { @@ -17154,9 +25368,21 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { +<<<<<<< master "graceful-fs": "^4.1.2", "pify": "^2.0.0", "pinkie-promise": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "graceful-fs": "4.1.15", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" +======= + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "read-pkg": { @@ -17196,8 +25422,17 @@ "resolved": "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz", "integrity": "sha1-Edpv9nDzRxpztiXKTz/c97t0gpE=", "requires": { +<<<<<<< master "array-back": "^1.0.3", "typical": "^2.6.0" +======= +<<<<<<< refs/remotes/origin/master + "array-back": "1.0.4", + "typical": "2.6.1" +======= + "kind-of": "3.2.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "array-back": { @@ -17205,28 +25440,69 @@ "resolved": "http://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", "requires": { +<<<<<<< master "typical": "^2.6.0" +======= +<<<<<<< refs/remotes/origin/master + "typical": "2.6.1" +======= + "is-buffer": "1.1.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } }, +<<<<<<< refs/remotes/origin/master "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true +======= + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "source-map-resolve": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", + "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", + "requires": { + "atob": "2.1.2", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "then-request": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/then-request/-/then-request-2.2.0.tgz", "integrity": "sha1-ZnizL6DKIY/laZgbvYhxtZQGDYE=", "requires": { +<<<<<<< master "caseless": "~0.11.0", "concat-stream": "^1.4.7", "http-basic": "^2.5.1", "http-response-object": "^1.1.0", "promise": "^7.1.1", "qs": "^6.1.0" +======= +<<<<<<< refs/remotes/origin/master + "caseless": "0.11.0", + "concat-stream": "1.6.2", + "http-basic": "2.5.1", + "http-response-object": "1.1.0", + "promise": "7.3.1", + "qs": "6.5.2" +======= + "buffer-from": "1.1.1", + "source-map": "0.6.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "caseless": { @@ -17236,10 +25512,26 @@ } } }, +<<<<<<< refs/remotes/origin/master "throat": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz", "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=" +======= + "source-map-url": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" + }, + "spdx-correct": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", + "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "requires": { + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.3" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "through": { "version": "2.3.8", @@ -17251,8 +25543,18 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "requires": { +<<<<<<< master "readable-stream": "~2.3.6", "xtend": "~4.0.1" +======= +<<<<<<< refs/remotes/origin/master + "readable-stream": "2.3.6", + "xtend": "4.0.1" +======= + "spdx-exceptions": "2.2.0", + "spdx-license-ids": "3.0.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "time-stamp": { @@ -17266,7 +25568,34 @@ "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", "dev": true, "requires": { +<<<<<<< master "setimmediate": "^1.0.4" +======= +<<<<<<< refs/remotes/origin/master + "setimmediate": "1.0.5" +======= + "extend-shallow": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "tinymask": { @@ -17279,7 +25608,23 @@ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "requires": { +<<<<<<< master "os-tmpdir": "~1.0.2" +======= +<<<<<<< refs/remotes/origin/master + "os-tmpdir": "1.0.2" +======= + "asn1": "0.2.4", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.2", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.2", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "safer-buffer": "2.1.2", + "tweetnacl": "0.14.5" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "tmpl": { @@ -17308,7 +25653,16 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { +<<<<<<< master "kind-of": "^3.0.2" +======= +<<<<<<< refs/remotes/origin/master + "kind-of": "3.2.2" +======= + "define-property": "0.2.5", + "object-copy": "0.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "kind-of": { @@ -17316,7 +25670,15 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { +<<<<<<< master "is-buffer": "^1.1.5" +======= +<<<<<<< refs/remotes/origin/master + "is-buffer": "1.1.6" +======= + "is-descriptor": "0.1.6" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -17326,10 +25688,22 @@ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { +<<<<<<< master "define-property": "^2.0.2", "extend-shallow": "^3.0.2", "regex-not": "^1.0.2", "safe-regex": "^1.1.0" +======= +<<<<<<< refs/remotes/origin/master + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" +======= + "astral-regex": "1.0.0", + "strip-ansi": "4.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "extend-shallow": { @@ -17346,7 +25720,15 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { +<<<<<<< master "is-plain-object": "^2.0.4" +======= +<<<<<<< refs/remotes/origin/master + "is-plain-object": "2.0.4" +======= + "ansi-regex": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -17356,8 +25738,18 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "requires": { +<<<<<<< master "is-number": "^3.0.0", "repeat-string": "^1.6.1" +======= +<<<<<<< refs/remotes/origin/master + "is-number": "3.0.0", + "repeat-string": "1.6.1" +======= + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "is-number": { @@ -17373,19 +25765,49 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { +<<<<<<< master "is-buffer": "^1.1.5" +======= +<<<<<<< refs/remotes/origin/master + "is-buffer": "1.1.6" +======= + "ansi-regex": "3.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } }, +<<<<<<< refs/remotes/origin/master "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "dev": true, "requires": { +<<<<<<< master "psl": "^1.1.28", "punycode": "^2.1.1" +======= + "psl": "1.1.31", + "punycode": "2.1.1" +======= + "string_decoder": { + "version": "1.1.1", + "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "5.1.2" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "tr46": { @@ -17394,7 +25816,15 @@ "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", "dev": true, "requires": { +<<<<<<< master "punycode": "^2.1.0" +======= +<<<<<<< refs/remotes/origin/master + "punycode": "2.1.1" +======= + "is-natural-number": "4.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "trim-right": { @@ -17419,7 +25849,17 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { +<<<<<<< master "safe-buffer": "^5.0.1" +======= +<<<<<<< refs/remotes/origin/master + "safe-buffer": "5.1.2" +======= + "concat-stream": "1.6.2", + "http-response-object": "1.1.0", + "then-request": "2.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "tweetnacl": { @@ -17433,7 +25873,32 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { +<<<<<<< master "prelude-ls": "~1.1.2" +======= +<<<<<<< refs/remotes/origin/master + "prelude-ls": "1.1.2" +======= + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "chalk": "1.1.3", + "lodash": "4.17.11", + "slice-ansi": "0.0.4", + "string-width": "2.1.1" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "type-is": { @@ -17442,6 +25907,7 @@ "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "media-typer": "0.3.0", "mime-types": "~2.1.18" } @@ -17450,6 +25916,37 @@ "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" +======= + "chownr": "1.1.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.5", + "minizlib": "1.2.1", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.3" + }, + "dependencies": { + "yallist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" + } + } + }, + "tar-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", + "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", + "requires": { + "bl": "1.2.2", + "buffer-alloc": "1.2.0", + "end-of-stream": "1.4.1", + "fs-constants": "1.0.0", + "readable-stream": "2.3.6", + "to-buffer": "1.1.1", + "xtend": "4.0.1" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "typical": { "version": "2.6.1", @@ -17466,8 +25963,18 @@ "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", "requires": { +<<<<<<< master "commander": "~2.13.0", "source-map": "~0.6.1" +======= +<<<<<<< refs/remotes/origin/master + "commander": "2.13.0", + "source-map": "0.6.1" +======= + "os-tmpdir": "1.0.2", + "rimraf": "2.2.8" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "commander": { @@ -17492,8 +25999,14 @@ "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz", "integrity": "sha512-fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw==", "requires": { +<<<<<<< master "buffer": "^3.0.1", "through": "^2.3.6" +======= +<<<<<<< refs/remotes/origin/master + "buffer": "3.6.0", + "through": "2.3.8" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "unicode-canonical-property-names-ecmascript": { @@ -17535,13 +26048,93 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" +======= + "arrify": "1.0.1", + "micromatch": "2.3.11", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.15", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "1.3.2" + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.15", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { +<<<<<<< master "is-extendable": "^0.1.0" +======= +<<<<<<< refs/remotes/origin/master + "is-extendable": "0.1.1" +======= + "find-up": "1.1.2", + "read-pkg": "1.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "set-value": { @@ -17549,10 +26142,21 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "requires": { +<<<<<<< master "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", "is-plain-object": "^2.0.1", "to-object-path": "^0.3.0" +======= +<<<<<<< refs/remotes/origin/master + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" +======= + "is-utf8": "0.2.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } } } @@ -17563,7 +26167,26 @@ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { +<<<<<<< master "unique-slug": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "unique-slug": "2.0.1" +======= + "array-back": "1.0.4", + "typical": "2.6.1" + }, + "dependencies": { + "array-back": { + "version": "1.0.4", + "resolved": "http://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", + "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", + "requires": { + "typical": "2.6.1" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "unique-slug": { @@ -17572,7 +26195,27 @@ "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==", "dev": true, "requires": { +<<<<<<< master "imurmurhash": "^0.1.4" +======= +<<<<<<< refs/remotes/origin/master + "imurmurhash": "0.1.4" +======= + "caseless": "0.11.0", + "concat-stream": "1.6.2", + "http-basic": "2.5.1", + "http-response-object": "1.1.0", + "promise": "7.3.1", + "qs": "6.5.2" + }, + "dependencies": { + "caseless": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "universalify": { @@ -17590,8 +26233,14 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { +<<<<<<< master "has-value": "^0.3.1", "isobject": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "has-value": "0.3.1", + "isobject": "3.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "has-value": { @@ -17624,6 +26273,10 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } +======= + "readable-stream": "2.3.6", + "xtend": "4.0.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "upath": { @@ -17643,7 +26296,15 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "requires": { +<<<<<<< master "punycode": "^2.1.0" +======= +<<<<<<< refs/remotes/origin/master + "punycode": "2.1.1" +======= + "os-tmpdir": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "urix": { @@ -17657,6 +26318,7 @@ "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "punycode": "1.3.2", "querystring": "0.2.0" }, @@ -17666,6 +26328,18 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", "dev": true +======= + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, @@ -17675,9 +26349,16 @@ "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==", "dev": true, "requires": { +<<<<<<< master "loader-utils": "^1.1.0", "mime": "^2.0.3", "schema-utils": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "loader-utils": "1.2.3", + "mime": "2.4.0", + "schema-utils": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "mime": { @@ -17685,6 +26366,30 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", "dev": true +======= + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } } }, @@ -17693,8 +26398,36 @@ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz", "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==", "requires": { +<<<<<<< master "querystringify": "^2.0.0", "requires-port": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "querystringify": "2.1.0", + "requires-port": "1.0.0" +======= + "is-number": "3.0.0", + "repeat-string": "1.6.1" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "use": { @@ -17708,7 +26441,16 @@ "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", "dev": true, "requires": { +<<<<<<< master "os-homedir": "^1.0.0" +======= +<<<<<<< refs/remotes/origin/master + "os-homedir": "1.0.2" +======= + "psl": "1.1.31", + "punycode": "2.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "util": { @@ -17731,8 +26473,17 @@ "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", "dev": true, "requires": { +<<<<<<< master "define-properties": "^1.1.2", "object.getownpropertydescriptors": "^2.0.3" +======= +<<<<<<< refs/remotes/origin/master + "define-properties": "1.1.3", + "object.getownpropertydescriptors": "2.0.3" +======= + "punycode": "2.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "utila": { @@ -17756,8 +26507,17 @@ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "requires": { +<<<<<<< master "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" +======= +<<<<<<< refs/remotes/origin/master + "spdx-correct": "3.1.0", + "spdx-expression-parse": "3.0.0" +======= + "safe-buffer": "5.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "vary": { @@ -17777,10 +26537,21 @@ "integrity": "sha512-ZyXBm+9C/6kNUNyc+aeNKEhtTu/Mn+OfpsNBGuTxU8S2DUcis/KQL0rTN6jWL+7ygdOrun18qhheNZTA7YERmg==", "dev": true, "requires": { +<<<<<<< master "lodash": "^4.17.5", "prop-types": "^15.5.8", "react-transition-group": "^2.0.0", "velocity-animate": "^1.4.0" +======= +<<<<<<< refs/remotes/origin/master + "lodash": "4.17.11", + "prop-types": "15.6.2", + "react-transition-group": "2.5.2", + "velocity-animate": "1.5.2" +======= + "prelude-ls": "1.1.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "verror": { @@ -17799,7 +26570,24 @@ "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "indexof": "0.0.1" +======= + "commander": "2.13.0", + "source-map": "0.6.1" + }, + "dependencies": { + "commander": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", + "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==" + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "w3c-hr-time": { @@ -17816,7 +26604,16 @@ "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=", "requires": { +<<<<<<< master "makeerror": "1.0.x" +======= +<<<<<<< refs/remotes/origin/master + "makeerror": "1.0.11" +======= + "buffer": "3.6.0", + "through": "2.3.8" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "warning": { @@ -17833,8 +26630,18 @@ "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz", "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=", "requires": { +<<<<<<< master "exec-sh": "^0.2.0", "minimist": "^1.2.0" +======= +<<<<<<< refs/remotes/origin/master + "exec-sh": "0.2.2", + "minimist": "1.2.0" +======= + "unicode-canonical-property-names-ecmascript": "1.0.4", + "unicode-property-aliases-ecmascript": "1.0.4" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "watchpack": { @@ -17860,10 +26667,12 @@ "integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "@webassemblyjs/ast": "1.7.11", "@webassemblyjs/helper-module-context": "1.7.11", "@webassemblyjs/wasm-edit": "1.7.11", "@webassemblyjs/wasm-parser": "1.7.11", +<<<<<<< master "acorn": "^6.0.5", "acorn-dynamic-import": "^4.0.0", "ajv": "^6.1.0", @@ -17884,6 +26693,34 @@ "terser-webpack-plugin": "^1.1.0", "watchpack": "^1.5.0", "webpack-sources": "^1.3.0" +======= + "acorn": "5.7.3", + "acorn-dynamic-import": "3.0.0", + "ajv": "6.6.2", + "ajv-keywords": "3.2.0", + "chrome-trace-event": "1.0.0", + "enhanced-resolve": "4.1.0", + "eslint-scope": "4.0.0", + "json-parse-better-errors": "1.0.2", + "loader-runner": "2.3.1", + "loader-utils": "1.2.3", + "memory-fs": "0.4.1", + "micromatch": "3.1.10", + "mkdirp": "0.5.1", + "neo-async": "2.6.0", + "node-libs-browser": "2.1.0", + "schema-utils": "0.4.7", + "tapable": "1.1.1", + "terser-webpack-plugin": "1.2.1", + "watchpack": "1.6.0", + "webpack-sources": "1.3.0" +======= + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "acorn": { @@ -18058,6 +26895,7 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { +<<<<<<< master "array-unique": "^0.3.2", "define-property": "^1.0.0", "expand-brackets": "^2.1.4", @@ -18066,6 +26904,17 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.1" +======= +<<<<<<< refs/remotes/origin/master + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "define-property": { @@ -18086,6 +26935,9 @@ "is-extendable": "^0.1.0" } } +======= + "is-extendable": "0.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "fill-range": { @@ -18094,10 +26946,18 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { +<<<<<<< master "extend-shallow": "^2.0.1", "is-number": "^3.0.0", "repeat-string": "^1.6.1", "to-regex-range": "^2.1.0" +======= + "extend-shallow": "2.0.1", +<<<<<<< refs/remotes/origin/master + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "extend-shallow": { @@ -18146,7 +27006,47 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { +<<<<<<< master "kind-of": "^3.0.2" +======= + "kind-of": "3.2.2" +======= + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" + } + } + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + }, + "unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "requires": { + "has-value": "0.3.1", + "isobject": "3.0.1" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "requires": { + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "kind-of": { @@ -18211,10 +27111,18 @@ "integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==", "dev": true, "requires": { +<<<<<<< master "memory-fs": "~0.4.1", "mime": "^2.3.1", "range-parser": "^1.0.3", "webpack-log": "^2.0.0" +======= +<<<<<<< refs/remotes/origin/master + "memory-fs": "0.4.1", + "mime": "2.4.0", + "range-parser": "1.2.0", + "webpack-log": "2.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "mime": { @@ -18223,6 +27131,9 @@ "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", "dev": true } +======= + "punycode": "2.1.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "webpack-hot-middleware": { @@ -18231,10 +27142,21 @@ "integrity": "sha512-pPlmcdoR2Fn6UhYjAhp1g/IJy1Yc9hD+T6O9mjRcWV2pFbBjIFoJXhP0CoD0xPOhWJuWXuZXGBga9ybbOdzXpg==", "dev": true, "requires": { +<<<<<<< refs/remotes/origin/master "ansi-html": "0.0.7", +<<<<<<< master "html-entities": "^1.2.0", "querystring": "^0.2.0", "strip-ansi": "^3.0.0" +======= + "html-entities": "1.2.1", + "querystring": "0.2.0", + "strip-ansi": "3.0.1" +======= + "querystringify": "2.1.0", + "requires-port": "1.0.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "webpack-log": { @@ -18243,8 +27165,14 @@ "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", "dev": true, "requires": { +<<<<<<< master "ansi-colors": "^3.0.0", "uuid": "^3.3.2" +======= +<<<<<<< refs/remotes/origin/master + "ansi-colors": "3.2.3", + "uuid": "3.3.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "ansi-colors": { @@ -18253,6 +27181,9 @@ "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", "dev": true } +======= + "os-homedir": "1.0.2" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "webpack-sources": { @@ -18261,8 +27192,14 @@ "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", "dev": true, "requires": { +<<<<<<< master "source-list-map": "^2.0.0", "source-map": "~0.6.1" +======= +<<<<<<< refs/remotes/origin/master + "source-list-map": "2.0.1", + "source-map": "0.6.1" +>>>>>>> UPS8: Added ProfileView Form with header, footer }, "dependencies": { "source-map": { @@ -18271,6 +27208,44 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true } +======= + "define-properties": "1.1.3", + "object.getownpropertydescriptors": "2.0.3" + } + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "requires": { + "spdx-correct": "3.1.0", + "spdx-expression-parse": "3.0.0" + } + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "websocket-driver": { @@ -18279,8 +27254,34 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { +<<<<<<< master "http-parser-js": ">=0.4.0", "websocket-extensions": ">=0.1.1" +======= +<<<<<<< refs/remotes/origin/master + "http-parser-js": "0.5.0", + "websocket-extensions": "0.1.3" +======= + "browser-process-hrtime": "0.1.3" + } + }, + "walker": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", + "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=", + "requires": { + "makeerror": "1.0.11" + } + }, + "watch": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz", + "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=", + "requires": { + "exec-sh": "0.2.2", + "minimist": "1.2.0" +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "websocket-extensions": { @@ -18338,7 +27339,12 @@ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "requires": { +<<<<<<< master "string-width": "^1.0.2 || 2" +======= + "string-width": "2.1.1" +<<<<<<< refs/remotes/origin/master +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "widest-line": { @@ -18347,7 +27353,13 @@ "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", "dev": true, "requires": { +<<<<<<< master "string-width": "^2.1.1" +======= + "string-width": "2.1.1" +======= +>>>>>>> UPS8: Added ProfileView Form with header, footer +>>>>>>> UPS8: Added ProfileView Form with header, footer } }, "wordwrap": { diff --git a/package.json b/package.json index 6460759..3087cdc 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "react-native-flash-message": "^0.1.10", "react-native-gesture-handler": "^1.0.12", "react-native-masked-text": "^1.9.2", + "react-native-modal-dropdown": "^0.6.2", "react-native-vector-icons": "^4.6.0", "react-native-webview": "^2.14.3", "react-navigation": "^3.0.9", diff --git a/src/components/BizCard/BizCardView.js b/src/components/BizCard/BizCardView.js new file mode 100644 index 0000000..bcc4dae --- /dev/null +++ b/src/components/BizCard/BizCardView.js @@ -0,0 +1,60 @@ +/** Contains the base fields for a contact reuse **/ +import React, { Component } from 'react'; +import { View } from 'react-native'; +import { Tile } from 'react-native-elements'; +import { PROFILE_FORM, CONTACT_FORM, SOCIAL_FORM } from '../FormTypes'; +import { Spacer } from '../common'; +import { strings } from '../../locales/i18n'; +import styles from './styles'; + +// Since we have duplicate keys between contact and profile we can't use this.props +// so we track what has been populated here + +export default class BizCard extends Component { + + /** + * Renders the business card tile + **/ + renderBusinessCardTile() { + let base64 = ''; + if (this.props.formType === CONTACT_FORM) { + base64 = this.props.contactBizCardImg; + } else if (this.props.formType === PROFILE_FORM) { + base64 = this.props.profileBizCardImg; + } else if (this.props.formType === SOCIAL_FORM) { + base64 = this.props.socialBizCardImg; + } + if (base64) { + return ( + + ); + } + return ( + + ); + } + + /** + * Render method + **/ + render() { + return ( + + + {this.renderBusinessCardTile()} + + + ); + } +} + diff --git a/src/components/BizCard/styles.js b/src/components/BizCard/styles.js new file mode 100644 index 0000000..a762b64 --- /dev/null +++ b/src/components/BizCard/styles.js @@ -0,0 +1,37 @@ +import { colors, Dimensions } from '../styleVars'; + +const width = Dimensions.get('window').width * 0.9; +const height = width * 0.57; // ( 2 / 3.5 = 0.57) Business card dimensions + +const styles = { + tileContainerStyle: { + height, + width, + marginTop: 15, + marginBottom: 15 + }, + tileStyle: { + height, + width + }, + buttonContainerStyle: { + flex: 2, + marginTop: 15, + flexDirection: 'row', + justifyContent: 'center' + }, + halfButtonStyle: { + backgroundColor: colors.buttonBlue, + flex: 1, + borderRadius: 5 + }, + viewStyle: { + flex: 1, + flexDirection: 'column', + justifyContent: 'center', + alignItems: 'center' + }, + colors +}; + +export default styles; diff --git a/src/components/common/Footer.js b/src/components/common/Footer.js index 2d9d255..f195c79 100644 --- a/src/components/common/Footer.js +++ b/src/components/common/Footer.js @@ -2,24 +2,21 @@ import _ from 'lodash'; import React, { Component } from 'react'; import { Dimensions, Image, Text, View } from 'react-native'; -import { NavigationActions } from 'react-navigation'; import { Icon } from 'react-native-elements'; import ModalDropdown from 'react-native-modal-dropdown'; -import { connect } from 'react-redux'; import colors from '../../config/colors.json'; -import { profileFetch } from '../../actions'; const GREEN_CHECK_IMAGE = require('../../../assets/GreenCheck.png'); const SCREEN_WIDTH = Dimensions.get('window').width; let profileNames = []; -class Footer extends Component { +export default class Footer extends Component { /** * Component Will Mount **/ componentWillMount() { - this.props.profileFetch(); + //this.props.profileFetch(); } /** @@ -84,14 +81,14 @@ class Footer extends Component { * Navigates to the profile home screen for the given profile **/ processProfileSelection(idx) { - const resetAction = NavigationActions.reset({ - index: 0, - actions: [ - NavigationActions.navigate({ routeName: 'mainOptionsMenu', params: { profileIndex: idx, profileName: this.props.profiles[idx].profileName } }) - ] - }); + // const resetAction = NavigationActions.reset({ + // index: 0, + // actions: [ + // NavigationActions.navigate({ routeName: 'mainOptionsMenu', params: { profileIndex: idx, profileName: this.props.profiles[idx].profileName } }) + // ] + // }); - this.props.navigation.dispatch(resetAction); + // this.props.navigation.dispatch(resetAction); } /** @@ -307,17 +304,3 @@ const styles = { borderRadius: 15 } }; - -/** -* Map State to Props -**/ -const mapStateToProps = state => { - // converts Profile objects into profile arrays - const profiles = _.map(state.profiles, (val, uid) => { - return { ...val, uid }; - }); - - return { profiles }; -}; - -export default connect(mapStateToProps, { profileFetch })(Footer); diff --git a/src/components/forms/ProfileForms/ProfileForm.js b/src/components/forms/ProfileForms/ProfileForm.js new file mode 100644 index 0000000..08a8147 --- /dev/null +++ b/src/components/forms/ProfileForms/ProfileForm.js @@ -0,0 +1,86 @@ +import React, { Component } from 'react'; +import { Animated, View } from 'react-native'; +import ProfileViewForm from './ProfileViewForm'; +import { PROFILE_FORM } from '../../FormTypes'; +import { SCREEN_WIDTH } from './styles'; + +const DOTS_SIZE = ['first', 'second']; +const scrollX = new Animated.Value(0); + +export default class ProfileForm extends Component { + render() { + switch (this.props.profileFormMode) { + case 'view': + return ( + + + + ); + case 'edit': + return ( + + ); + case 'create': + return ( + + ); + default: + return ( + + ); + } + } +} diff --git a/src/components/forms/ProfileForm.js b/src/components/forms/ProfileForms/ProfileForm_old.js similarity index 95% rename from src/components/forms/ProfileForm.js rename to src/components/forms/ProfileForms/ProfileForm_old.js index 9409344..84ed906 100644 --- a/src/components/forms/ProfileForm.js +++ b/src/components/forms/ProfileForms/ProfileForm_old.js @@ -2,13 +2,13 @@ import React, { Component } from 'react'; import { Alert, Animated, Dimensions, ScrollView, Text, View } from 'react-native'; import { Button, Card, CheckBox, Divider, FormInput, Icon } from 'react-native-elements'; -import ProfileAvatar from '../ProfileAvatar'; -import BizCard from '../BizCard'; -import { Confirm, FormLabel, FormMessage, Keyword, Spacer, TextButton } from '../common'; -import { PROFILE_FORM } from '../FormTypes'; -import colors from '../../config/colors.json'; -import { strings } from '../../locales/i18n'; -import { toQueryString } from '../../utils/aux'; +import ProfileAvatar from '../../ProfileAvatar'; +import BizCard from '../../BizCard'; +import { Confirm, FormLabel, FormMessage, Keyword, Spacer, TextButton } from '../../common'; +import { PROFILE_FORM } from '../../FormTypes'; +import colors from '../../../config/colors.json'; +import { strings } from '../../../locales/i18n'; +import { toQueryString } from '../../../utils/aux'; const SCREEN_WIDTH = Dimensions.get('window').width; const DOTS_SIZE = ['first', 'second']; @@ -100,59 +100,6 @@ class ProfileForm extends Component { this.props.profileUpdate({ prop: 'keywords', value: newKeywordsArr }); } - /** - * Opens a webview for the user to login to LinkedIn - **/ - loginWithAuth0LinkedIn = async () => { - const redirectUrl = AuthSession.getRedirectUrl(); - - const result = await AuthSession.startAsync({ - authUrl: `${privateKeys.auth0.domain}/authorize` + toQueryString({ - connection: 'linkedin', - client_id: privateKeys.auth0.clientId, - response_type: 'token', - scope: 'openid profile', - audience: 'https://tagfer.com/gettwitteruser', //TODO CREATE AN APP FOR LINKEDIN - redirect_uri: redirectUrl - }), - }); - - if (result.type === 'success') { - this.handleParams(result.params); - } - } - - /** - * Uses the login response to get the LinkedIn data - **/ - handleParams = async (responseObj) => { - if (responseObj.error) { - Alert.alert('Error', responseObj.error_description || strings('common.error.loginFailed')); - return; - } - let nickname = ''; - const userInfo = await fetch(`${privateKeys.auth0.domain}/userinfo?access_token=${responseObj.access_token}`); - if (userInfo.status === 200) { - const parsedUserInfo = await userInfo.json(); - nickname = parsedUserInfo.nickname; - } else { - console.log('Something went wrong. ErrorCode: ', userInfo.status); - } - nickname = nickname.replace(/"/g, ''); - nickname = nickname.replace(/ /g, '+'); - - const userSearchResponse = await fetch(`${privateKeys.auth0.domain}/api/v2/users?q=nickname%3A%22${nickname}%22'`, { - method: 'GET', - headers: { - authorization: `Bearer ${privateKeys.auth0.managementToken}` - } - }); - - const userSearchParsed = await userSearchResponse.json(); - - this.extractLinkedInData(userSearchParsed); - } - /** * The search brings back an array and we need to find the user's LinkedIn data **/ diff --git a/src/components/forms/ProfileForms/ProfileViewForm.js b/src/components/forms/ProfileForms/ProfileViewForm.js new file mode 100644 index 0000000..4732252 --- /dev/null +++ b/src/components/forms/ProfileForms/ProfileViewForm.js @@ -0,0 +1,329 @@ +import React, { Component } from 'react'; +import { Animated, ScrollView, Text, View } from 'react-native'; +import { Card, CheckBox, Divider, Icon } from 'react-native-elements'; +import { FormLabel, Spacer } from '../../common'; +import { PROFILE_FORM } from '../../FormTypes'; +import BizCardView from '../../../components/BizCard/BizCardView'; +import styles from './styles'; +import { Keyword } from './../../common/Keyword'; +import { strings } from '../../../locales/i18n'; + +export default class ProfileViewForm extends Component { + constructor(props) { + super(props); + + this.renderKeywords = this.renderKeywords.bind(this); + } + + renderAboutSection() { + const defaultProfile = this.props.defaultProfile; + return ( + + + + + + + + + + + ); + } + + renderDetailsSection() { + const defaultProfile = this.props.defaultProfile; + return ( + + + + + + + + ); + } + + renderExperienceSection() { + const defaultProfile = this.props.defaultProfile; + // NORMAL - VIEW MODE + let isAddedExperienceEmpty = true; + console.log(`addedExperience: ${defaultProfile.addedExperience}`); + for (let i = 0; i < defaultProfile.addedExperience.length; i++) { + if (!isAddedExperienceEmpty) { + break; + } + // for (const property in defaultProfile.addedExperience[i]) { + // if (defaultProfile.addedExperience[i][property].length > 0) { + // isAddedExperienceEmpty = false; + // break; + // } + // } + } + + if (!isAddedExperienceEmpty) { + const experienceList = defaultProfile.addedExperience.map((data, index) => { + if (index > 0) { + return ( + + + + + + + + + ); + } + return ( + + + + + + + + ); + }); + + return ( + + + {experienceList} + + ); + } + } + + renderEducationSection() { + const defaultProfile = this.props.defaultProfile; + let isAddedEducationEmpty = true; + console.log(`addedEducation: ${defaultProfile.addedEducation}`); + for (let i = 0; i < defaultProfile.addedEducation.length; i++) { + if (!isAddedEducationEmpty) { + break; + } + // for (const property in defaultProfile.addedEducation[i]) { + // if (defaultProfile.addedEducation[i][property].length > 0) { + // isAddedEducationEmpty = false; + // break; + // } + // } + } + + if (!isAddedEducationEmpty) { + const educationList = defaultProfile.addedEducation.map((data, index) => { + if (index > 0) { + return ( + + + + + + + + + ); + } + return ( + + + + + + + + ); + }); + + return ( + + + {educationList} + + ); + } + } + + renderKeywordsSection() { + const defaultProfile = this.props.defaultProfile; + if (defaultProfile.keywords.length > 0) { + return ( + + + {this.renderKeywords()} + + + ); + } + } + + renderPhoneSection(phone, phoneLabel) { + if (!phone) { + return; + } + + return ( + + + + + ); + } + + renderWorkPhoneSection() { + const { workPhone, extension } = this.props.defaultProfile; + console.log(`Work Phone: ${workPhone}`); + console.log(`Extension: ${extension}`); + if (!workPhone && !extension) { + return; + } + + return ( + + + + + + + + ); + } + + /** + * Renders each keyword onto the screen + **/ + renderKeywords() { + const keywords = this.props.defaultProfile.keywords; + return keywords.map((data, index) => + ( + this.removeKeyword(index)} + displayX={this.props.isEditMode} + index={index} + /> + )); + } + + renderAvatarBizCardSlider() { + return ( + + + + {/* */} + {this.renderDetailsSection()} + + + + + + + + {/* + {this.props.DOTS_SIZE.map((_, i) => { + const opacity = this.props.position.interpolate({ + inputRange: [i - 1, i, i + 1], + outputRange: [0.3, 1, 0.3], + extrapolate: 'clamp' + }); + + return ( + + ); + })} + + */} + + ); + } + + renderEmailSection() { + const { email } = this.props.defaultProfile; + if (!email) { + return; + } + + return ( + + + + + ); + } + + renderWebsiteSection() { + const { website } = this.props.defaultProfile; + if (!website) { + return; + } + + return ( + + + + + ); + } + + renderAddressSection() { + const { street, address2, city, region, postalCode, country } = this.props.defaultProfile; + if (!street && !address2 && !city && !region && !postalCode && !country) { + return; + } + + return ( + + + + + + + + + + ); + } + + render() { + return ( + + {this.renderAvatarBizCardSlider()} + {this.renderAboutSection()} + {this.renderExperienceSection()} + + {this.renderEducationSection()} + + {this.renderWebsiteSection()} + {this.renderAddressSection()} + {this.renderPhoneSection(this.props.defaultProfile.primaryPhone, strings('common.contactFields.phone_primary_labelText'))} + {this.renderPhoneSection(this.props.defaultProfile.secondaryPhone, strings('common.contactFields.phone_secondary_labelText'))} + {this.renderWorkPhoneSection()} + {this.renderPhoneSection(this.props.defaultProfile.fax, strings('common.contactFields.fax_labelText'))} + + {this.renderEmailSection()} + {this.renderKeywordsSection()} + + + ); + } +} diff --git a/src/components/forms/ProfileForms/styles.js b/src/components/forms/ProfileForms/styles.js new file mode 100644 index 0000000..6dc170a --- /dev/null +++ b/src/components/forms/ProfileForms/styles.js @@ -0,0 +1,93 @@ +import { SCREEN_WIDTH, colors } from '../../styleVars'; + +const styles = { + slideStyle: { + width: SCREEN_WIDTH, + }, + detailsSectionStyle: { + backgroundColor: colors.white, + borderBottomWidth: 1, + borderColor: colors.middleGrey + }, + dividerStyle: { + backgroundColor: colors.middleGrey, + marginTop: 10, + marginBottom: 15 + }, + textBoxStyles: { + flex: 1, + width: '100%', + color: colors.black + }, + inputAndButtonRow: { + flex: 2, + marginTop: 15, + flexDirection: 'row', + justifyContent: 'center', + alignItems: 'center', + }, + halfInputStyle: { + flex: 1 + }, + keywordInputTextStyle: { + width: '100%', + }, + halfButtonStyle: { + backgroundColor: colors.buttonBlue, + flex: 1, + borderRadius: 5 + }, + centeredInputContainerStyle: { + borderBottomWidth: 0, + marginLeft: 15, + marginRight: 0 + }, + centeredInputTextStyle: { + textAlign: 'center', + color: colors.black + }, + centeredTextBoxStyles: { + textAlign: 'center', + flex: 1, + width: '100%', + color: colors.black + }, + inputTextStyle: { + width: '100%', + color: colors.black + }, + nameTextStyle: { + fontSize: 22, + fontWeight: 'bold' + }, + keywordViewStyle: { + flex: 1, + flexDirection: 'row', + flexWrap: 'wrap' + }, + keywordStyle: { + borderWidth: 1, + borderColor: colors.middleGrey, + borderRadius: 15, + }, + checkboxRowStyle: { + flex: 1, + flexDirection: 'row', + justifyContent: 'flex-start' + }, + helpIconStyle: { + paddingLeft: 15, + marginRight: -10 + }, + educationNumberTextStyle: { + color: colors.orange, + fontSize: 15, + fontWeight: 'bold', + marginHorizontal: 10, + alignSelf: 'center' + }, + colors, + SCREEN_WIDTH +}; + +export default styles; diff --git a/src/components/styleVars.js b/src/components/styleVars.js new file mode 100644 index 0000000..0078323 --- /dev/null +++ b/src/components/styleVars.js @@ -0,0 +1,6 @@ +import { Dimensions } from 'react-native'; +import colors from '../config/colors.json'; + +const SCREEN_WIDTH = Dimensions.get('window').width; + +module.exports = { SCREEN_WIDTH, colors, Dimensions }; diff --git a/src/config/apiEndpoints.js b/src/config/apiEndpoints.js index b29f775..841a9d5 100644 --- a/src/config/apiEndpoints.js +++ b/src/config/apiEndpoints.js @@ -51,7 +51,11 @@ const endpoints = { linkedInLogin: { method: 'GET', url: `${baseurl}/auth/linkedin/login` - } + }, + getUserProfile: (profileNumber) => ({ + method: 'GET', + url: `${baseurl}/profiles/${profileNumber}` + }) }; export default endpoints; diff --git a/src/config/router.js b/src/config/router.js index 9e6133f..d8ca4c8 100644 --- a/src/config/router.js +++ b/src/config/router.js @@ -15,8 +15,10 @@ import ForgotPasswordScreen from '../screens/auth/ForgotPasswordScreen'; // PROFILE IMPORTS import ProfileQRCodeScanner from '../screens/profile/ProfileQRCodeScanner'; import ProfileSearchScreen from '../screens/profile/ProfileSearchScreen'; +import ProfileHomeScreen from '../screens/profile/ProfileHomeScreen'; const MainNavigator = createStackNavigator({ + profileHome: ProfileHomeScreen, welcome: WelcomeScreen, login: LoginScreen, forgotPassword: ForgotPasswordScreen, diff --git a/src/screens/profile/ProfileHomeScreen.js b/src/screens/profile/ProfileHomeScreen.js new file mode 100644 index 0000000..7fe6871 --- /dev/null +++ b/src/screens/profile/ProfileHomeScreen.js @@ -0,0 +1,111 @@ +/** Main screen for viewing profiles **/ +import React, { Component } from 'react'; +import { KeyboardAvoidingView, Platform, ScrollView, View } from 'react-native'; +import { Button } from 'react-native-elements'; +import Footer from '../../components/common/Footer'; +import HeaderRight from '../../components/common/HeaderRight'; +import { Spacer } from '../../components/common'; +import ProfileForm from '../../components/forms/ProfileForms/ProfileForm'; +import { getUserProfiles } from '../../utils/profile'; +import { showFlashErrorMessage } from '../../utils/errorHandler'; +import styles from './styles'; + +export default class ProfileHomeScreen extends Component { + static navigationOptions = ({ navigation }) => + ({ + title: 'Business Profile', + headerLeft: ( +