aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move clearNotifications to popup.jsFrankie2016-06-292-9/+10
* fix for lintingFrankie2016-06-291-5/+5
* Merge branch 'master' into i340+1Frankie2016-06-297-2/+12
|\
| * Change color of failure to yellow. Change pending to ellipsis. (#338)Kevin Serrano2016-06-294-2/+8
| * Merge pull request #335 from Zanibas/title-additionskumavis2016-06-283-0/+4
| |\
| | * Add alt titles to most critical iconsKevin Serrano2016-06-283-0/+4
| |/
* | fix #341 close notifications when oppening pop upFrankie2016-06-292-2/+10
* | Fix it so you cant send a negitavie amount of ETHFrankie2016-06-281-1/+5
|/
* Merge pull request #327 from MetaMask/uiFixeskumavis2016-06-262-5/+3
|\
| * Merge branch 'master' into uiFixesFrankie2016-06-2517-454/+669
| |\ | |/ |/|
* | Merge pull request #326 from MetaMask/conf-tx-refactorkumavis2016-06-258-141/+221
|\ \
| * | clean - appease the linting machinekumavis2016-06-253-28/+9
| * | svg notif now work for msg signatureskumavis2016-06-255-84/+141
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into conf-tx-ref...kumavis2016-06-251-1/+1
| |\ \
| * | | breakout pending-tx-detailskumavis2016-06-255-35/+77
* | | | Merge pull request #323 from MetaMask/RefactorBackgroundkumavis2016-06-259-313/+448
|\ \ \ \ | |_|/ / |/| | |
| * | | Debugged by using a real dappDan Finlay2016-06-251-3/+4
| * | | Manually debugged refactorDan Finlay2016-06-252-13/+14
| * | | Fixed testsDan Finlay2016-06-257-20/+87
| * | | Rename background-controller metamask-controllerDan Finlay2016-06-252-4/+4
| * | | Improve refactorDan Finlay2016-06-256-105/+124
| * | | Refactored background.js controller apart from chrome + transportDan Finlay2016-06-252-254/+301
| | | * Fix for the mailto linkFrankie2016-06-251-1/+1
| | | * Fix editable button so that it dosent float above the drop down menueFrankie2016-06-251-4/+2
| |_|/ |/| |
* | | Merge pull request #322 from MetaMask/i321kumavis2016-06-251-1/+1
|\ \ \ | |_|/ |/| |
| * | identicon - default to imageifykumavis2016-06-251-1/+1
|/ /
* | Merge pull request #320 from MetaMask/i318kumavis2016-06-252-5/+7
|\ \ | |/ |/|
| * send-tx remove account select buttonkumavis2016-06-252-5/+7
|/
* Bump changelogDan Finlay2016-06-251-0/+3
* Merge pull request #319 from MetaMask/pdfkumavis2016-06-251-32/+48
|\
| * contentscript - skip web3 injection if domain appears to be a pdfkumavis2016-06-251-32/+48
|/
* Merge pull request #312 from MetaMask/svg-notifkumavis2016-06-2411-164/+184
|\
| * notif - remove dummy dev notifkumavis2016-06-241-7/+0
| * some legit linting fixeskumavis2016-06-242-2/+2
| * stop pedantic lintingkumavis2016-06-242-5/+5
| * pending-tx pass the identicon pref onkumavis2016-06-242-0/+2
| * svg notif - use actual txParamskumavis2016-06-241-15/+5
| * account-panel combine panel into account-panelkumavis2016-06-242-66/+37
| * accounts - rename account list item so it doesnt overlapkumavis2016-06-242-2/+3
| * icon-factory - overhaul to provide svg or imagified elkumavis2016-06-244-63/+37
| * tx-conf add non-interactive mode for notificationkumavis2016-06-243-11/+21
| * svg notifications - remove unneeded deps and clean codekumavis2016-06-243-57/+36
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into svg-notifkumavis2016-06-2434-10724/+123
| |\
| * | initial svg notificationskumavis2016-06-234-21/+121
* | | Merge pull request #315 from MetaMask/UpdatedMenuBarkumavis2016-06-242-40/+65
|\ \ \ | |_|/ |/| |
| * | Add fox logo back to left of menuDan Finlay2016-06-241-8/+29
| * | Moved account change button to menu barDan Finlay2016-06-242-32/+36
|/ /
* | deps - bump web3-stream-providerkumavis2016-06-241-1/+1
* | 2.4.4kumavis2016-06-242-1/+7
* | deps - bump web3-stream-providerkumavis2016-06-241-1/+1
* | 2.4.3kumavis2016-06-241-1/+1
* | Merge pull request #314 from MetaMask/stream-provider-fixkumavis2016-06-241-1/+1
|\ \
| * | deps - bump stream-providerkumavis2016-06-241-1/+1
|/ /
* | Merge pull request #311 from MetaMask/settingsDan Finlay2016-06-232-37/+1
|\ \
| * | close #309Frankie2016-06-232-1/+1
| * | Remove redundant network option buttons from settings pageFrankie2016-06-231-37/+1
|/ /
* | Merge pull request #310 from MetaMask/fontChangeDan Finlay2016-06-2331-10685/+114
|\ \ | |/ |/|
| * Add to change logFrankie2016-06-231-0/+2
| * Merge branch 'master' into fontChangeFrankie2016-06-235-20/+27
| |\ | |/ |/|
* | Enhance nvmrcDan Finlay2016-06-231-1/+1
* | Version 2.4.2Dan Finlay2016-06-232-1/+4
* | Merge pull request #305 from MetaMask/FixEthSignkumavis2016-06-223-18/+22
|\ \
| * | Bump changelogDan Finlay2016-06-221-1/+1
| * | Fix eth sign with dennis' test inputDan Finlay2016-06-222-17/+21
|/ /
| * Swap out Transat font for MontserratFrankie2016-06-2330-10685/+112
|/
* Merge pull request #304 from MetaMask/buttonsDan Finlay2016-06-225-3/+13
|\
| * Fix for lint errFrankie2016-06-222-13/+7
| * Add to changelogFrankie2016-06-221-0/+3
| * Fix conflictFrankie2016-06-2276-2470/+2496
| |\ | |/ |/|
* | Fix badge token paramDan Finlay2016-06-221-1/+1
* | Add circle token to badge imageDan Finlay2016-06-221-1/+1
* | Update build badgeDan Finlay2016-06-221-1/+1
* | Update CI status badge for CircleDan Finlay2016-06-221-1/+1
* | Merge pull request #303 from MetaMask/AutoLintkumavis2016-06-2276-2462/+2482
|\ \
| * | Add circle.ymlDan Finlay2016-06-221-0/+3
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLintDan Finlay2016-06-221-11/+15
| |\ \ | |/ / |/| |
* | | Merge pull request #302 from MetaMask/batch-payload-originDan Finlay2016-06-221-12/+15
|\ \ \
| * | | background - batch rpc fix for origin domainkumavis2016-06-221-12/+15
| | * | Add linting to our mocha suiteDan Finlay2016-06-222-1/+11
| | * | Manually lintedDan Finlay2016-06-2241-153/+95
| | * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLintDan Finlay2016-06-224-12/+25
| | |\ \ | |_|/ / |/| | |
| | * | Auto lintedDan Finlay2016-06-2270-2344/+2233
| | * | Turn spaces back onDan Finlay2016-06-221-2/+2
| | * | Some manual fixesDan Finlay2016-06-223-7/+4
| | * | Got eslint running correctlyDan Finlay2016-06-224-10/+16
| | * | Began adding auto lintingDan Finlay2016-06-224-2/+175
| | | * Change the copy to cliboard iconFrankie2016-06-221-2/+6
| | | * add key.pngFrankie2016-06-221-0/+0
| | | * Change export icon to keyFrankie2016-06-222-3/+9
| |_|/ |/| |
* | | Merge pull request #299 from MetaMask/balances-bug-fixDan Finlay2016-06-222-11/+22
|\ \ \ | |/ / |/| |
| * | tweekZac Mitton2016-06-211-1/+0
| * | added a failing case and fixed it by refactoring everything to stringsZac Mitton2016-06-212-11/+23
| |/
* | 2.4.1kumavis2016-06-211-1/+1
* | id-mgmt - add missing depskumavis2016-06-211-0/+3
|/
* Version 2.4.0Dan Finlay2016-06-212-1/+3
* Merge pull request #294 from MetaMask/SignFullDataNotHashDan Finlay2016-06-214-76/+111
|\
| * Merge branch 'master' into SignFullDataNotHashDan Finlay2016-06-1733-38/+2587
| |\
| * | Update changelogDan Finlay2016-06-171-1/+1
| * | Fixed signing of hashesDan Finlay2016-06-172-17/+16
| * | Began adding signMsg unit testDan Finlay2016-06-161-0/+31
| * | Factor idManagement into its own moduleDan Finlay2016-06-162-76/+80
| * | Sign binary data not hash on eth_signDan Finlay2016-06-161-2/+2
* | | Merge pull request #296 from MetaMask/i252Dan Finlay2016-06-183-19/+48
|\ \ \
| * | | idStore - add DELEGATE_CALL detectionkumavis2016-06-173-19/+48
* | | | Fix tx approval address formattingDan Finlay2016-06-171-1/+2
| |_|/ |/| |
* | | Merge pull request #295 from MetaMask/AddDisclaimerkumavis2016-06-1711-38/+149
|\ \ \
| * | | Bump changelogDan Finlay2016-06-171-0/+1
| * | | Preserve disclaimer line breaksDan Finlay2016-06-171-2/+2
| * | | Added some real text to top of disclaimerDan Finlay2016-06-171-1/+3
| * | | Increase disclaimer scroll box heightDan Finlay2016-06-171-1/+1
| * | | Remove dead codeDan Finlay2016-06-171-34/+0
| * | | Conditionally display disclaimerDan Finlay2016-06-171-0/+6
| * | | Add disclaimer componentDan Finlay2016-06-171-0/+56
| * | | Improved template to not be invisibleDan Finlay2016-06-171-1/+2
| * | | Create disclaimer approval reducerDan Finlay2016-06-171-0/+5
| * | | Add confirmation status to metamask state branchDan Finlay2016-06-171-0/+1
| * | | Fix disclaimer approving actionDan Finlay2016-06-171-1/+2
| * | | Add disclaimer consent actionDan Finlay2016-06-171-0/+13
| * | | Expose disclaimer consent to dnode APIDan Finlay2016-06-171-0/+10
| * | | Add placeholder disclaimer fileDan Finlay2016-06-171-0/+9
| * | | Improve templateDan Finlay2016-06-171-2/+1
| * | | Add confirmation persisting to localStorageDan Finlay2016-06-172-1/+42
| |/ /
* | | Merge pull request #291 from MetaMask/AddContributingMdkumavis2016-06-171-0/+54
|\ \ \ | |/ / |/| |
| * | Add contributing.md fileDan Finlay2016-06-161-0/+54
| |/
* | Merge pull request #293 from MetaMask/ResizeImagesDan Finlay2016-06-179-0/+0
|\ \
| * | Resize images for chrome store acceptanceDan Finlay2016-06-179-0/+0
|/ /
* | Merge pull request #290 from MetaMask/screenshotsDan Finlay2016-06-1615-0/+2383
|\ \ | |/ |/|
| * icon fox eyes changed to navy blue everywhereZac Mitton2016-06-169-0/+2383
| * screenshots and promos for chrome store round 1Zac Mitton2016-06-159-0/+0
|/
* Merge pull request #289 from MetaMask/FixSignatureConcatenationDan Finlay2016-06-152-2/+10
|\
| * Bump changelogDan Finlay2016-06-151-0/+1
| * Fix pad with zeroes usageDan Finlay2016-06-151-2/+2
| * Fix signature concatenationDan Finlay2016-06-151-2/+9
|/
* Bump changelogDan Finlay2016-06-151-0/+1
* Merge pull request #286 from MetaMask/FixSpinnerDan Finlay2016-06-152-2/+4
|\
| * Bump changelogDan Finlay2016-06-151-2/+3
| * Made network spinner clickableDan Finlay2016-06-151-0/+1
* | Merge pull request #287 from MetaMask/LongerAddressInListDan Finlay2016-06-153-10/+20
|\ \ | |/ |/|
| * Let account address take more space in account listDan Finlay2016-06-153-10/+20
|/
* Merge pull request #285 from MetaMask/ShowMoreAddressDan Finlay2016-06-151-6/+7
|\
| * Show more address in detail viewDan Finlay2016-06-151-6/+7
|/
* Center main account iconDan Finlay2016-06-151-0/+1
* Merge pull request #283 from MetaMask/RewordLockDan Finlay2016-06-151-1/+1
|\
| * Rename Lock Account to simply LockDan Finlay2016-06-151-1/+1
* | Merge pull request #284 from MetaMask/VladIconsDan Finlay2016-06-151-1/+1
|\ \
| * | Remove unused classDan Finlay2016-06-151-1/+1
* | | Merge pull request #282 from MetaMask/VladIconsDan Finlay2016-06-1514-4/+169
|\| |
| * | Make gulp watch images folderDan Finlay2016-06-151-1/+1
| * | Insert vlad icons into UIDan Finlay2016-06-151-3/+6
| * | Add vlad icons to image folderDan Finlay2016-06-1510-0/+162
| * | Remove old lock imagesDan Finlay2016-06-152-0/+0
| |/
* / deps - bump stream-provider for better batch rpckumavis2016-06-151-1/+1
|/
* Merge pull request #266 from MetaMask/ArchitectureDiagramDan Finlay2016-06-142-0/+6
|\
| * Add architecture diagram to readmeDan Finlay2016-06-142-0/+6
|/
* Merge pull request #259 from MetaMask/uiFixesDan Finlay2016-06-135-20/+31
|\
| * Merge branch 'master' into uiFixesFrankie2016-06-130-0/+0
| |\ | |/ |/|
* | Version 2.3.1Dan Finlay2016-06-102-1/+4
* | Merge pull request #258 from MetaMask/uiFixesDan Finlay2016-06-093-34/+97
|\ \
| | * Write to CHANGELOGFrankie2016-06-131-0/+3
| | * Version 2.3.1Dan Finlay2016-06-132-1/+4
| | * Size export confirmation inputFrankie2016-06-133-3/+7
| | * Change name-label css bugFrankie2016-06-131-2/+1
| | * Remove qr code icon and reorder to have clipboard firstFrankie2016-06-132-9/+15
| | * Fix edit textFrankie2016-06-133-8/+7
| |/
| * Add spacing in line itemsFrankie2016-06-092-4/+6
| * Mend CHANGE.logFrankie2016-06-099-12/+95
| |\ | |/ |/|
* | Merge pull request #255 from MetaMask/CacheIdenticonsDan Finlay2016-06-074-11/+91
|\ \
| * | Cache identiconsDan Finlay2016-06-074-11/+91
|/ /
* | Version 2.3.0Dan Finlay2016-06-072-1/+3
* | Merge pull request #254 from MetaMask/remove_imagesDan Finlay2016-06-074-0/+0
|\ \
| * | switched to icons instead of picturesZac Mitton2016-06-074-0/+0
|/ /
* | Merge pull request #250 from MetaMask/uiFixesDan Finlay2016-06-074-5/+32
|\ \
| | * Style up the info screenFrankie2016-06-093-3/+21
| | * Add icons to left side of links, as well as the metmask version and stylingFrankie2016-06-091-34/+76
| |/
| * Merge branch 'master' into uiFixesFrankie2016-06-0623-68/+477
| |\ | |/ |/|
* | Update svg-notifications.mdkumavis2016-06-051-2/+3
* | Update svg-notifications.mdkumavis2016-06-051-13/+3
* | Update svg-notifications.mdkumavis2016-06-051-3/+8
* | Merge pull request #248 from MetaMask/ProviderMenuDan Finlay2016-06-041-1/+1
|\ \
| * | Make morden sail blueDan Finlay2016-06-041-1/+1
* | | Merge pull request #246 from MetaMask/ProviderMenukumavis2016-06-044-17/+117
|\| |
| * | Add provider menu on clicking network status indicator.Dan Finlay2016-06-044-28/+63
| * | Clicking network status indicator reveals provider menuDan Finlay2016-06-043-2/+67
|/ /
* | Merge pull request #245 from MetaMask/display_networkkumavis2016-06-0412-16/+79
|\ \
| * \ Merge branch 'master' into display_networkDan Finlay2016-06-0414-30/+280
| |\ \ | |/ / |/| |
* | | Merge pull request #242 from MetaMask/HashFixkumavis2016-06-032-1/+8
|\ \ \
| * | | Fix hashed address validationDan Finlay2016-06-032-4/+4
| * | | Add test case for sample hashed addressDan Finlay2016-06-021-0/+7
* | | | Merge pull request #241 from MetaMask/i236kumavis2016-06-031-16/+22
|\ \ \ \
| * | | | fix illegal return statement :(kumavis2016-06-031-16/+22
* | | | | Merge pull request #240 from MetaMask/RecoverSeedkumavis2016-06-0310-16/+241
|\ \ \ \ \
| * | | | | A couple seed recovery enhancementsDan Finlay2016-06-033-5/+6
| * | | | | Add login checkDan Finlay2016-06-031-1/+1
| * | | | | Added seed word recovery to config screenDan Finlay2016-06-039-13/+237
* | | | | | Merge pull request #239 from MetaMask/i236kumavis2016-06-031-0/+9
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * / / / hotfix for #236 - chrome notif api not availkumavis2016-06-031-0/+9
|/ / / /
* | | | Version 2.2.0Dan Finlay2016-06-032-1/+3
* | | | Bump provider engine versionDan Finlay2016-06-032-1/+2
| | * | Blockchain status now updates on availability changeDan Finlay2016-06-044-21/+26
| | * | Add network loading indicationDan Finlay2016-06-042-0/+14
| | * | Differentiate icon name from hover textDan Finlay2016-06-041-12/+16
| | * | Some minor lintingDan Finlay2016-06-041-4/+4
| | * | Make hover text more human friendlyDan Finlay2016-06-041-4/+4
| | * | Remove metamask logo from headerDan Finlay2016-06-041-6/+0
| | * | undo styleZac Mitton2016-06-021-6/+5
| | * | network status getting set upon start-up and showing in title bar but not aut...Zac Mitton2016-06-029-6/+53
| |/ / |/| |
| | * Add css to resize and alighn input for editable lableFrankie2016-06-063-3/+12
| | * Fix label size for edit labelFrankie2016-06-061-7/+3
| | * Add edit labelFrankie2016-06-062-1/+23
| | * Change chevron-down to fa-plusFrankie2016-06-041-1/+1
| |/ |/|
* | Merge pull request #230 from MetaMask/i150kumavis2016-05-311-1/+4
|\ \
| * | idStore - track network failurekumavis2016-05-311-1/+4
|/ /
* | Merge pull request #228 from MetaMask/i216Dan Finlay2016-05-276-75/+130
|\|
| * Merge branch 'master' into i216Dan Finlay2016-05-2710-62/+174
| |\ | |/ |/|
* | Merge pull request #224 from MetaMask/PendingTxListDan Finlay2016-05-2710-62/+175
|\ \
| * | Fix build errorDan Finlay2016-05-271-5/+2
| * | Remove etherscan links from non standard blockchainsDan Finlay2016-05-271-2/+9
| * | Fix network reference part 2Dan Finlay2016-05-271-1/+1
| * | Fix network referenceDan Finlay2016-05-272-2/+2
| * | Bump changelogDan Finlay2016-05-271-0/+3
| * | Add clicking txs in list shows tx conf screenDan Finlay2016-05-275-5/+50
| * | Add pending messages to sign to tx listDan Finlay2016-05-274-54/+113
| * | Center wallet nickname under identicon in tx confirmation screenDan Finlay2016-05-271-0/+2
| * | Correct version numberDan Finlay2016-05-271-1/+1
|/ /
| * Bump changelogDan Finlay2016-05-271-0/+2
| * ui - redesign - init + vault create/restore + seedkumavis2016-05-275-75/+129
|/
* Bump versionDan Finlay2016-05-272-1/+3
* Merge pull request #223 from MetaMask/LightwalletSecurityDan Finlay2016-05-272-1/+2
|\
| * Update eth-lightwallet for security fixDan Finlay2016-05-272-1/+2
|/
* Merge pull request #222 from MetaMask/balanceskumavis2016-05-263-31/+60
|\
| * correctly displaying small balances with testsZac Mitton2016-05-263-31/+60
* | Merge pull request #220 from MetaMask/FixTransactionBackButtonkumavis2016-05-269-179/+226
|\ \
| * \ Merge branch 'master' into FixTransactionBackButtonDan Finlay2016-05-265-14/+88
| |\ \
| * | | Move transaction list item into its own componentDan Finlay2016-05-262-107/+133
| * | | Make transaction list into actual React ComponentDan Finlay2016-05-262-48/+63
| * | | Add number indicating pending txs to account listDan Finlay2016-05-265-1/+39
| * | | Fix back button on pending tx screenDan Finlay2016-05-262-16/+21
| * | | Remove commented out codeDan Finlay2016-05-261-37/+0
| | |/ | |/|
* | | Merge pull request #221 from MetaMask/i218kumavis2016-05-263-2/+3
|\ \ \ | |_|/ |/| |
| * | background + notifications - add origin to message signatureskumavis2016-05-263-2/+3
|/ /
* | Merge pull request #219 from MetaMask/i218Dan Finlay2016-05-262-14/+35
|\ \
| * | notifications - show tx originkumavis2016-05-261-0/+1
| * | background - append origin to rpc payload and sig requestkumavis2016-05-261-14/+34
* | | Merge pull request #217 from MetaMask/FixWarningDan Finlay2016-05-263-0/+53
|\ \ \ | |_|/ |/| |
| * | Bump changelogDan Finlay2016-05-261-0/+1
| * | Fix persistent warning bugDan Finlay2016-05-262-0/+52
|/ /
* | Merge pull request #211 from MetaMask/h17Dan Finlay2016-05-261-0/+2
|\ \
| * | notifications - remove timeout for signature requestskumavis2016-05-261-0/+2
| |/
* | Merge pull request #212 from MetaMask/i208Dan Finlay2016-05-261-70/+70
|\ \ | |/ |/|
| * actions - remove use of 'this'kumavis2016-05-261-70/+70
|/