aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Lint fixDan2017-12-051-1/+1
* Css selected in background based on betaUI state.Dan2017-12-051-6/+15
* Add UI selectionDan2017-12-053-0/+19
* Fixes changes requested in pullrequestreview-79088534Jason Clark2017-11-271-0/+1
* more eslint fixesJason Clark2017-11-261-1/+1
* toggle wired up to preferences property storeJason Clark2017-11-252-2/+12
* incremental commitClark, Jason (Contractor)2017-11-241-0/+8
* Version BumpChi Kei Chan2017-11-161-1/+1
* Merge branch 'master' into merge-masterChi Kei Chan2017-11-163-2/+12
|\
| * newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-062-2/+2
| * Merge pull request #2291 from MetaMask/gasPriceSpecifiedKevin Serrano2017-10-281-0/+1
| |\
| | * Add indicator for specified gas priceKevin Serrano2017-10-061-0/+1
| * | Resolve merge conflictsKevin Serrano2017-10-2720-64/+209
| |\ \
| | * | 3.12.0v3.12.0kumavis2017-10-261-1/+1
| * | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-107-4/+221
| |\ \ \
| * | | | Make the function callback friendly.Kevin Serrano2017-10-101-4/+4
| * | | | Simplify try catchKevin Serrano2017-10-061-4/+2
| * | | | Catch an error if this is not defined.Kevin Serrano2017-10-061-1/+8
| * | | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-063-5/+7
| |\ \ \ \
| * | | | | Configured for callback-required function.'Kevin Serrano2017-10-051-2/+2
| * | | | | Include OS versionKevin Serrano2017-10-051-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2519 from danjm/NewUI-flat-lintfixesThomas Huang2017-11-031-2/+0
|\ \ \ \ \
| * | | | | Lint fixes for NewUI-flat.Dan2017-11-021-2/+0
* | | | | | 4.0.3kumavis2017-10-261-1/+1
* | | | | | Merge branch 'NewUI-flat' into uatChi Kei Chan2017-10-2619-37/+134
|\| | | | |
| * | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-261-3/+7
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Resolving that ugly merge.Kevin Serrano2017-10-261-3/+7
| * | | | | Sign Typed Request styling fixesChi Kei Chan2017-10-261-1/+1
| * | | | | Signature request fixes.Dan2017-10-261-1/+1
| * | | | | Add Info sectionAlexander Tseung2017-10-261-0/+0
| * | | | | Fix styling on notification viewChi Kei Chan2017-10-251-2/+2
| * | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-2513-31/+30
| |\| | | |
| | * | | | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-2513-31/+30
| | |\ \ \ \
| | | * | | | Fix lint warningsDaijiro Wachi2017-10-2213-31/+30
| * | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-253-1/+81
| |\| | | | |
| | * | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-241-0/+76
| | |\ \ \ \ \
| | | * | | | | Add ShapeShift UIChi Kei Chan2017-10-211-0/+76
| | | |/ / / /
| | * | | | | Try to fix intermittent test failure in NonceTracker testsDan Finlay2017-10-231-0/+4
| | * | | | | Version 3.11.2v3.11.2Dan Finlay2017-10-221-1/+1
| | |/ / / /
| | * | | | Version 3.11.1v3.11.1Dan Finlay2017-10-211-1/+1
| * | | | | Account menu white check markChi Kei Chan2017-10-241-0/+14
* | | | | | 4.0.2kumavis2017-10-211-1/+1
* | | | | | 4.0.1kumavis2017-10-211-1/+1
|/ / / / /
* | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-214-27/+88
|\| | | |
| * | | | LintedDan Finlay2017-10-202-2/+1
| * | | | Fix bug where new account was not immediately selectedDan Finlay2017-10-201-3/+14
| * | | | Allow computed balances to enumerate its own viewDan Finlay2017-10-201-2/+3
| * | | | Remove account-tracker from keyringControllerDan Finlay2017-10-191-1/+0
| * | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-196-90/+72
| |\ \ \ \
| * | | | | Make account tracking much more reactiveDan Finlay2017-10-192-12/+13
| * | | | | Make account tracking more reactiveDan Finlay2017-10-193-29/+33
| * | | | | Refresh computed balances controller when restoring vaultDan Finlay2017-10-192-1/+6
| * | | | | Add validation to balance constructorDan Finlay2017-10-191-0/+10
| * | | | | Stop tracking old account balances after restore vaultDan Finlay2017-10-191-0/+13
| * | | | | Promisify metamask-controller vault creating methodsDan Finlay2017-10-181-17/+10
| * | | | | Select first account when restoring seedDan Finlay2017-10-181-3/+17
| * | | | | Select first account on new vault creationDan Finlay2017-10-181-1/+12
* | | | | | Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-1955-29/+215
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Adding Account Dropdown V2Chi Kei Chan2017-10-134-24/+57
| * | | | | UI for send screen container without form rows.Dan2017-10-091-1/+4
| * | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-049-86/+90
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Enables remove token and ensures add/remove update the list without need for ...Dan2017-10-042-1/+13
| * | | | | Merge branch 'master' into mmnChi Kei Chan2017-09-2820-1119/+751
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-192-4/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into nmChi Kei Chan2017-09-1920-245/+519
| |\ \ \ \ \ \ \
| * | | | | | | | Improve styling in Confirmation Screen; Show decoded send token dataChi Kei Chan2017-09-131-1/+0
| * | | | | | | | Added signTokenTx; Adding token confirmation screenChi Kei Chan2017-09-121-0/+3
| * | | | | | | | Fix html heightChi Kei Chan2017-09-061-2/+2
| * | | | | | | | Replace Avenir Next with alternative.Dan2017-08-3011-0/+93
| * | | | | | | | Add bolt and info icon vector imagessdtsui2017-08-232-0/+22
| * | | | | | | | Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-144-5/+21
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into NewUI-flatkumavis2017-08-095-189/+253
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-0713-370/+308
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add Roboto without hooking it up via importsdtsui2017-08-0518-0/+0
| * | | | | | | | | | | Adjust sidebar transition using @cjeria\'s feedbacksdtsui2017-08-031-0/+10
| * | | | | | | | | | | Ensure app-header is rendered in responsive layoutsdtsui2017-08-031-1/+1
| * | | | | | | | | | | Add Ethereum Logosdtsui2017-08-031-0/+11
| * | | | | | | | | | | Reset popup to 350x500, old form factor as advised by @Zanibassdtsui2017-08-011-1/+1
| * | | | | | | | | | | Add new fonts from @cjeria: DIN Next and DIN OTsdtsui2017-08-0112-0/+0
| * | | | | | | | | | | Adjust popup size to 545x450; refactor wallet view to fitsdtsui2017-08-011-1/+1
| * | | | | | | | | | | Set font-size on body of popup.html, for responsivenesssdtsui2017-07-311-1/+1
| * | | | | | | | | | | Adjust dimensions of popup.html and app bar to matchsdtsui2017-07-312-2/+2
* | | | | | | | | | | | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-196-90/+72
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | contentscript - fix inpage require and bundlingkumavis2017-10-131-4/+4
* | | | | | | | | | | Break up inpage file read into multiple linesDan Finlay2017-10-131-1/+3
* | | | | | | | | | | Merge branch 'master' into i1340-SynchronousInjectionDan Finlay2017-10-1312-80/+317
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #2345 from MetaMask/Version-3.11.0Thomas Huang2017-10-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Version 3.11.0v3.11.0Dan Finlay2017-10-121-1/+1
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | nonce-tracker - use blockTracker directlykumavis2017-10-122-7/+4
| * | | | | | | | | | | network-controller - use obj-proxy for providerProxykumavis2017-10-111-3/+4
| * | | | | | | | | | | util - add obj-proxykumavis2017-10-111-0/+19
| * | | | | | | | | | | events-proxy - clean upkumavis2017-10-111-5/+5
| * | | | | | | | | | | lint fixeskumavis2017-10-112-8/+3
| * | | | | | | | | | | network controller - refactor to use eth-rpc-clientkumavis2017-10-112-29/+34
| * | | | | | | | | | | metamask controller - define this.newTransaction to ease instantiation orderkumavis2017-10-111-1/+6
| * | | | | | | | | | | metamask controller - simplify provider initkumavis2017-10-111-22/+16
| * | | | | | | | | | | metamask controller - breakout getAccounts methodkumavis2017-10-111-12/+14
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #2223 from ukstv/masterDan Finlay2017-10-103-1/+182
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Validate data format for eth_signTypedDataSergey Ukustov2017-10-071-0/+4
| | * | | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-073-1/+29
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'Version-3.10.9' into SignTypedDataDan Finlay2017-10-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-062-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add signTypedData input validationsDan Finlay2017-10-062-4/+20
| | * | | | | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-062-6/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-039-80/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add eth_signTypedData handlerSergey Ukustov2017-09-303-1/+162
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #2305 from MetaMask/nodeifyFrankie2017-10-071-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | lint fix - nodeifykumavis2017-10-071-1/+1
| | * | | | | | | | | | | | nodeify - allow callback to be optionalkumavis2017-10-071-2/+10
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInitkumavis2017-10-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Check status of pending transactions on startupDan Finlay2017-10-071-0/+1
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | When checking pending txs, check for successful txs with same nonce.Dan Finlay2017-10-071-0/+20
| * | | | | | | | | | | | Provide method for tx tracker to refer to all txsDan Finlay2017-10-072-1/+8
| |/ / / / / / / / / / /
| * | | | / / / / / / / Version 3.10.9v3.10.9Dan Finlay2017-10-061-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | "fix" hours for messagefrankiebee2017-10-061-1/+2
| * | | | | | | | | | pending-tx - check time stamp instead of block number for resubmitfrankiebee2017-10-062-4/+5
| |/ / / / / / / / /
* / / / / / / / / / Begin implementing sync injection ideaDan Finlay2017-10-051-2/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2250 from interfect/masterFrankie2017-10-041-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't pass origin as an HTTP headerAdam Novak2017-10-021-1/+0
* | | | | | | | | | pending tx tracker - on tx:warn append error message instead of error objkumavis2017-10-031-1/+1
* | | | | | | | | | pending tx tracker - tx:warning event includes err objkumavis2017-10-031-2/+2
* | | | | | | | | | pending tx tracker - resubmit - warn dont error on unknown errorkumavis2017-10-031-2/+5
* | | | | | | | | | pending tx tracker - dont throw on load failurekumavis2017-10-031-1/+0
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h...kumavis2017-10-032-2/+4
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into history-notesfrankiebee2017-10-032-2/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTxkumavis2017-10-032-2/+3
| | * | | | | | | | | Merge pull request #2138 from sunify/fix-firefox-corsThomas Huang2017-10-031-1/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Update manifest.jsonKevin Serrano2017-10-031-2/+1
| | | * | | | | | | | Wildcard for infura.io permissions, added permission for cryptonator apiAlex Lunyov2017-09-221-4/+2
| | | * | | | | | | | Fix CORS issues in FireFoxAlex Lunyov2017-09-211-1/+5
* | | | | | | | | | | tx state history - append note to first op of diffkumavis2017-10-031-2/+5
|/ / / / / / / / / /
* / / / / / / / / / transaction - provide notes for historyfrankiebee2017-10-032-12/+14
|/ / / / / / / / /
* | | | | | | | | Version 3.10.8 - Fix Currency Conversionv3.10.8Dan Finlay2017-09-302-2/+2
* | | | | | | | | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactionskumavis2017-09-303-26/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-303-26/+1
* | | | | | | | | | Merge pull request #2239 from MetaMask/network-controller-contdFrankie2017-09-301-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | network - make network controller internal network switching explicitkumavis2017-09-301-2/+3
* | | | | | | | | | | Merge pull request #2237 from MetaMask/network-controller-contdFrankie2017-09-303-36/+47
|\| | | | | | | | | |
| * | | | | | | | | | network - convert localhost from custom rpc to network typekumavis2017-09-303-7/+3
| * | | | | | | | | | network controller - small refactorkumavis2017-09-302-35/+50
| |/ / / / / / / / /
* / / / / / / / / / Version 3.10.7v3.10.7Dan Finlay2017-09-301-1/+1
|/ / / / / / / / /
* | / / / / / / / Ensure selected account is always set if possibleDan Finlay2017-09-301-0/+9
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #2124 from MetaMask/breakout-mascarakumavis2017-09-281-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | re-enabled x-metamask-origin for mascarafrankiebee2017-09-282-5/+1
| * | | | | | | | platforms: put context for extension in platform extension classfrankiebee2017-09-223-2/+4
| * | | | | | | | Merge branch 'master' into breakout-mascarafrankiebee2017-09-202-4/+10
| |\| | | | | | |
| * | | | | | | | add context to platform to not have X-Metamask-Origin in mascarafrankiebee2017-09-202-1/+2
* | | | | | | | | Merge branch 'master' into new-currency-testkumavis2017-09-2818-1114/+746
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #2194 from MetaMask/network-controller-refactorkumavis2017-09-282-33/+34
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | network controller - move _setProvider to bottomkumavis2017-09-281-18/+18
| | * | | | | | | | | network controller - refactor to use _setProviderkumavis2017-09-281-17/+28
| | * | | | | | | | | network - remove getter/setterkumavis2017-09-281-23/+14
| | * | | | | | | | | metamask - improve commentkumavis2017-09-281-2/+1
| * | | | | | | | | | Version 3.10.6Dan Finlay2017-09-281-1/+1
| * | | | | | | | | | Commit to the eth-keyring-controller moduleDan Finlay2017-09-281-599/+0
| * | | | | | | | | | Remove dead referenceDan Finlay2017-09-281-1/+0
| * | | | | | | | | | Fix Account SelectionDan Finlay2017-09-282-3/+7
| * | | | | | | | | | account-tracker - remove unused importkumavis2017-09-281-1/+0
| * | | | | | | | | | Merge branch 'master' into direct-block-trackerkumavis2017-09-289-323/+363
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3kumavis2017-09-286-319/+356
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin...frankiebee2017-09-272-2/+6
| | | * | | | | | | | | | transactions: reveal #getFilteredTxList from txStateManage and fix accountTra...frankiebee2017-09-271-1/+5
| | | * | | | | | | | | | transactions: make evnt names pretty and eaiser to readfrankiebee2017-09-272-11/+11
| | | * | | | | | | | | | transactions: lint fixes and reveal status-update event for balance controllerfrankiebee2017-09-275-13/+23
| | | * | | | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-2719-254/+430
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | ensure that values written to txParams are hex stringsfrankiebee2017-09-142-1/+10
| | | * | | | | | | | | | | linting && format fixingfrankiebee2017-09-132-12/+7
| | | * | | | | | | | | | | match other controller patternsfrankiebee2017-09-133-23/+22
| | | * | | | | | | | | | | fix miss typefrankiebee2017-09-091-1/+1
| | | * | | | | | | | | | | more tests and craete a getPendingTransactions functionfrankiebee2017-09-092-11/+10
| | | * | | | | | | | | | | fix messy mergefrankiebee2017-09-071-4/+4
| | | * | | | | | | | | | | remove unused variablefrankiebee2017-09-071-1/+0
| | | * | | | | | | | | | | fix merge and errors disaperaing on updatefrankiebee2017-09-072-3/+6
| | | * | | | | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-078-54/+233
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | add better commentsfrankiebee2017-09-062-32/+41
| | | * | | | | | | | | | | | rename tx-utils.js -> tx-gas-utils.jsfrankiebee2017-09-061-4/+0
| | | * | | | | | | | | | | | remove #buildEthTxFromParamsfrankiebee2017-09-061-17/+0
| | | * | | | | | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-08-227-14/+111
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Create TxStateManagerfrankiebee2017-08-223-47/+47
| | | * | | | | | | | | | | | | Create tests for TxStateManagerfrankiebee2017-08-192-192/+218
| | * | | | | | | | | | | | | | Fix accountTracker store referencesDan Finlay2017-09-282-2/+2
| | * | | | | | | | | | | | | | Version 3.10.5Dan Finlay2017-09-281-1/+1
| | * | | | | | | | | | | | | | Fix bug where block gas limit was incorrectly parsed.Dan Finlay2017-09-281-1/+3
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | style - small whitespace nitpickkumavis2017-09-281-1/+1
| * | | | | | | | | | | | | | account-tracker - use new block-tracker block formatkumavis2017-09-281-4/+2
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Version 3.10.4v3.10.4Dan Finlay2017-09-281-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-289-74/+242
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut...kumavis2017-09-277-40/+642
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Remove duplicate instantiation of account-trackerDan Finlay2017-09-271-5/+1
| | | * | | | | | | | | | | | Move obs store into account-tracker instead of inheritingDan Finlay2017-09-274-20/+25
| | | * | | | | | | | | | | | Restore blockGasLimit to account-trackerDan Finlay2017-09-271-0/+3
| | | * | | | | | | | | | | | Pass blocktracker to balances controllerDan Finlay2017-09-271-0/+1
| | | * | | | | | | | | | | | Make encryptor configurable for keyring-controllerDan Finlay2017-09-261-1/+1
| | | * | | | | | | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-261-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Make blockTracker an independent paramDan Finlay2017-09-262-3/+6
| | | * | | | | | | | | | | | | Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin in...Dan Finlay2017-09-262-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-262-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Implemented feedbackDan Finlay2017-09-262-7/+5
| | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Made some requested changesDan Finlay2017-09-261-7/+7
| | * | | | | | | | | | | | | | | Remove keyring controller from projectDan Finlay2017-09-233-596/+2
| | * | | | | | | | | | | | | | | Merge branch 'AddBalanceController' into BreakOutKeyringControllerDan Finlay2017-09-237-58/+217
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix accont-tracker merge bugDan Finlay2017-09-231-0/+4
| | | * | | | | | | | | | | | | | Fix account-tracker referencesDan Finlay2017-09-233-13/+13
| | | * | | | | | | | | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-2312-172/+178
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix computed-balances controller referenceDan Finlay2017-09-231-1/+1
| | | * | | | | | | | | | | | | | Refactor eth-store into account-trackerDan Finlay2017-09-234-16/+22
| | | * | | | | | | | | | | | | | Remove dead code from eth-storeDan Finlay2017-09-231-43/+1
| | | * | | | | | | | | | | | | | Add computed balance to account detail viewDan Finlay2017-09-144-7/+17
| | | * | | | | | | | | | | | | | Got pending balance updating correctlyDan Finlay2017-09-143-81/+69
| | | * | | | | | | | | | | | | | Add state-labeled events to allow subscribing to any transaction's state changeDan Finlay2017-09-141-0/+1
| | | * | | | | | | | | | | | | | Some progressDan Finlay2017-09-133-1/+143
| | | * | | | | | | | | | | | | | Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceControllerDan Finlay2017-09-121-0/+51
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | LintedDan Finlay2017-09-081-2/+1
| | | | * | | | | | | | | | | | | | Make tx calculations account for gas pricesDan Finlay2017-09-081-2/+8
| | | | * | | | | | | | | | | | | | Remove logsDan Finlay2017-09-081-8/+0
| | | | * | | | | | | | | | | | | | Fix balance calc testDan Finlay2017-09-081-0/+2
| | | | * | | | | | | | | | | | | | Add constructor commentDan Finlay2017-09-081-0/+5
| | | | * | | | | | | | | | | | | | Fix valueFor testDan Finlay2017-09-081-7/+8
| | | | * | | | | | | | | | | | | | Add basic test for valueForDan Finlay2017-09-081-4/+9
| | | | * | | | | | | | | | | | | | test not passingDan Finlay2017-09-081-1/+17
| | | | * | | | | | | | | | | | | | Check balances in parallelDan Finlay2017-09-071-1/+8
| | | | * | | | | | | | | | | | | | Add first passing balance calc testDan Finlay2017-09-071-0/+18
| | * | | | | | | | | | | | | | | | Allow metamaskController to define keyring typesDan Finlay2017-09-231-1/+1
| | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | network contoller - clean up unused codefrankiebee2017-09-271-6/+0
| * | | | | | | | | | | | | | | | listen for the blocke event on the block tracker instead of rawBlock on the p...frankiebee2017-09-272-2/+1
| * | | | | | | | | | | | | | | | wrap block tracker in events proxyfrankiebee2017-09-272-14/+39
| * | | | | | | | | | | | | | | | metamask - use provider-engines block trackerkumavis2017-09-231-1/+1
| * | | | | | | | | | | | | | | | bug - fix event emitter mem leak warningkumavis2017-09-221-3/+8
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-273-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #2143 from MetaMask/Version-3.10.3kumavis2017-09-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Version 3.10.3Dan Finlay2017-09-221-1/+1
| | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Define encryptor in constructor params instead of platform objectDan Finlay2017-09-231-1/+1
| * | | | | | | | | | | | | | Merge branch 'master' into ConfigurableEncryptionDan Finlay2017-09-221-1/+1
| |\| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Allow custom encryptor to be passed to MetaMaskController and KeyringControll...Dan Finlay2017-09-222-2/+3
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-212-4/+10
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | v3.10.2kumavis2017-09-191-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Do not mark a retry tx failed that has been broadcast successfullyDan Finlay2017-09-191-3/+9
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Version 3.10.1v3.10.1Dan Finlay2017-09-191-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Comply with current currency API and add additional styling.Kevin Serrano2017-09-191-2/+2
* | | | | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-1910-169/+169
|\| | | | | | | | | |
| * | | | | | | | | | createOriginMiddleware - fix var namekumavis2017-09-141-1/+1
| * | | | | | | | | | metamask controller - destroy filter polyfill on disconnectkumavis2017-09-141-4/+10
| * | | | | | | | | | metamask controller - move middleware into seperate fileskumavis2017-09-144-34/+44
| * | | | | | | | | | debug - prefer logger over consolekumavis2017-09-142-9/+9
| * | | | | | | | | | metamask cont - standardize multiplex stream namingkumavis2017-09-141-8/+8
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-131-1/+1
| |\| | | | | | | | |
| * | | | | | | | | | contentscript - fix obj-multiplex instantiation and use pump for streamskumavis2017-09-121-12/+33
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-122-12/+15
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | inpage - use obj-multiplex modulekumavis2017-09-081-6/+6
| * | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-084-26/+47
| |\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 20:45:28 +0800