1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-23 10:30:04 +01:00
Commit Graph

5413 Commits

Author SHA1 Message Date
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -08:00
Dan J Miller
f39222c9af
Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019
[NewUI] Merge uat to uatnext feb072019
2018-02-08 12:20:04 -03:30
Alexander Tseung
e9c2c0eec1
Make blockies icon round to match identicons (#3205) 2018-02-07 18:46:27 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan J Miller
c50a197ab9
Merge pull request #3203 from danjm/merge-master-to-uat-feb72018
Merge master to UAT feb72018
2018-02-07 21:18:10 -03:30
Dan J Miller
7f151b861c
[NewUI] Opens to full screen when restoring from seed. (#3201)
* Opens to full screen when restoring from seed.

* Remove redundant parameter in actions.markPasswordForgotten call.
2018-02-07 21:08:55 -03:30
Dan
6f14dc4702 Point add-token unit test to old-ui component. 2018-02-07 20:55:21 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
9db0a32dac
Update modal header design on send screen (#3196) 2018-02-06 21:07:00 -08:00
Dan J Miller
9ed3a5512e Fix alignment of ellipsis and address in wallet view. (#3198) 2018-02-06 16:51:32 -08:00
Dan J Miller
d84dc5da42 Remove duplicate token balance on uat next. (#3195) 2018-02-06 10:21:21 -08:00
Dan J Miller
a7bfea51e5 Integration tests for signature requests confirmations. (#3194) 2018-02-06 10:20:37 -08:00
Alexander Tseung
d452403322
Add functional integration testing to Add Token flow (#3189) 2018-02-05 18:47:46 -08:00
Dan J Miller
d4da419c5b Wallet view supports screen sizes between 576px and 667px (#3193) 2018-02-05 18:31:21 -08:00
Alexander Tseung
e4895df953
Change styling of Import Account with Seed Phrease (#3182) 2018-02-05 12:39:33 -08:00
Thomas Huang
dc24a6e8c2
Merge pull request #3177 from MetaMask/Version-3.14.1
Version 3.14.1
2018-02-01 16:12:27 -08:00
Dan Finlay
9f304e3026 Version 3.14.1 2018-02-01 15:53:18 -08:00
Dan Finlay
daa7caf7bb
Merge pull request #3176 from MetaMask/FirefoxSettingsOverflow
Scrollable Settings screen for Firefox
2018-02-01 15:51:55 -08:00
Thomas
10e75dc4dd Scrollable Settings screen for Firefox 2018-02-01 14:53:43 -08:00
Frankie
3b89a3f6ce
Merge pull request #3175 from MetaMask/Version-3.13.9
Version 3.14.0
2018-02-01 14:47:20 -08:00
Alexander Tseung
2fd9e58e61 Fix lint errors 2018-02-01 14:13:08 -08:00
Dan Finlay
0608d1579f Version 3.14.0 2018-02-01 12:27:19 -08:00
Dan Finlay
678bf561ce Remove deps from build process
Was running out of stdout memory, preventing me from building.
2018-02-01 12:26:17 -08:00
Dan
f38675c9ac Checks if there is currently a send in progress before redirecting to default in conf-tx 2018-01-31 18:26:26 -08:00
Alexander Tseung
4f1fe1da62 Fix merge conflicts from uat-next 2018-01-31 18:24:20 -08:00
Alexander Tseung
0c6fef3dec Add create new account routes, fix conflicts from uat updates 2018-01-31 18:08:49 -08:00
Dan J Miller
78bce55858 [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)
* Use tooltip for display of helper text in wallet views copy to clipboard feature.

* Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change.

* Remove unnecessary tabIndex attribute from wallet view address element.
2018-01-31 16:27:35 -08:00
Frankie
0b4e3c5d6a
Merge pull request #3161 from MetaMask/AddResetExplanation
Add reset explanation
2018-01-31 14:49:29 -08:00
Dan Finlay
86d56419f4 Add explanation of account resetting 2018-01-31 14:31:56 -08:00
Dan Finlay
4f61029177 Remove unused file 2018-01-31 14:20:59 -08:00
Frankie
1a93b1ade2
Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs
Set address to default with empty string, add test validation.
2018-01-31 14:18:47 -08:00
Frankie
1eec2ca8c0
Merge pull request #3148 from MetaMask/localStorage-clean-up
remove BlacklistController from disk state
2018-01-31 14:15:52 -08:00
Dan J Miller
971112d413 [NewUI] Updates capitalization and alignment for the import account screen. (#3122)
* Updates capitalization and alignment for the import account screen.

* Align elements in import form.
2018-01-31 13:41:13 -08:00
Dan J Miller
8378445112 [NewUI] Set default new account name as placeholder, but not value (#3121)
* Set default new account name as placehold, and not value, in new account create screen.

* Set new account number in create-form.js in constructor.
2018-01-31 13:40:14 -08:00
frankiebee
6106ff020f fix changelog 2018-01-31 13:18:15 -08:00
Frankie
201e0579a5
Merge branch 'master' into localStorage-clean-up 2018-01-31 11:57:38 -08:00
Dan Finlay
f165356196
Merge pull request #3155 from brunobar79/feature/reset-account
Added reset account feature
2018-01-31 11:40:33 -08:00
frankiebee
7e14468013 Merge branch 'localStorage-clean-up' of https://github.com/MetaMask/metamask-extension into localStorage-clean-up 2018-01-31 10:50:52 -08:00
frankiebee
c3adbda5f5 remove RecentBlocks from disk 2018-01-31 10:49:58 -08:00
Bruno Barbieri
94dd77d194 clean up 2018-01-31 13:34:14 -05:00
Bruno Barbieri
a70eda3651 add test for wipeTransactions 2018-01-31 13:29:30 -05:00
Bruno Barbieri
c1b7cfe91d preserve other networks TXs 2018-01-31 13:29:02 -05:00
Bruno Barbieri
7dc1b09f94 use txMeta.txParams 2018-01-31 04:40:32 -05:00
Bruno Barbieri
03d17c75ae wipe only transactions for current account 2018-01-31 04:25:32 -05:00
Bruno Barbieri
5f39844382 clean up 2018-01-31 03:36:04 -05:00
Bruno Barbieri
e6fda855a5 added reset account feature 2018-01-31 03:33:15 -05:00
Thomas
1f8dd5f0de Bump Changelog 2018-01-30 16:11:16 -08:00
Frankie
f690355bd4
Merge branch 'master' into localStorage-clean-up 2018-01-30 15:36:24 -08:00
Frankie
1a32690a12
Merge pull request #3145 from MetaMask/i3089-FixNullError
Add warning when importing no valid file
2018-01-30 15:32:04 -08:00
Dan Finlay
11a944719f Add warning when importing no valid file
Fixes #3089
2018-01-30 15:11:05 -08:00