Merge branch 'develop' of https://github.com/MetaMask/metamask-extension

into i#5956-fix1
MetaMask · Jan 17, 2019 · b4284ad · b4284ad
2 parents 4551b9a + de0ac53
commit b4284ad
Show file tree

Hide file tree

Showing 27 changed files with 861 additions and 388 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,10 +28,10 @@ workflows:
           requires:
             - prep-deps-npm
             - prep-build
-      - test-e2e-beta-drizzle:
-          requires:
-            - prep-deps-npm
-            - prep-build
+      # - test-e2e-beta-drizzle:
+      #     requires:
+      #       - prep-deps-npm
+      #       - prep-build
       - test-unit:
           requires:
             - prep-deps-npm
@@ -54,7 +54,7 @@ workflows:
             - test-mozilla-lint
             - test-e2e-beta-chrome
             - test-e2e-beta-firefox
-            - test-e2e-beta-drizzle
+            # - test-e2e-beta-drizzle
             - test-integration-flat-chrome
             - test-integration-flat-firefox
       - job-screens:
@@ -176,19 +176,19 @@ jobs:
           name: Test
           command: sudo npm install -g npm@6 && npm audit
 
-  test-e2e-beta-drizzle:
-    docker:
-      - image: circleci/node:8.11.3-browsers
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: test:e2e:drizzle:beta
-          command: npm run test:e2e:drizzle:beta
-      - store_artifacts:
-          path: test-artifacts
-          destination: test-artifacts
+  # test-e2e-beta-drizzle:
+  #   docker:
+  #     - image: circleci/node:8.11.3-browsers
+  #   steps:
+  #     - checkout
+  #     - attach_workspace:
+  #         at: .
+  #     - run:
+  #         name: test:e2e:drizzle:beta
+  #         command: npm run test:e2e:drizzle:beta
+  #     - store_artifacts:
+  #         path: test-artifacts
+  #         destination: test-artifacts
   test-e2e-beta-chrome:
     docker:
       - image: circleci/node:8.11.3-browsers

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 ## Current Develop Branch
 
+## 5.3.1 Wed Jan 16 2019
+
+- [#5966](https://github.com/MetaMask/metamask-extension/pull/5966): Update Slovenian translation
+- [#6005](https://github.com/MetaMask/metamask-extension/pull/6005): Set auto conversion off for token/eth conversion
+- [#6008](https://github.com/MetaMask/metamask-extension/pull/6008): Fix confirm screen for sending ether tx with hex data
+- [#5999](https://github.com/MetaMask/metamask-extension/pull/5999): Refine app description
+- [#5997](https://github.com/MetaMask/metamask-extension/pull/5997): Harden Drizzle test runner script
+- [#5995](https://github.com/MetaMask/metamask-extension/pull/5995): Fix bug where MetaMask user calls non-standard ERC20 methods such as `mint`, `tokenData` will be `undefined` and an uncaught error will break the UI
+- [#5970](https://github.com/MetaMask/metamask-extension/pull/5970): Fixed a word in french translation (several occurrences of connection instead of connexion)
+- [#5977](https://github.com/MetaMask/metamask-extension/pull/5977): Fix Component#componentDidUpdate usage
+- [#5992](https://github.com/MetaMask/metamask-extension/pull/5992): Add scrolling button to account list
+- [#5989](https://github.com/MetaMask/metamask-extension/pull/5989): fix typo in phishing.html title
+
+## 5.3.0 Wed Jan 02 2019
+
+- [#5978](https://github.com/MetaMask/metamask-extension/pull/5978): Fix etherscan links on notifications
+- [#5980](https://github.com/MetaMask/metamask-extension/pull/5980): Fix drizzle tests
+- [#5922](https://github.com/MetaMask/metamask-extension/pull/5922): Prevent users from changing the From field in the send screen
+- [#5932](https://github.com/MetaMask/metamask-extension/pull/5932): Fix displayed time and date in the activity log. Remove vreme library, add luxon library.
+- [#5924](https://github.com/MetaMask/metamask-extension/pull/5924): transactions - throw an error if a transaction is generated while the network is loading
+- [#5893](https://github.com/MetaMask/metamask-extension/pull/5893): Add loading network screen
+
 ## 5.2.2 Wed Dec 12 2018
 
 - [#5925](https://github.com/MetaMask/metamask-extension/pull/5925): Fix speed up button not showing for transactions with the lowest nonce

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
@@ -102,7 +102,7 @@
     "message": "Amount + TX Fee"
   },
   "appDescription": {
-    "message": "Ethereum Browser Extension",
+    "message": "An Ethereum Wallet in your Browser",
     "description": "The description of the application"
   },
   "appName": {
@@ -318,8 +318,8 @@
     "message": "Crypto",
     "description": "Exchange type (cryptocurrencies)"
   },
-  "currentConversion": {
-    "message": "Current Conversion"
+  "currencyConversion": {
+    "message": "Currency Conversion"
   },
   "currentLanguage": {
     "message": "Current Language"

diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
@@ -204,22 +204,22 @@
     "message": "Connecter"
   },
   "connecting": {
-    "message": "Connection..."
+    "message": "Connexion..."
   },
   "connectingToKovan": {
-    "message": "Connection au réseau de test Kovan"
+    "message": "Connexion au réseau de test Kovan"
   },
   "connectingToMainnet": {
-    "message": "Connection au réseau principal Ethereum"
+    "message": "Connexion au réseau principal Ethereum"
   },
   "connectingToRopsten": {
-    "message": "Connection au réseau de test Ropsten"
+    "message": "Connexion au réseau de test Ropsten"
   },
   "connectingToRinkeby": {
-    "message": "Connection au réseau de test Rinkeby"
+    "message": "Connexion au réseau de test Rinkeby"
   },
   "connectingToUnknown": {
-    "message": "Connection à un réseau inconnu"
+    "message": "Connexion à un réseau inconnu"
   },
   "connectToLedger": {
     "message": "Connecter un Ledger"