1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 04:37:13 +01:00
Commit Graph

99 Commits

Author SHA1 Message Date
kumavis
6a9ca29244
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 17:13:57 -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
criw
b393b54e35 FIX #3440 improved verification of restore from seed phrase 2018-03-06 04:43:12 +01:00
Thomas Huang
d3a0a27c0c
Merge branch 'master' into ImportAccountMessageV2 2018-03-02 18:26:52 -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
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
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
Kevin Serrano
d45116824c
Check in all font files locally. 2018-02-28 13:03:46 -08:00
kumavis
8f5817c090
Merge pull request #3339 from danjm/i3336-cancel-button-buy-eth
[Old-UI] Fix cancel button on buy eth screen.
2018-02-28 12:12:12 -08:00
kumavis
28c6347cdd
Merge pull request #3340 from danjm/i3338-contract-published-terminology
[NewUI] Replace 'Contract Published' label with 'Contract Deployment'
2018-02-28 11:16:55 -08:00
kumavis
b1faa13344
Merge pull request #3350 from danjm/onclick-undefined-sentry-error
[old-ui] Prevent user from switching network in old-ui notification
2018-02-28 11:00:12 -08:00
Dan
c4ef9630da Prevent user from switching network in old-ui notification 2018-02-28 14:13:44 -03:30
Dan
78f6a48664 Define event locally in onClickOutside method in account-dropdowns.js 2018-02-28 13:18:37 -03:30
Dan
2b9af0734b Replace 'Contract Published' with 'Contract Deployment' for clearer indication of contract tx state. 2018-02-27 20:09:02 -03:30
Dan
5de0471fcb Fix cancel button on buy eth screen. 2018-02-27 19:14:23 -03:30
Thomas
ac2e92fa54 Change Loose label to Imported 2018-02-27 12:02:48 -08:00
Thomas
50f20358c1 Add import account disclaimer 2018-02-27 12:01:09 -08:00
Dan
b1b9772731 Fix old-ui active notices width. 2018-02-20 21:44:17 -03:30
Dan Finlay
16f9ddc72c Add 8MM gas limit default to send screen 2018-02-20 15:44:04 -08:00
kumavis
4e8d9fef84
Merge pull request #3200 from alextsg/cb-703
[NewUI] Remove accessing PropTypes from main React package
2018-02-16 16:11:36 +00:00
Thomas Huang
ed33f3160a Make oldui compatible with newUI style changes 2018-02-15 12:36:26 -08:00
Dan Finlay
ee1197192f
Merge pull request #3209 from danjm/MM-634-newui-reset-account
[NewUI] Add reset account button to new UI.
2018-02-13 19:50:19 +01:00
Dan
bb79fb354b Try beta link on unlock and privacy screens. 2018-02-08 22:47:32 -03:30
Dan
cd976a2765 Add reset account button to new UI. 2018-02-08 20:23:16 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
8b90b1d1b1 Remove accessing PropTypes from main React package 2018-02-06 22:03:37 -08:00
Thomas
97ca86733c Merge branch 'master' into uat 2018-01-23 01:12:50 -08:00
Chi Kei Chan
ba0762c582
Merge pull request #3005 from alextsg/cb-385
[NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button
2018-01-17 13:49:48 -08:00
Alexander Tseung
aa08d1a09d Fix merge conflicts 2018-01-16 18:34:24 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Alexander Tseung
65e9d9efc5 Fix rendering QR code in old UI, hide unnecessary back button 2018-01-16 17:41:42 -08:00
Dan J Miller
b72610fb53 Fix margin styling for name and address in account detail section. (#2790) 2018-01-11 18:16:41 -08:00
Alexander Tseung
099f078a3d Fix merge conflict 2018-01-03 11:16:46 -08:00
Alexander Tseung
a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
Alexander Tseung
a218008adf
Track usage of old and new UI (#2794)
[NewUI] Track usage of old and new UI
2017-12-22 10:43:02 -08:00
Dan
7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
Dan J Miller
bccbf14b39 [NewUI] Hide UI toggle in mascara (#2772)
* Hides old-UI on mascara.

* Improve code clarity in select-app.js
2017-12-20 10:22:50 -08:00
Dan
68ef52e183 Remove inline style. 2017-12-12 12:31:52 -08:00
Dan
a67caee767 Make transaction list and item more flexible. 2017-12-12 12:31:52 -08:00
Dan
70557e0448 Flex account-data-subsection 2017-12-12 12:31:52 -08:00
Dan
71d6403304 Fix old ui width in mobile and extension. 2017-12-12 12:31:52 -08:00
Dan
800eb2b969 Delete uneeded files from old-ui. 2017-12-12 12:13:03 -08:00
Dan
9db00fa507 Show user notifications after switch between UIs 2017-12-04 23:36:54 -03:30
Dan
f7ad015f5b Use newui actions in old-ui 2017-12-04 23:08:23 -03:30
Dan
7f79524070 Add UI selection 2017-12-04 23:08:23 -03:30
Dan
6561e75aa2 Add old-ui directory 2017-12-04 23:06:26 -03:30