Dan Finlay
abe8bc19a8
Merge branch 'master' into i18n
2018-03-06 20:13:53 -08:00
Dan
2420ad2477
Correct merge conflict resolution errors.
2018-03-06 22:26:13 -03:30
Thomas Huang
5ebdb215ae
Merge pull request #3458 from MetaMask/version-4.2.0
...
Version 4.2.0
2018-03-06 20:51:53 -05:00
kumavis
e91a521b1b
Version 4.2.0
2018-03-06 17:30:12 -08:00
kumavis
d901268475
Merge pull request #3335 from MetaMask/ImportAccountMessageV2
...
Import account disclaimer and change loose label to imported.
2018-03-06 17:25:49 -08:00
kumavis
8a444ec96f
Merge pull request #3259 from MetaMask/controllerStubs
...
Offline testing
2018-03-06 17:21:36 -08:00
kumavis
6a9ca29244
Merge branch 'master' into ImportAccountMessageV2
2018-03-06 17:13:57 -08:00
kumavis
8e0131cbb5
Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording
...
Replace Lock wording with Log Out / Log In
2018-03-06 17:12:32 -08:00
kumavis
36c5bf203e
Merge pull request #3411 from MetaMask/AutoVersionBump
...
Clean up run version bump script
2018-03-06 17:11:49 -08:00
Dan
7c2257e09c
Missing comma in messages.json
2018-03-06 21:25:30 -03:30
Dan
9d215bab0f
Merge branch 'master' into i18n
2018-03-06 20:45:45 -03:30
Dan Finlay
f06bca1151
Implemented feedback to make i18n work on mac
2018-03-06 15:32:35 -08:00
Dan Finlay
9762a73041
Merge pull request #3433 from danjm/i3087-shapeshift-split-undefined
...
Shapeshift form handles 'market info unavailable' errors.
2018-03-06 15:07:51 -08:00
Dan Finlay
52b4876cf9
Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit
...
Gracefully handle null token balance in new ui send.
2018-03-06 15:05:43 -08:00
Dan Finlay
31e7d9263f
Merge pull request #3444 from danjm/i3348-minus-not-a-number
...
Prevent user from selecting max amount until gas is estimated.
2018-03-06 15:05:25 -08:00
Dan Finlay
cb4ad60800
Merge branch 'master' into i2475-UnifyLogInWording
2018-03-06 14:57:01 -08:00
Dan Finlay
b87687110d
Replace Lock wording with Log Out / Log In
...
Fixes #2475
2018-03-06 14:51:26 -08:00
Dan J Miller
303801d276
Ensure this reference is defined in old-ui info.js ( #3450 )
2018-03-06 10:45:40 -08:00
Dan J Miller
5ac330a89e
Default add-token decimal value to string ( #3451 )
2018-03-06 15:15:26 -03:30
Dan Finlay
a4bd7992cd
Merge branch 'master' into ImportAccountMessageV2
2018-03-06 10:32:47 -08:00
Dan Finlay
dd9cac69ae
Merge pull request #3309 from scsaba/edge-support
...
Add Edge Support
2018-03-06 09:39:57 -08:00
Dan
376ffb758f
Shapeshift form handles market info unavailable errors.
2018-03-06 13:49:41 -03:30
Alexander Tseung
5f8a632fec
Fix seed phrase validation clearing form ( #3417 )
...
* Fix seed phrase validation clearing form
* Make new ui import seed error feedback live, and allow newlines with and without carriage returns.
2018-03-06 09:14:57 -08:00
Dan J Miller
9734969e5d
Add missed changelog updates. ( #3407 )
2018-03-06 10:51:21 -03:30
Csaba Solya
d8038c0de0
add browserify-unibabel to package.json
2018-03-06 09:23:43 +01:00
Dan
462d57cb6a
Gracefully handle null token balance in new ui send.
2018-03-06 00:23:29 -03:30
Dan
68604b53dd
Prevent user from selecting max amount until there is an estimated gas total.
2018-03-05 23:12:06 -03:30
Dan J Miller
1bd18cebd7
Fixes shapeshift coin selection dropdown. ( #3416 )
2018-03-05 13:33:46 -03:30
Thomas Huang
d3a0a27c0c
Merge branch 'master' into ImportAccountMessageV2
2018-03-02 18:26:52 -08:00
Thomas
ee254b4f6f
Import Account disclaimer
2018-03-02 18:24:09 -08:00
Thomas
6f8077f587
Swap color scheme for import account label
2018-03-02 18:23:27 -08:00
Dan J Miller
0d97ff2210
Fix NewUI reveal seed flow. ( #3410 )
2018-03-02 22:44:05 -03:30
Dan Finlay
bdbe299069
Clean up run version bump script
2018-03-02 17:16:17 -08:00
Dan J Miller
0c163dcb32
Allow adding 0 balance tokens in old ui and editing custom token info in new ( #3395 )
...
* Shows tokens with 0 balance in old ui; goHome after adding tokens.
* Allow users to edit custom token info when not autofilled. (New UI add token screen).
2018-03-02 19:07:25 -03:30
kumavis
6574f0b57b
Merge pull request #3398 from MetaMask/AutoVersionBump
...
Add version bumping script
2018-03-02 14:31:53 -08:00
Dan Finlay
3a9b3794eb
Remove logs
2018-03-02 14:01:53 -08:00
Dan Finlay
bf17d7e115
Add version bumping script
...
One step towards automating our deploy process is automating our version
bumping scheme. This PR does that.
2018-03-02 13:55:56 -08:00
kumavis
996036628f
Merge pull request #3396 from MetaMask/Version-4.1.3
...
Version 4.1.3
2018-03-02 13:04:06 -08:00
Dan Finlay
452c5d0513
Version 4.1.3
2018-03-02 12:47:40 -08:00
Thomas Huang
cb109a8233
Add retry transaction back into old ui transaction list item ( #3381 )
...
* Add retry transaction back into old ui transaction list item
* Update Changelog
2018-03-02 16:38:13 -03:30
Thomas Huang
97dd993606
Merge pull request #3394 from MetaMask/i3372-PreserveInpageProviderName
...
Fix inpage provider name regression
2018-03-02 10:56:39 -08:00
Dan Finlay
81fa0742f7
Fix inpage provider name regression
...
Fixes #3372 by not minifying the name of our inpage provider, which some
people were using to identify MetaMask (not our preferred, supported
method of web3.currentProvider.isMetaMask).
2018-03-02 10:32:53 -08:00
Alexander Tseung
f22dfd4ae8
Fix network menu for custom URLs ( #3366 )
2018-03-01 17:42:10 -03:30
Alexander Tseung
ace4f0d998
Fix exception thrown when styleOverride is not present ( #3364 )
2018-03-01 17:41:35 -03:30
Kevin Serrano
923c702164
Merge pull request #3356 from MetaMask/cdn-minimization
...
Check in all font files locally.
2018-03-01 12:30:03 -08:00
Dan
94a60fe4a9
Correct ttf format name to 'truetype'
2018-03-01 16:36:27 -03:30
Thomas Huang
c49c8130a3
Merge pull request #3363 from MetaMask/4.1.2
...
4.1.2
2018-02-28 16:23:07 -08:00
kumavis
00cd5a340d
4.1.2
2018-02-28 16:11:58 -08:00
Thomas Huang
98bd06f331
Merge pull request #3361 from MetaMask/4.1.1
...
Version 4.1.1
2018-02-28 14:57:33 -08:00
kumavis
46d94a241c
Merge pull request #3359 from MetaMask/token-check-url
...
[new-ui] add token - check for logo url before trying to use
2018-02-28 14:55:42 -08:00
