aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* break out IndexDbController && Run the first time test on mascarafrankiebee2017-04-289-81/+47
* Setup test enviroment for mascarafrankiebee2017-04-2810-1/+236
* Update README for mascarafrankiebee2017-04-272-12/+5
* bump client-sw-ready-eventfrankiebee2017-04-271-1/+1
* Merge pull request #1342 from MetaMask/AllowBigSignatureVkumavis2017-04-262-1/+2
|\
| * Allow signature V values over 1 byteDan Finlay2017-04-262-1/+2
|/
* Merge pull request #1339 from MetaMask/BumpProviderEngineKevin Serrano2017-04-252-1/+4
|\
| * Bump provider-engineDan Finlay2017-04-251-1/+1
| * Bump provider engineDan Finlay2017-04-252-1/+4
|/
* Merge pull request #1338 from MetaMask/Version-3.5.3kumavis2017-04-252-1/+5
|\
| * Version 3.5.3v3.5.3Dan Finlay2017-04-252-1/+5
|/
* Merge pull request #1336 from MetaMask/buyButtonRedoDan Finlay2017-04-2510-244/+216
|\
| * fix spellingfrankiebee2017-04-252-4/+4
| * Css fixesfrankiebee2017-04-242-7/+9
| * make buy button greenfrankiebee2017-04-241-1/+1
| * Fix issue where stopPropagation didnt stop submitting the tx when clicking bu...frankiebee2017-04-241-1/+1
| * Merge pull request #1335 from MetaMask/buyButtonRedoCleanUpFrankie2017-04-245-70/+1
| |\
| | * remove updateCoinBaseAmount actionJared Pereira2017-04-243-25/+0
| | * remove updateBuyAddress actionJared Pereira2017-04-244-29/+1
| | * remove case buyFormJared Pereira2017-04-231-3/+0
| | * remove buyButtonDeligator functionJared Pereira2017-04-231-12/+0
| | * remove extra buyAddress in stateJared Pereira2017-04-231-1/+0
| |/
| * Initial redo attempt of the buy view to look like vladt's desighnfrankiebee2017-04-196-195/+173
| * Create a custom radio list componentfrankiebee2017-04-191-0/+61
* | Merge pull request #1331 from MetaMask/i1323-kovanNoticeRemovalDan Finlay2017-04-253-2/+5
|\ \
| * | Add more detailed instructions on generating and deleting notices.Kevin Serrano2017-04-181-0/+4
| * | Remove kovan notice.Kevin Serrano2017-04-182-2/+1
| |/
* | Merge pull request #1333 from MetaMask/firefoxIDBkumavis2017-04-222-57/+40
|\ \ | |/ |/|
| * Clean up codefrankiebee2017-04-221-14/+13
| * Reduce wakeup time for firefoxfrankiebee2017-04-211-1/+1
| * Fix for firefoxfrankiebee2017-04-211-55/+39
|/
* Merge pull request #1313 from MetaMask/wakeUp2kumavis2017-04-073-5/+6
|\
| * fix syntaxfrankiebee2017-04-071-1/+1
| * uncomment intervalDelayfrankiebee2017-04-071-1/+1
| * match intervalsfrankiebee2017-04-071-1/+2
| * Fix wakeUps:frankiebee2017-04-073-6/+6
* | Merge pull request #1312 from MetaMask/WakeUpkumavis2017-04-073-2/+8
|\|
| * Bump sw-client versionfrankiebee2017-04-071-1/+1
| * remove unnecessary listnerfrankiebee2017-04-071-6/+1
| * Ping service worker to keep it from going idlefrankiebee2017-04-073-3/+14
|/
* Merge pull request #1311 from MetaMask/mascara-publishFrankie2017-04-066-21/+56
|\
| * mascara - ready to deploy via dockerkumavis2017-04-064-4/+40
| * mascara - mascara lib - read mascara origin from env varkumavis2017-04-061-17/+14
| * build - add envify to bundle processkumavis2017-04-061-0/+2
* | Merge pull request #1310 from MetaMask/account-transition-fixkumavis2017-04-063-2/+3
|\ \ | |/ |/|
| * Changelog.Kevin Serrano2017-04-061-0/+1
| * Fix account detail transition fix.Kevin Serrano2017-04-062-2/+2
|/
* Merge pull request #1309 from MetaMask/mascara2Frankie2017-04-0522-150/+236
|\
| * mascara - rename popup to uikumavis2017-04-052-3/+3
| * mascara - rename things + break out mascara asset serverkumavis2017-04-0511-114/+135
| * clean - remove unused extension refkumavis2017-04-051-3/+2
| * auto-faucet - only skip faucet on explicit test environmentkumavis2017-04-051-1/+1
| * add platforms to mascara + move buyEther window open to uikumavis2017-04-0510-31/+97
|/
* Merge pull request #1307 from MetaMask/mascarakumavis2017-04-0518-220/+328
|\
| * clean - metamask controller - remove logkumavis2017-04-051-1/+0
| * Remove out of date commentsfrankiebee2017-04-041-9/+1
| * Fix first install flowfrankiebee2017-04-042-11/+4
| * Update todos on READMEfrankiebee2017-04-031-0/+4
| * Update MetaMascara READMEfrankiebee2017-04-031-11/+3
| * Rename mascara root directoryfrankiebee2017-04-0312-0/+0
| * Check to see if connection is from popupfrankiebee2017-04-031-1/+1
| * Make Popup close after approving a transactionfrankiebee2017-04-031-7/+14
| * Merge branch 'master' into mascarafrankiebee2017-04-0319-334/+213
| |\
| * \ Merge branch 'master' into mascarafrankiebee2017-04-0315-82/+197
| |\ \
| * | | Rename and move around filesfrankiebee2017-04-0311-110/+21
| * | | Clean upfrankiebee2017-03-316-181/+11
| * | | fix streamfrankiebee2017-03-301-1/+1
| * | | Bump sw-stream and setup "untrusted and trusted comunication"frankiebee2017-03-304-6/+12
| * | | Create a Transaction from within the dappfrankiebee2017-03-301-1/+1
| * | | WIP: lost enital call from dapp to getAccountsfrankiebee2017-03-308-24/+14
| * | | Merge branch 'master' into mascarafrankiebee2017-03-2933-593/+720
| |\ \ \
| * | | | WIP: Untrusted external connections eg: dappsfrankiebee2017-03-299-54/+221
| * | | | add versioning and migrateing datafrankiebee2017-03-242-51/+28
| * | | | Merge branch 'master' into mascarafrankiebee2017-03-2467-1037/+573
| |\ \ \ \
| * | | | | Fix state persistencefrankiebee2017-03-241-1/+1
| * | | | | Clean up messy mergefrankiebee2017-03-241-11/+2
| * | | | | Merge branch 'mascaraMix' into mascarafrankiebee2017-03-242-23/+12
| |\ \ \ \ \
| | * | | | | Get mascara to send a transaction in the uifrankiebee2017-03-245-18/+11
| * | | | | | WIP: indexdb is at an err state "provider is undefined"frankiebee2017-03-245-13/+26
| |/ / / / /
| * | | | | WIP: streams->indexdbfrankiebee2017-03-2410-54/+96
| * | | | | WIP:streamfrankiebee2017-03-223-12/+13
| * | | | | notes and clean upfrankiebee2017-03-103-179/+7
| * | | | | put background in service workerfrankiebee2017-03-107-2/+378
* | | | | | Merge pull request #1308 from MetaMask/FixFaucetKevin Serrano2017-04-052-0/+3
|\ \ \ \ \ \
| * | | | | | Fix faucet to only autoFaucet first accountfrankiebee2017-04-052-0/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1306 from MetaMask/redoAutoFaucetAsFetchKevin Serrano2017-04-051-5/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Switch auto-faucet from XMLHttpRequest to fetchfrankiebee2017-04-041-5/+11
|/ / / / /
* | | | | Merge pull request #1300 from MetaMask/platformFrankie2017-04-0319-334/+213
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | notification-manager - rename show -> showPoup + make getPopup privatekumavis2017-04-012-11/+11
| * | | | ui - use global.platform for extension interactionkumavis2017-04-016-22/+21
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into platformkumavis2017-04-015-50/+101
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1297 from MetaMask/eip155Dan Finlay2017-04-014-35/+83
|\ \ \ \ \
| * | | | | tests - tx-manager - fix assert and clean formattingkumavis2017-03-312-10/+2
| * | | | | tx-manager - add eip155 supportkumavis2017-03-313-35/+91
* | | | | | Merge pull request #1299 from MetaMask/test-notice-fixDan Finlay2017-04-011-15/+18
|\ \ \ \ \ \
| * | | | | | test - fix notice-controller testkumavis2017-03-311-15/+18
|/ / / / / /
| | * | | | ui - move popup auto-close after tx conf to ui entrypointkumavis2017-04-012-6/+9
| | * | | | ui - startPopup returns store after bootkumavis2017-04-014-39/+46
| | * | | | ui - reducer - app - code cleanupkumavis2017-04-011-27/+20
| | * | | | etc - fix notification-manager ref, remove duplicated test filekumavis2017-03-312-79/+4
| | * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into platformkumavis2017-03-311-1/+1
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #1298 from MetaMask/tests-fixFrankie2017-03-313-10/+54
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | tests - add missing donekumavis2017-03-311-1/+1
| | * | | | extension - remove local extension files, we use extensionizerkumavis2017-03-312-85/+0
| | * | | | introduce platform api and rename notifications to notification-managerkumavis2017-03-317-80/+117
| | * | | | extension - prefer extensionizer modulekumavis2017-03-317-7/+7
| |/ / / /
| * | | | meta - package.json - rename npm test scriptskumavis2017-03-311-5/+5
| * | | | tests - helper - add notekumavis2017-03-311-9/+11
| * | | | tests - unit - fail on unhandled promise rejectionkumavis2017-03-312-4/+46
|/ / / /
* | | | Merge pull request #1288 from MetaMask/i1285-FixFirefoxCurrencyChecksKevin Serrano2017-03-301-1/+2
|\ \ \ \
| * | | | Fix currency checking for firefoxDan Finlay2017-03-301-1/+2
* | | | | Merge pull request #1293 from MetaMask/ImproveGasEstimatesKevin Serrano2017-03-302-14/+21
|\ \ \ \ \
| * | | | | tests - tx-utils gasBuffer calc - fix bug and user easier numberskumavis2017-03-301-11/+17
| * | | | | tx-utils - gas buffer ceiling at 90% of block gas limitkumavis2017-03-301-3/+4
* | | | | | Merge pull request #1287 from MetaMask/kumavis-patch-1Dan Finlay2017-03-301-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | deps - bump provider-enginekumavis2017-03-301-1/+1
* | | | | | Merge pull request #1283 from MetaMask/i1267-textfixkumavis2017-03-302-4/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix potential formatting issues for seed word display.Kevin Serrano2017-03-292-4/+8
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1284 from MetaMask/FixFirefoxPopupkumavis2017-03-303-2/+9
|\ \ \ \ \
| * | | | | LintedDan Finlay2017-03-301-1/+1
| * | | | | Bump changelogDan Finlay2017-03-301-0/+2
| * | | | | Fix popup behavior for FirefoxDan Finlay2017-03-302-2/+7
|/ / / / /
* | | | | Merge pull request #1281 from MetaMask/migration-enableDan Finlay2017-03-291-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing migration.Kevin Serrano2017-03-291-0/+1
|/ / / /
* | | | Merge pull request #1277 from MetaMask/Version-2.5.2Dan Finlay2017-03-292-1/+4
|\ \ \ \
| * | | | Version 2.5.2v3.5.2v2.5.2Dan Finlay2017-03-292-1/+4
|/ / / /
* | | | Merge pull request #1268 from MetaMask/kovan-faucet-instructionsDan Finlay2017-03-293-2/+14
|\ \ \ \
| * \ \ \ Merge branch 'master' into kovan-faucet-instructionsDan Finlay2017-03-2912-177/+108
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into kovan-faucet-instructionsKevin Serrano2017-03-283-1/+8
| |\ \ \ \ \
| * | | | | | Add to changelog.Kevin Serrano2017-03-281-0/+2
| * | | | | | Add link to kovan faucet instructions.Kevin Serrano2017-03-282-2/+13
* | | | | | | Merge pull request #1273 from MetaMask/i1267-seedfixDan Finlay2017-03-294-33/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Assure that seed words are placed into state tree upon request.Kevin Serrano2017-03-284-33/+6
* | | | | | | Merge pull request #1272 from MetaMask/hideseedwordsfromlogstateDan Finlay2017-03-291-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Remove a noteDan Finlay2017-03-291-1/+0
| * | | | | | | Merge branch 'master' into hideseedwordsfromlogstateDan Finlay2017-03-293-3/+17
| |\ \ \ \ \ \ \
| * | | | | | | | Add to changelog.Kevin Serrano2017-03-281-0/+2
| * | | | | | | | Remove seedWords from UI state dump.Kevin Serrano2017-03-281-1/+5
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #1276 from MetaMask/ImproveGasEstimateskumavis2017-03-298-173/+86
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'ImproveGasEstimates' of github.com:MetaMask/metamask-plugin int...kumavis2017-03-290-0/+0
| |\ \ \ \ \ \
| | * | | | | | Filter txs by txMeta network value in account detailDan Finlay2017-03-291-1/+1
| * | | | | | | Filter txs by txMeta network value in account detailkumavis2017-03-292-3/+3
| * | | | | | | tx manager - emit update on new unapproved txkumavis2017-03-291-1/+2
| |/ / / / / /
| * | | | | | Detect tx network from txMetaDan Finlay2017-03-291-1/+1
| * | | | | | tx manager - add eth-querykumavis2017-03-291-1/+3
| * | | | | | tx manager - adjust new tx flow and txMeta decorationskumavis2017-03-292-41/+32
| * | | | | | Improve UI gas calculation logicDan Finlay2017-03-294-127/+46
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1275 from MetaMask/injection-polishDan Finlay2017-03-291-3/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix injection logic.Kevin Serrano2017-03-291-3/+16
|/ / / / /
* | | | | Merge pull request #1271 from MetaMask/i1223-InjectIFramesDan Finlay2017-03-283-2/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump changelogDan Finlay2017-03-281-0/+2
| * | | | Merge branch 'master' into masterDan Finlay2017-03-287-11/+25
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1269 from MetaMask/notice-fixDan Finlay2017-03-283-1/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Version 3.5.1v3.5.1Dan Finlay2017-03-282-1/+3
| * | | | Add to changelog.Kevin Serrano2017-03-281-0/+2
| * | | | Fix edge case where notice does not require scrollbar.Kevin Serrano2017-03-281-0/+3
|/ / / /
* | | | Merge pull request #1266 from MetaMask/Version-3.5.0Frankie2017-03-282-1/+3
|\ \ \ \
| * | | | Version 3.5.0v3.5.0Dan Finlay2017-03-282-1/+3
|/ / / /
* | | | Merge pull request #1265 from MetaMask/ropsten-fixDan Finlay2017-03-284-10/+15
|\ \ \ \
| * | | | explorer - fix ropsten explorer link testskumavis2017-03-282-8/+13
| * | | | Merge branch 'ropsten-fix-2' of github.com:MetaMask/metamask-plugin into rops...kumavis2017-03-281-1/+1
| |\ \ \ \
| | * | | | block explorer - ropstenkumavis2017-03-281-1/+1
| |/ / / / |/| | | |
| * | | | tests - fix ropsten link checkkumavis2017-03-281-2/+2
| * | | | block explorer - account link - ropstenkumavis2017-03-281-1/+1
|/ / / /
| * / / Allow injection in IFrames + dynamic IFramesStefaan Ponnet2017-03-262-2/+2
|/ / /
* | | Merge pull request #1253 from MetaMask/i1210-txdisappearanceDan Finlay2017-03-253-10/+34
|\ \ \
| * \ \ Merge branch 'i1210-txdisappearance' of github.com:MetaMask/metamask-plugin i...Kevin Serrano2017-03-250-0/+0
| |\ \ \
| | * \ \ Merge branch 'master' into i1210-txdisappearanceKevin Serrano2017-03-2518-458/+627
| | |\ \ \ | |_|/ / / |/| | | |
| * | | | correct bug in test.Kevin Serrano2017-03-251-1/+1
| * | | | Add tests.Kevin Serrano2017-03-251-0/+11
| * | | | Merge branch 'master' into i1210-txdisappearanceKevin Serrano2017-03-2518-458/+627
| |\ \ \ \ | |/ / / / |/| / / / | |/ / /
* | | | Merge pull request #1249 from MetaMask/kovan-noticeKevin Serrano2017-03-254-3/+7
|\ \ \ \
| * \ \ \ Merge branch 'master' into kovan-noticeDan Finlay2017-03-254-0/+51
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1250 from MetaMask/notice-modificationDan Finlay2017-03-254-0/+51
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into notice-modificationDan Finlay2017-03-2510-455/+569
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Create migration to erase body in read notices.Kevin Serrano2017-03-231-0/+36
| * | | | | Add migration tests to ensure that bodies are erased properly in notices.Kevin Serrano2017-03-232-0/+14
| * | | | | Remove notice body after reading.Kevin Serrano2017-03-231-0/+1
| | * | | | Merge branch 'master' into kovan-noticeDan Finlay2017-03-2510-455/+569
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #1248 from MetaMask/i1234-HardGasLimits-BrowserFormDan Finlay2017-03-258-451/+565
|\ \ \ \ \ \
| * | | | | | Add personalMessages to function to calculate pending tx index.Kevin Serrano2017-03-251-1/+2
| * | | | | | Fix tx selecting bugDan Finlay2017-03-252-2/+3
| * | | | | | Remove goHome action causing erratic UI behavior.Kevin Serrano2017-03-251-1/+0
| * | | | | | Remove unnecessary logDan Finlay2017-03-251-2/+0
| * | | | | | Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamas...Dan Finlay2017-03-251-3/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-241-3/+3
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1257 from MetaMask/i1256-RemoveGasLimitParamKevin Serrano2017-03-241-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Remove gas limit paramDan Finlay2017-03-241-3/+3
|/ / / / / / /
| * / / / / / Disable accept button when gas limit is too lowDan Finlay2017-03-251-8/+5
| |/ / / / /
| * | | | | Make gas calculations on render more consistentDan Finlay2017-03-241-10/+16
| * | | | | Fix initial tx fee estimationDan Finlay2017-03-242-4/+5
| * | | | | Fix a couple thingsDan Finlay2017-03-242-15/+42
| * | | | | Make reset button clear errorsDan Finlay2017-03-241-0/+1
| * | | | | Fix initial gas price estimateDan Finlay2017-03-241-4/+5
| * | | | | Prevent default for reset and reject buttonsDan Finlay2017-03-242-1/+3
| * | | | | Override browser default validation messageDan Finlay2017-03-241-0/+1
| * | | | | Fix some broken refsDan Finlay2017-03-241-2/+2
| * | | | | Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamas...Dan Finlay2017-03-2418-22/+65
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-241-1/+1
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #1251 from MetaMask/kovan-tx-etherscanDan Finlay2017-03-231-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Enable etherscan linking on Kovan transaction list items.Kevin Serrano2017-03-231-1/+1
|/ / / / / /
| | * | | | Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-2314-17/+53
| | |\ \ \ \ | |_|/ / / / |/| | | | |
| | * | | | Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-234-4/+11
| | |\ \ \ \
| * | | | | | Combine pending-tx-details component into pending-tx-detailsDan Finlay2017-03-242-370/+346
| |/ / / / /
| * | | | | Bump changelogDan Finlay2017-03-231-0/+3
| * | | | | Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-238-52/+227
| |\ \ \ \ \
| * | | | | | Got basic validations workingDan Finlay2017-03-235-108/+199
| * | | | | | Some progressDan Finlay2017-03-232-7/+16
| | | | * | | Reset disabled state for confirm button after every notice.Kevin Serrano2017-03-231-1/+4
| | | | * | | Create announcement for Kovan.Kevin Serrano2017-03-233-2/+3
| |_|_|/ / / |/| | | | |
| | | | * | Add to changelog.Kevin Serrano2017-03-231-0/+1
| | | | * | Fix persistence of transactions between networks.Kevin Serrano2017-03-231-10/+22
| |_|_|/ / |/| | | |
* | | | | Merge pull request #1243 from MetaMask/i238-kovanDan Finlay2017-03-2310-4/+45
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i238-kovanDan Finlay2017-03-231-9/+5
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1241 from MetaMask/i1237-xmlfix2Dan Finlay2017-03-231-9/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into i1237-xmlfix2Kevin Serrano2017-03-231-0/+1
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into i1237-xmlfix2Dan Finlay2017-03-232-4/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into i1237-xmlfix2Kevin Serrano2017-03-231-1/+5
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'master' into i1237-xmlfix2Dan Finlay2017-03-233-3/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into i1237-xmlfix2Kevin Serrano2017-03-233-6/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Modify logic for injection conditions.Kevin Serrano2017-03-231-9/+5
| | | | | | * | | Merge branch 'master' into i238-kovanKevin Serrano2017-03-233-4/+3
| | | | | | |\ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1247 from MetaMask/hide-passwordKevin Serrano2017-03-231-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into hide-passwordKevin Serrano2017-03-232-4/+2
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1245 from MetaMask/i1193-errorstylefixDan Finlay2017-03-232-4/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into i1193-errorstylefixDan Finlay2017-03-234-4/+11
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix styling of error message.Kevin Serrano2017-03-232-4/+2
| | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge branch 'master' into hide-passwordKevin Serrano2017-03-234-4/+11
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| | * | | | | | Hide the password in the private key retrieval screen.Kevin Serrano2017-03-231-0/+1
| |/ / / / / /
| | | | * | | Merge branch 'master' into i238-kovanKevin Serrano2017-03-231-1/+5
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #1244 from MetaMask/i1227-uidumpblockhashDan Finlay2017-03-231-1/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch 'master' into i1227-uidumpblockhashDan Finlay2017-03-233-3/+6
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add current block number and hash to the state.Kevin Serrano2017-03-231-1/+5
| |/ / / / /
| | | * | | Merge branch 'master' into i238-kovanDan Finlay2017-03-233-3/+6
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #1225 from MetaMask/i1033-spinnerfixDan Finlay2017-03-233-3/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into i1033-spinnerfixkumavis2017-03-238-51/+226
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add one more loading indication.Kevin Serrano2017-03-231-0/+1
| * | | | | Uncomment lines relating to showing indicator.Kevin Serrano2017-03-221-2/+2
| * | | | | Remove redundant removal of loading indicator. Integrate loading indicator di...Kevin Serrano2017-03-222-5/+3
| * | | | | Changelog addition.Kevin Serrano2017-03-211-0/+1
| * | | | | Add action to hide loading indication on an incorrect pw.Kevin Serrano2017-03-211-2/+5
| | |_|/ / | |/| | |
| | | * | Changelog bump.Kevin Serrano2017-03-231-0/+1
| | | * | Add Kovan test network to our application.Kevin Serrano2017-03-231-0/+9
| | | * | Add kovan to drop-menu-itemKevin Serrano2017-03-231-1/+4
| | | * | Add conditional kovan to current network component.Kevin Serrano2017-03-231-0/+12
| | | * | Add kovan conditional to config screen.Kevin Serrano2017-03-231-0/+5
| | | * | Add conditional kovan logic to etherscan link generators.Kevin Serrano2017-03-232-2/+7
| | | * | Modify css rule for unused hollow diamond.Kevin Serrano2017-03-231-1/+1
| | | * | Add kovan config settings to config manager.Kevin Serrano2017-03-231-0/+4
| | | * | Add kovan to config file.Kevin Serrano2017-03-231-0/+2
| |_|/ / |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 13:42:23 +0800