Commit Graph

5572 Commits

Author SHA1 Message Date
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
kumavis 190389a068 v4.1.1 2018-02-28 14:26:14 -08:00
kumavis cf6a2f65ab changelog - add entry about 'Add Token' screen fix 2018-02-28 14:09:35 -08:00
kumavis 40537f9290 add token - check for logo url before trying to use 2018-02-28 14:04:32 -08:00
Kevin Serrano d45116824c
Check in all font files locally. 2018-02-28 13:03:46 -08:00
kumavis 6c472b73eb
Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvements
[NewUI] Onboarding flow style improvements
2018-02-28 12:40:14 -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 4b69531c3c
Merge pull request #3353 from MetaMask/sentry-fail-tx-1
Sentry - improve ethjs-rpc error formating for failed txs
2018-02-28 11:16:23 -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
kumavis c3bd27c965 sentry - extractErrorMessage - fix comment formatting 2018-02-28 10:57:54 -08:00
kumavis 8e5bcf8935 sentry - failed tx - improve ethjs-rpc error formating 2018-02-28 10:53:54 -08:00
kumavis fca2cbc8ef sentry - clean - move setupRaven to lib 2018-02-28 10:37:53 -08:00
kumavis 40484b1c1f
Merge pull request #3346 from danjm/i3228-event-not-defined
[old-ui] Define event locally in onClickOutside method in account-dropdowns.js
2018-02-28 09:52:52 -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
Thomas f9de87af51 Using noop to not lose it 2018-02-27 15:51:14 -08:00
Thomas b2f53fa354 Revert initializing first-time-state 2018-02-27 15:50:49 -08:00
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 b4aac16c58 Add changes to CHANGELOG 2018-02-27 12:08:05 -08:00
Thomas 7aa324bdf6 Remove committed out merge code 2018-02-27 12:06:24 -08:00
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
Frankie 33373b676f
Merge pull request #3333 from MetaMask/mascara-deploy
mascara deploy - improve deploy instructions
2018-02-27 11:42:22 -08:00
Frankie 2b8cfcb73c
Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0
Update metamascara to the latest version 🚀
2018-02-27 11:31:17 -08:00
kumavis 3fefccd372
Merge branch 'master' into mascara-deploy 2018-02-27 19:25:29 +00:00
Frankie ced62ac551
Merge pull request #3323 from MetaMask/version-4.0.0
Version 4.1.0
2018-02-27 10:48:36 -08:00
kumavis dae5d085d1
changelog - improve changelog notes 2018-02-27 10:37:43 -08:00
Thomas d9486a3ce5 Bump Version 2018-02-27 10:35:43 -08:00
Dan Finlay c2cb8a8abe
Merge pull request #3275 from MetaMask/license
Standardize license
2018-02-27 10:16:12 -08:00
Dan Finlay fe21f8a952
Merge pull request #3281 from MetaMask/sentry-failed-tx-debatch
sentry - report failed tx with more specific message
2018-02-27 10:15:18 -08:00
Dan baab9917ff Padding of alpha warning aligns with app-bar 2018-02-27 14:14:55 -03:30
Dan 0739d3507b Adds beta label to Metamask name in full screen app bar. 2018-02-27 14:13:05 -03:30
Dan def369ba07 Move beta warning to app header. 2018-02-27 14:13:05 -03:30
Dan 07edf3f9ff NewUI first time flow warning message change. 2018-02-27 14:13:04 -03:30
Dan 746c3e5f18 Body width container in first time flow is consistent with app bar. 2018-02-27 14:12:45 -03:30
Thomas 3eba74a0f5 Update LICENSE to current year. 2018-02-26 16:23:24 -08:00
Kevin Serrano c789bf1842
Merge pull request #3324 from MetaMask/fix-feature-flags
fix feature flags being undefined
2018-02-26 14:16:33 -08:00
frankiebee b24d949ca4 fix feature flags being undefined 2018-02-26 10:55:30 -08:00
Csaba Solya 1b367bc215 fix test 2018-02-23 11:11:14 +01:00
Csaba Solya 8292dabed5 add negative decrypt test 2018-02-23 11:03:53 +01:00
Csaba Solya cd05d77c3f fix tests 2018-02-23 10:49:56 +01:00
Csaba Solya 73d9bfc52c make keyFromPassword private 2018-02-23 10:09:16 +01:00
Csaba Solya c1aa59f6ed adding tests 2018-02-23 10:08:23 +01:00
Thomas b45295499e Version 4.0.0 2018-02-22 14:57:24 -08:00
Csaba S 2f34630486
Merge branch 'master' into edge-support 2018-02-22 14:55:46 +01:00
Csaba Solya 5ec311ba3e add edge support 2018-02-22 14:39:32 +01:00
Dan Finlay eed75735b8
Merge pull request #3050 from MetaMask/uat
[EPIC] Merge UAT into master
2018-02-21 15:46:31 -08:00