Merge branch 'master' into testing

4 files changed, 195 insertions, 0 deletions

diff --git a/development/states/currency-localization.json b/development/states/currency-localization.json
new file mode 100644
index 000000000..302e24c11
--- /dev/null
+++ b/development/states/currency-localization.json
@@ -0,0 +1,134 @@
+{
+  "metamask": {
+    "isInitialized": true,
+    "isUnlocked": true,
+    "featureFlags": {"betaUI": true},
+    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "identities": {
+      "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
+        "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+        "name": "Send Account 1"
+      },
+      "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
+        "address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
+        "name": "Send Account 2"
+      },
+      "0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
+        "address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
+        "name": "Send Account 3"
+      },
+      "0xd85a4b6a394794842887b8284293d69163007bbb": {
+        "address": "0xd85a4b6a394794842887b8284293d69163007bbb",
+        "name": "Send Account 4"
+      }
+    },
+    "unapprovedTxs": {},
+    "currentCurrency": "USD",
+    "conversionRate": 19855,
+    "conversionDate": 1489013762,
+    "noActiveNotices": true,
+    "frequentRpcList": [],
+    "network": "3",
+    "accounts": {
+      "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
+        "code": "0x",
+        "balance": "0x47c9d71831c76efe",
+        "nonce": "0x1b",
+        "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
+      },
+      "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
+        "code": "0x",
+        "balance": "0x37452b1315889f80",
+        "nonce": "0xa",
+        "address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"
+      },
+      "0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
+        "code": "0x",
+        "balance": "0x30c9d71831c76efe",
+        "nonce": "0x1c",
+        "address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
+      },
+      "0xd85a4b6a394794842887b8284293d69163007bbb": {
+        "code": "0x",
+        "balance": "0x0",
+        "nonce": "0x0",
+        "address": "0xd85a4b6a394794842887b8284293d69163007bbb"
+      }
+    },
+    "addressBook": [
+      {
+        "address": "0x06195827297c7a80a443b6894d3bdb8824b43896",
+        "name": "Address Book Account 1"
+      }
+    ],
+    "tokens": [],
+    "transactions": {},
+    "selectedAddressTxList": [],
+    "unapprovedMsgs": {},
+    "unapprovedMsgCount": 0,
+    "unapprovedPersonalMsgs": {},
+    "unapprovedPersonalMsgCount": 0,
+    "keyringTypes": [
+      "Simple Key Pair",
+      "HD Key Tree"
+    ],
+    "keyrings": [
+      {
+        "type": "HD Key Tree",
+        "accounts": [
+          "fdea65c8e26263f6d9a1b5de9555d2931a33b825",
+          "c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
+          "2f8d4a878cfa04a6e60d46362f5644deab66572d"
+        ]
+      },
+      {
+        "type": "Simple Key Pair",
+        "accounts": [
+          "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
+        ]
+      }
+    ],
+    "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+    "currentCurrency": "PHP",
+    "provider": {
+      "type": "testnet"
+    },
+    "shapeShiftTxList": [],
+    "lostAccounts": [],
+    "send": {
+      "gasLimit": null,
+      "gasPrice": null,
+      "gasTotal": "0xb451dc41b578",
+      "tokenBalance": null,
+      "from": "",
+      "to": "",
+      "amount": "0x0",
+      "memo": "",
+      "errors": {},
+      "maxModeOn": false,
+      "editingTransactionId": null
+    },
+    "currentLocale": "en"
+  },
+  "appState": {
+    "menuOpen": false,
+    "currentView": {
+      "name": "accountDetail",
+      "detailView": null,
+      "context": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"
+    },
+    "accountDetail": {
+      "subview": "transactions"
+    },
+    "modal": {
+      "modalState": {},
+      "previousModalState": {}
+    },
+    "transForward": true,
+    "isLoading": false,
+    "warning": null,
+    "scrollToBottom": false,
+    "forgottenPassword": null
+  },
+  "identities": {}
+}
diff --git a/development/tools/.jsdoc.json b/development/tools/.jsdoc.json
new file mode 100644
index 000000000..fd90bf89f
--- /dev/null
+++ b/development/tools/.jsdoc.json
@@ -0,0 +1,25 @@
+{
+    "tags": {
+        "allowUnknownTags": false
+    },
+    "source": {
+        "include": "app/scripts/",
+        "includePattern": ".js$",
+        "excludePattern": "(node_modules/|docs)"
+    },
+    "plugins": [
+        "plugins/markdown"
+    ],
+    "opts": {
+        "template": "node_modules/radgrad-jsdoc-template/",
+        "encoding": "utf8",
+        "destination": "docs/jsdocs",
+        "recurse": true,
+        "verbose": true
+    },
+    "templates": {
+        "cleverLinks": false,
+        "monospaceLinks": false
+    }
+}
+
diff --git a/development/tools/README.md b/development/tools/README.md
new file mode 100644
index 000000000..caef51fe6
--- /dev/null
+++ b/development/tools/README.md
@@ -0,0 +1,15 @@
+# Development Tools & Configurations
+
+This folder contains configuration files which are used by the the different
+development-tools, like e.g. JsDoc.
+
+
+## Appveyor
+
+
+https://www.appveyor.com/docs/build-configuration/#alternative-yaml-file-location
+
+Withtin the configuration, point to a weblocation of a txt config file:
+
+https://ci.appveyor.com/project/lazaridiscom/mm-vault/settings
+https://raw.githubusercontent.com/lazaridiscom/mm-vault/master/dev/tools/appveyor.txt
diff --git a/development/tools/appveyor.txt b/development/tools/appveyor.txt
new file mode 100644
index 000000000..4ed974079
--- /dev/null
+++ b/development/tools/appveyor.txt
@@ -0,0 +1,21 @@
+# Test against the latest version of this Node.js version
+environment:
+  nodejs_version: "8"
+
+# Install scripts. (runs after repo cloning)
+install:
+  # Get the latest stable version of Node.js or io.js
+  - ps: Install-Product node $env:nodejs_version
+  # install modules
+  - npm install
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - node --version
+  - npm --version
+  # run tests
+  - npm test
+
+# Don't actually build.
+build: off