Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3574 from marvinvista/master | kumavis | 2018-03-21 | 1 | -0/+609 |
|\ | |||||
| * | Translate to Tagalog #3535 | Marvin Vista | 2018-03-15 | 1 | -1/+1 |
| * | Translate to Tagalog #3535 | Marvin Vista | 2018-03-15 | 1 | -0/+609 |
* | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 8 | -13/+2660 |
|\ \ | |||||
| * \ | Merge pull request #3555 from mamiM/mamiM-Ja-translation | kumavis | 2018-03-18 | 1 | -3/+602 |
| |\ \ | |||||
| | * | | Translation to Japanese | Mami Mordovets | 2018-03-14 | 1 | -3/+602 |
| * | | | Merge pull request #3560 from Orangem21/master | kumavis | 2018-03-18 | 1 | -3/+602 |
| |\ \ \ | |||||
| | * | | | fix | Orange | 2018-03-15 | 1 | -2/+2 |
| | * | | | Merge pull request #2 from MetaMask/master | Orange | 2018-03-15 | 4 | -5/+75 |
| | |\ \ \ | |||||
| | * | | | | fix | Orange | 2018-03-14 | 1 | -1/+1 |
| | * | | | | yuanaichi | yuanchao | 2018-03-14 | 1 | -102/+102 |
| | * | | | | fix | Orange | 2018-03-14 | 1 | -30/+30 |
| | * | | | | fix | Orange | 2018-03-14 | 1 | -1/+1 |
| | * | | | | update | Orange | 2018-03-14 | 1 | -3/+602 |
| * | | | | | Merge pull request #3602 from vietlq/master | kumavis | 2018-03-18 | 1 | -0/+609 |
| |\ \ \ \ \ | |||||
| | * | | | | | space | Viet Le | 2018-03-18 | 1 | -1/+1 |
| | * | | | | | corrected vn -> vi | Viet Le | 2018-03-18 | 1 | -0/+0 |
| | * | | | | | Translated to Vietnamese. Translator: Trang Ha, Editor: Viet Le | Viet Le | 2018-03-18 | 1 | -0/+609 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #3564 from nujabes403/patch-1 | kumavis | 2018-03-18 | 1 | -5/+604 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update messages.json | nujabes403 | 2018-03-16 | 1 | -1/+1 |
| | * | | | | | Update messages.json | nujabes403 | 2018-03-16 | 1 | -1/+1 |
| | * | | | | | Update messages.json | nujabes403 | 2018-03-16 | 1 | -16/+16 |
| | * | | | | | Update messages.json | nujabes403 | 2018-03-16 | 1 | -2/+2 |
| | * | | | | | Update messages.json | nujabes403 | 2018-03-16 | 1 | -1/+1 |
| | * | | | | | Translated whole message in KR | nujabes403 | 2018-03-15 | 1 | -109/+109 |
| | * | | | | | Update kr translation to messages.json | nujabes403 | 2018-03-15 | 1 | -5/+604 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge pull request #3590 from SaptakS/feature/whitelist | Dan Finlay | 2018-03-17 | 1 | -1/+16 |
| |\ \ \ \ \ | |||||
| | * | | | | | Inject Script: Blacklist domains where not to inject script | Saptak Sengupta | 2018-03-17 | 1 | -1/+16 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Update Confirm Contract screen (#3597) | Alexander Tseung | 2018-03-17 | 1 | -0/+16 |
| * | | | | | Fix messages typo (#3591) | Thomas Huang | 2018-03-17 | 1 | -1/+1 |
| * | | | | | More for i18n | Thomas | 2018-03-16 | 1 | -0/+210 |
| * | | | | | Merge pull request #3576 from Senshii/master | kumavis | 2018-03-16 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | fix plural in french translation | simon fourdinier | 2018-03-15 | 1 | -1/+1 |
| | |/ / / / | |||||
* | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-16 | 1 | -0/+32 |
|\| | | | | | |||||
| * | | | | | Update Deposit Eth icon (#3569) | Alexander Tseung | 2018-03-16 | 1 | -0/+32 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 2 | -4/+637 |
|\| | | | | |||||
| * | | | | Merge pull request #3545 from vincentlg/master | kumavis | 2018-03-15 | 1 | -0/+609 |
| |\ \ \ \ | |||||
| | * | | | | Update messages.json | Vincent Le Gallic | 2018-03-15 | 1 | -12/+12 |
| | * | | | | Add French translation | Vincent Le Gallic | 2018-03-14 | 1 | -0/+609 |
| | | |/ / | | |/| | | |||||
| * | | | | local-store - fix class syntax | kumavis | 2018-03-15 | 1 | -2/+2 |
| * | | | | local-store - check for error from extension.runtime | kumavis | 2018-03-15 | 1 | -3/+28 |
| * | | | | local-store - fix promisification of methods | kumavis | 2018-03-15 | 1 | -3/+2 |
| | |/ / | |/| | | |||||
| * | | | fix destructuring of variables | frankiebee | 2018-03-14 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | fix destructuring of variables | frankiebee | 2018-03-14 | 1 | -1/+1 |
* | | | Fix TransactionStateManager spelling. | Dan | 2018-03-14 | 1 | -2/+2 |
* | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 5 | -11/+680 |
|\| | | |||||
| * | | Merge branch 'master' into i3076-UseStorageLocalInstead | kumavis | 2018-03-14 | 1 | -2/+4 |
| |\ \ | |||||
| | * | | tx-gas-utils - fix code style | kumavis | 2018-03-14 | 1 | -1/+1 |
| | * | | transactions move validation of the to field to validateRecipient | frankiebee | 2018-03-14 | 1 | -7/+3 |
| | * | | Merge remote-tracking branch 'origin/i#3509' into i#3509 | frankiebee | 2018-03-14 | 6 | -21/+703 |
| | |\ \ | |||||
| | | * | | Merge branch 'master' into i#3509 | Frankie | 2018-03-14 | 6 | -21/+703 |
| | | |\| | |||||
| | * | | | fix error message | frankiebee | 2018-03-14 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | transactions - insure if a to field in tx params has a truthy valu that it is... | frankiebee | 2018-03-14 | 1 | -1/+7 |
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us... | kumavis | 2018-03-14 | 2 | -6/+605 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Add sigRequest for Signature Request | Thomas | 2018-03-13 | 1 | -0/+3 |
| | * | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-12 | 4 | -12/+95 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into i18n | Dan Finlay | 2018-03-07 | 1 | -3/+3 |
| | |\ \ \ | |||||
| | * | | | | Missing comma in messages.json | Dan | 2018-03-07 | 1 | -1/+1 |
| | * | | | | Merge branch 'master' into i18n | Dan | 2018-03-07 | 24 | -25/+912 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | complete i18n across new UI | Nick Doiron | 2018-01-30 | 2 | -69/+105 |
| | * | | | | better organization of locale file; i18n in more view files | Nick Doiron | 2018-01-24 | 1 | -125/+506 |
| | * | | | | first steps to i18n | Nick Doiron | 2018-01-23 | 1 | -1/+166 |
| * | | | | | lint fix | kumavis | 2018-03-09 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us... | kumavis | 2018-03-09 | 2 | -9/+92 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | background - storage - cleanup storage wiring | kumavis | 2018-03-09 | 2 | -34/+30 |
| * | | | | | Tighten up data loading code | Dan Finlay | 2018-03-08 | 1 | -4/+8 |
| * | | | | | Add clarifying comment | Dan Finlay | 2018-03-08 | 1 | -0/+1 |
| * | | | | | Some fixes for new storage strategy | Dan Finlay | 2018-03-08 | 1 | -5/+9 |
| * | | | | | Increase storage debounce to 2s | Dan Finlay | 2018-03-08 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-08 | 3 | -6/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-07 | 87 | -61/+1407 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Increase storage debounce value | Dan Finlay | 2018-01-26 | 1 | -1/+1 |
| * | | | | | | Debounce storage to avoid crashing pump | Dan Finlay | 2018-01-26 | 1 | -8/+8 |
| * | | | | | | Remove local storage writes, add log | Dan Finlay | 2018-01-25 | 1 | -5/+16 |
| * | | | | | | Fix retrieval of object | Dan Finlay | 2018-01-25 | 1 | -2/+1 |
| * | | | | | | Remove redundant async modifiers | Dan Finlay | 2018-01-25 | 1 | -2/+2 |
| * | | | | | | Remove already handled TODO comment. | Dan | 2018-01-25 | 1 | -1/+0 |
| * | | | | | | Remove extension-store since we aren't using it yet | Dan Finlay | 2018-01-25 | 1 | -39/+0 |
| * | | | | | | Corrected unlimitedStorage permission | Dan Finlay | 2018-01-25 | 1 | -1/+1 |
| * | | | | | | Check that extension.storage exists before attempting to call methods on it. | Dan | 2018-01-24 | 1 | -3/+3 |
| * | | | | | | Handle errors when getting and setting to localStore. | Dan | 2018-01-24 | 1 | -2/+12 |
| * | | | | | | Merge branch 'UseStorageLocal' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-01-24 | 3 | -0/+82 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Modify @heyellieday's work to use storage.local to replace main storage | Dan Finlay | 2018-01-24 | 2 | -7/+33 |
| | * | | | | | | conditionally use extension store if supported or enabled | Ellie Day | 2018-01-03 | 2 | -3/+13 |
| | * | | | | | | handle situation where storage.sync is disabled in certain versions of firefox | Ellie Day | 2018-01-03 | 2 | -5/+19 |
| | * | | | | | | Add ExtensionStore and add basic store instance syncing to main controller | Ellie Day | 2017-12-23 | 2 | -0/+32 |
| * | | | | | | | Add unlimitedStorage option to manifest | Dan Finlay | 2018-01-24 | 1 | -0/+1 |
* | | | | | | | | transactions - return the txMeta in retryTransaction | frankiebee | 2018-03-14 | 1 | -2/+3 |
* | | | | | | | | transactions:state - add a submittedTime stamp so the ui has a better grasp o... | frankiebee | 2018-03-14 | 1 | -0/+4 |
* | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-09 | 5 | -15/+98 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #3409 from scsaba/seed-phrase-verification | Dan Finlay | 2018-03-08 | 2 | -9/+92 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | modify verifySeedPhrase to async and call it from addNewAccount also | Csaba Solya | 2018-03-06 | 1 | -32/+34 |
| | * | | | | | | add documentation | Csaba Solya | 2018-03-04 | 2 | -0/+9 |
| | * | | | | | | verify seedwords on log in | Csaba Solya | 2018-03-04 | 1 | -3/+16 |
| | * | | | | | | verify addresses regardless case | Csaba Solya | 2018-03-03 | 1 | -1/+1 |
| | * | | | | | | fix lint issues | Csaba Solya | 2018-03-03 | 2 | -11/+11 |
| | * | | | | | | seed phrase verifier | Csaba Solya | 2018-03-03 | 2 | -2/+61 |
| * | | | | | | | fix typo in tests and tx-state-manager | Jeffrey Tong | 2018-03-08 | 1 | -1/+1 |
| * | | | | | | | fix typo in transaction.js | Jeffrey Tong | 2018-03-07 | 1 | -2/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Version 4.2.0 | kumavis | 2018-03-07 | 1 | -3/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | fix marking of confirmed transaction as dropped | frankiebee | 2018-03-09 | 1 | -1/+1 |
* | | | | | | transactions - make _markNonceDuplicatesDropped | frankiebee | 2018-03-08 | 1 | -21/+20 |
* | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-08 | 13 | -9/+766 |
|\| | | | | | |||||
| * | | | | | Merge pull request #3309 from scsaba/edge-support | Dan Finlay | 2018-03-07 | 2 | -0/+77 |
| |\ \ \ \ \ | |||||
| | * | | | | | make keyFromPassword private | Csaba Solya | 2018-02-23 | 1 | -3/+3 |
| | * | | | | | Merge branch 'master' into edge-support | Csaba S | 2018-02-22 | 71 | -41/+562 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | add edge support | Csaba Solya | 2018-02-22 | 2 | -0/+77 |
| * | | | | | | | Version 4.1.3v4.1.3 | Dan Finlay | 2018-03-03 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #3356 from MetaMask/cdn-minimization | Kevin Serrano | 2018-03-02 | 7 | -0/+644 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Check in all font files locally. | Kevin Serrano | 2018-03-01 | 7 | -0/+644 |
| * | | | | | | | 4.1.2 | kumavis | 2018-03-01 | 1 | -1/+1 |
| * | | | | | | | Merge pull request #3361 from MetaMask/4.1.1v4.1.1 | Thomas Huang | 2018-03-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | v4.1.1 | kumavis | 2018-03-01 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | sentry - extractErrorMessage - fix comment formatting | kumavis | 2018-03-01 | 1 | -1/+1 |
| * | | | | | | | sentry - failed tx - improve ethjs-rpc error formating | kumavis | 2018-03-01 | 2 | -5/+41 |
| * | | | | | | | sentry - clean - move setupRaven to lib | kumavis | 2018-03-01 | 3 | -3/+3 |
| |/ / / / / / | |||||
* / / / / / / | refactor retrytx with higher gas price: | frankiebee | 2018-03-08 | 2 | -26/+55 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3323 from MetaMask/version-4.0.0v4.1.0 | Frankie | 2018-02-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Bump Version | Thomas | 2018-02-28 | 1 | -1/+1 |
| * | | | | | | Version 4.0.0 | Thomas | 2018-02-23 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #3281 from MetaMask/sentry-failed-tx-debatch | Dan Finlay | 2018-02-28 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | sentry - report failed tx with more specific message | kumavis | 2018-02-17 | 1 | -1/+2 |
* | | | | | | Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fix | Thomas Huang | 2018-02-22 | 1 | -1/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Prevents new transaction from generating popup when metamask is open in an ac... | Dan | 2018-02-22 | 1 | -1/+11 |
* | | | | | | | Merge branch 'master' into uat-master | Dan Finlay | 2018-02-22 | 4 | -3/+17 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #3250 from MetaMask/i#3136 | kumavis | 2018-02-16 | 1 | -2/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | fix - hex prefix estimatedGas on txMeta | frankiebee | 2018-02-15 | 1 | -2/+3 |
| * | | | | | | | Fix incorrect promise instantiation | Dan Finlay | 2018-02-16 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Version 3.14.2v3.14.2 | Dan Finlay | 2018-02-16 | 1 | -1/+1 |
| * | | | | | | Merge pull request #3222 from MetaMask/mesh-test | Dan Finlay | 2018-02-16 | 2 | -0/+13 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | metamask mesh - inject mesh testing container | kumavis | 2018-02-11 | 2 | -0/+13 |
| * | | | | | | use the providers initial _blocktracker. fixes #2393 | Lazaridis | 2018-02-11 | 1 | -1/+1 |
| |/ / / / / | |||||
* | / / / / | Fix promise construction | Dan Finlay | 2018-02-21 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | Bump uat version to 4.0.12 | Dan | 2018-02-17 | 1 | -1/+1 |
* | | | | | Make oldui compatible with newUI style changes | Thomas Huang | 2018-02-16 | 1 | -2/+2 |
* | | | | | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 6 | -10/+63 |
|\ \ \ \ \ | |||||
| * | | | | | Merge branch 'master' into uat | Dan | 2018-02-08 | 6 | -10/+63 |
| |\| | | | | |||||
| | * | | | | Version 3.14.1v3.14.1 | Dan Finlay | 2018-02-02 | 1 | -1/+1 |
| | * | | | | Version 3.14.0 | Dan Finlay | 2018-02-02 | 1 | -1/+1 |
| | * | | | | Merge branch 'master' into localStorage-clean-up | Frankie | 2018-02-01 | 3 | -0/+23 |
| | |\ \ \ \ | |||||
| | | * | | | | preserve other networks TXs | Bruno Barbieri | 2018-02-01 | 1 | -3/+4 |
| | | * | | | | use txMeta.txParams | Bruno Barbieri | 2018-01-31 | 1 | -1/+1 |
| | | * | | | | wipe only transactions for current account | Bruno Barbieri | 2018-01-31 | 3 | -9/+15 |
| | | * | | | | clean up | Bruno Barbieri | 2018-01-31 | 1 | -3/+3 |
| | | * | | | | added reset account feature | Bruno Barbieri | 2018-01-31 | 3 | -0/+16 |
| | * | | | | | remove RecentBlocks from disk | frankiebee | 2018-02-01 | 2 | -3/+2 |
| | * | | | | | creater migration to remove BlacklistController | frankiebee | 2018-01-31 | 1 | -0/+33 |
| | * | | | | | remove BlacklistController from disk state | frankiebee | 2018-01-31 | 2 | -6/+2 |
| | |/ / / / | |||||
| | * | | | | Version 3.13.8v3.13.8 | Dan Finlay | 2018-01-30 | 1 | -1/+1 |
| | * | | | | Bump limit for event emitter warning. | Kevin Serrano | 2018-01-26 | 1 | -0/+2 |
| | |/ / / | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into Version-3.13.7 | Dan Finlay | 2018-01-23 | 2 | -1/+13 |
| | |\ \ \ | |||||
| | | * | | | sentry - report failed txs | kumavis | 2018-01-23 | 2 | -1/+13 |
| | * | | | | Version 3.13.7 | Dan Finlay | 2018-01-23 | 1 | -1/+1 |
| | |/ / / | |||||
* | / / / | [NewUI] Opens to full screen when restoring from seed. (#3201) | Dan J Miller | 2018-02-08 | 2 | -0/+26 |
|/ / / / | |||||
* | | / | Merge branch 'master' into uat | Thomas | 2018-01-23 | 3 | -2/+14 |
| |_|/ |/| | | |||||
* | | | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 69 | -40/+525 |
|\ \ \ | |/ / |/| | | |||||
| * | | 4.0.10 | kumavis | 2018-01-19 | 1 | -1/+1 |
| * | | Update popout to fullscreen icon | Alexander Tseung | 2018-01-18 | 1 | -0/+21 |
| * | | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 68 | -42/+502 |
| |\ \ | |||||
| | * | | [NewUI] Place all users of extension into old UI (disable auto adding). (#2946) | Dan J Miller | 2018-01-16 | 1 | -3/+7 |
| | * | | Merge branch 'uat' into cb-388 | Chi Kei Chan | 2018-01-13 | 3 | -2/+7 |
| | |\ \ | |||||
| | | * | | Fix styling in initialization | Alexander Tseung | 2018-01-13 | 1 | -2/+7 |
| | | * | | [NewUI-flat] New deposit ether modal UI. (#2642) | Dan J Miller | 2018-01-13 | 2 | -0/+0 |
| | * | | | Update main view styling | Alexander Tseung | 2018-01-11 | 1 | -0/+128 |
| | |/ / | |||||
| | * | | 4.0.9 | kumavis | 2018-01-09 | 1 | -1/+1 |
| | * | | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 65 | -42/+365 |
| | |\ \ | |||||
| | | * \ | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | Update manifest.json version from 4.0.4 to 4.0.5 (#2797) | Alexander Tseung | 2017-12-23 | 1 | -1/+1 |
| | | * | | | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 65 | -42/+365 |
| | | |\| | | |||||
| | | | * | | Track usage of old and new UI (#2794) | Alexander Tseung | 2017-12-23 | 3 | -6/+57 |
| | | | * | | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 2 | -0/+5 |
| | | | |\ \ | |||||
| | | | | * | | Adds updateTransaction to background and used it to update after editing in s... | Dan | 2017-12-21 | 2 | -6/+5 |
| | | | | * | | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 2 | -0/+6 |
| | | | * | | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 9 | -37/+179 |
| | | | |\ \ \ | | | | | |/ / | | | | |/| / | | | | | |/ | |||||
| | | | * | | Adds button for opening app in main browser window in extension. | Dan | 2017-12-13 | 2 | -0/+20 |
| | | | * | | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI | Chi Kei Chan | 2017-12-08 | 10 | -29/+150 |
| | | | |\ \ | |||||
| | | | | * \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-12-07 | 2 | -3/+21 |
| | | | | |\ \ | |||||
| | | | | * | | | Merge branch 'master' into NewUI-flat-merge-with-master | Dan | 2017-12-07 | 8 | -26/+129 |
| | | | * | | | | Lint fix | Dan | 2017-12-05 | 1 | -1/+1 |
| | | | * | | | | Css selected in background based on betaUI state. | Dan | 2017-12-05 | 1 | -6/+15 |
| | | | * | | | | Add UI selection | Dan | 2017-12-05 | 3 | -0/+19 |
| | | | |/ / / | |||||
| | | | * | | | Fixes changes requested in pullrequestreview-79088534 | Jason Clark | 2017-11-27 | 1 | -0/+1 |
| | | | * | | | more eslint fixes | Jason Clark | 2017-11-26 | 1 | -1/+1 |
| | | | * | | | toggle wired up to preferences property store | Jason Clark | 2017-11-25 | 2 | -2/+12 |
| | | | * | | | incremental commit | Clark, Jason (Contractor) | 2017-11-24 | 1 | -0/+8 |
| | | | * | | | Version Bump | Chi Kei Chan | 2017-11-16 | 1 | -1/+1 |
| | | | * | | | Merge branch 'master' into merge-master | Chi Kei Chan | 2017-11-16 | 3 | -2/+12 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge pull request #2519 from danjm/NewUI-flat-lintfixes | Thomas Huang | 2017-11-03 | 1 | -2/+0 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Lint fixes for NewUI-flat. | Dan | 2017-11-02 | 1 | -2/+0 |
| | | | * | | | | | 4.0.3 | kumavis | 2017-10-26 | 1 | -1/+1 |
| | | | * | | | | | Merge branch 'NewUI-flat' into uat | Chi Kei Chan | 2017-10-26 | 19 | -37/+134 |
| | | | |\| | | | | |||||
| | | | | * | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-26 | 1 | -3/+7 |
| | | | | |\ \ \ \ | |||||
| | | | | * | | | | | Sign Typed Request styling fixes | Chi Kei Chan | 2017-10-26 | 1 | -1/+1 |
| | | | | * | | | | | Signature request fixes. | Dan | 2017-10-26 | 1 | -1/+1 |
| | | | | * | | | | | Add Info section | Alexander Tseung | 2017-10-26 | 1 | -0/+0 |
| | | | | * | | | | | Fix styling on notification view | Chi Kei Chan | 2017-10-25 | 1 | -2/+2 |
| | | | | * | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 13 | -31/+30 |
| | | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 3 | -1/+81 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | | Account menu white check mark | Chi Kei Chan | 2017-10-24 | 1 | -0/+14 |
| | | | * | | | | | | | | 4.0.2 | kumavis | 2017-10-21 | 1 | -1/+1 |
| | | | * | | | | | | | | 4.0.1 | kumavis | 2017-10-21 | 1 | -1/+1 |
| | | | |/ / / / / / / | |||||
| | | | * | | | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-21 | 4 | -27/+88 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge branch 'NewUI-flat' into merge | Chi Kei Chan | 2017-10-19 | 55 | -29/+215 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | Adding Account Dropdown V2 | Chi Kei Chan | 2017-10-13 | 4 | -24/+57 |
| | | | | * | | | | | | | | UI for send screen container without form rows. | Dan | 2017-10-09 | 1 | -1/+4 |
| | | | | * | | | | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-04 | 9 | -86/+90 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | Enables remove token and ensures add/remove update the list without need for ... | Dan | 2017-10-04 | 2 | -1/+13 |
| | | | | * | | | | | | | | | Merge branch 'master' into mmn | Chi Kei Chan | 2017-09-28 | 20 | -1119/+751 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-09-19 | 2 | -4/+10 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into nm | Chi Kei Chan | 2017-09-19 | 20 | -245/+519 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | Improve styling in Confirmation Screen; Show decoded send token data | Chi Kei Chan | 2017-09-13 | 1 | -1/+0 |
| | | | | * | | | | | | | | | | | | Added signTokenTx; Adding token confirmation screen | Chi Kei Chan | 2017-09-12 | 1 | -0/+3 |
| | | | | * | | | | | | | | | | | | Fix html height | Chi Kei Chan | 2017-09-06 | 1 | -2/+2 |
| | | | | * | | | | | | | | | | | | Replace Avenir Next with alternative. | Dan | 2017-08-30 | 11 | -0/+93 |
| | | | | * | | | | | | | | | | | | Add bolt and info icon vector images | sdtsui | 2017-08-23 | 2 | -0/+22 |
| | | | | * | | | | | | | | | | | | Merge remote-tracking branch 'mm/master' into NewUI-flat | sdtsui | 2017-08-14 | 4 | -5/+21 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | kumavis | 2017-08-09 | 5 | -189/+253 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into feat/mm-ui-5 | sdtsui | 2017-08-07 | 13 | -370/+308 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | | | Add Roboto without hooking it up via import | sdtsui | 2017-08-05 | 18 | -0/+0 |
| | | | | * | | | | | | | | | | | | | | | Adjust sidebar transition using @cjeria\'s feedback | sdtsui | 2017-08-03 | 1 | -0/+10 |
| | | | | * | | | | | | | | | | | | | | | Ensure app-header is rendered in responsive layout | sdtsui | 2017-08-03 | 1 | -1/+1 |
| | | | | * | | | | | | | | | | | | | | | Add Ethereum Logo | sdtsui | 2017-08-03 | 1 | -0/+11 |
| | | | | * | | | | | | | | | | | | | | | Reset popup to 350x500, old form factor as advised by @Zanibas | sdtsui | 2017-08-01 | 1 | -1/+1 |
| | | | | * | | | | | | | | | | | | | | | Add new fonts from @cjeria: DIN Next and DIN OT | sdtsui | 2017-08-01 | 12 | -0/+0 |
| | | | | * | | | | | | | | | | | | | | | Adjust popup size to 545x450; refactor wallet view to fit | sdtsui | 2017-08-01 | 1 | -1/+1 |
| | | | | * | | | | | | | | | | | | | | | Set font-size on body of popup.html, for responsiveness | sdtsui | 2017-07-31 | 1 | -1/+1 |
| | | | | * | | | | | | | | | | | | | | | Adjust dimensions of popup.html and app bar to match | sdtsui | 2017-07-31 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #3016 from MetaMask/sentry | Dan Finlay | 2018-01-19 | 4 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | sentry - dedupe raven vendor | kumavis | 2018-01-18 | 2 | -5/+2 |
| * | | | | | | | | | | | | | | | | | | | | sentry - breakout raven setup and add release config | kumavis | 2018-01-18 | 3 | -9/+35 |
| * | | | | | | | | | | | | | | | | | | | | sentry - update raven and add to ui | kumavis | 2018-01-18 | 4 | -7/+13 |
| * | | | | | | | | | | | | | | | | | | | | sentry - add raven + sentry reporting config | kumavis | 2018-01-18 | 2 | -0/+8 |
| |/ / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | test - tx controller - fix txGasUtil reference | kumavis | 2018-01-18 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | | Update transactions.js | kumavis | 2018-01-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | transactions - transtion approved transactions to failed transactions on boot | frankiebee | 2018-01-18 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | | | | | | transactions - fail txs on boot who fail addTxDefaults | frankiebee | 2018-01-18 | 1 | -0/+2 |
* | | | | | | | | | | | | | | | | | | | | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ... | frankiebee | 2018-01-18 | 1 | -2/+20 |
|/ / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | Version 3.13.5v3.13.5 | Dan Finlay | 2018-01-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | Create new flag for simple sends to avoid overloading other flag | Dan Finlay | 2018-01-17 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2907-NoCodeGasLimit | kumavis | 2018-01-17 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into open-popup | Frankie | 2018-01-16 | 3 | -13/+79 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | transactions - emit 'newUnapprovedTx' before estimateGas finishes | frankiebee | 2018-01-15 | 1 | -2/+6 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2907-NoCodeGasLimit | Dan Finlay | 2018-01-16 | 2 | -11/+74 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimation | Dan Finlay | 2018-01-16 | 2 | -11/+74 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | Prefer passing a provider over an ethQuery instance | Dan Finlay | 2018-01-13 | 2 | -8/+4 |
| | * | | | | | | | | | | | | | | | | | | | | Improve gas price estimation by backfilling recent-blocks | Dan Finlay | 2018-01-12 | 2 | -9/+76 |
| | |/ / / / / / / / / / / / / / / / / / / | |||||
* | / / / / / / / / / / / / / / / / / / / | Set gas limit to 21k for recipients with no code | Dan Finlay | 2018-01-16 | 1 | -5/+22 |
|/ / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #2900 from MetaMask/infura-rest-api | kumavis | 2018-01-16 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into infura-rest-api | kumavis | 2018-01-12 | 2 | -3/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | provider - infura - use infura REST api | kumavis | 2018-01-09 | 1 | -2/+5 |