aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* eth-balance fixkumavis2016-07-081-1/+10
* lint - dingle dangle comma tanglekumavis2016-07-081-1/+1
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio...kumavis2016-07-081-10/+1
|\
| * Merge pull request #417 from MetaMask/FixEthBalanceStyleDan Finlay2016-07-081-10/+1
| |\
| | * Fixed eth_balance style, completing partial mergeDan Finlay2016-07-081-10/+1
| |/
* | notif - add support for forward carratkumavis2016-07-081-13/+41
* | ui - remove doubled eth-balancekumavis2016-07-082-5/+1
|/
* Merge pull request #406 from MetaMask/ConfirmationStyleDan Finlay2016-07-0821-73/+603
|\
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio...kumavis2016-07-085-3/+116
| |\ | |/ |/|
* | Merge pull request #413 from MetaMask/ui-fixDan Finlay2016-07-085-3/+116
|\ \
| * | Remove logging for states.Kevin Serrano2016-07-081-1/+0
| * | Add new test state with tx history. Fix alignment issue with transaction hist...Kevin Serrano2016-07-085-3/+117
|/ /
| * lint fixkumavis2016-07-081-1/+1
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio...kumavis2016-07-082-21/+48
| |\ | |/ |/|
* | Merge pull request #412 from MetaMask/ethBalanceDan Finlay2016-07-082-17/+34
|\ \
| * | Change function name to generateBalanceObjectFrankie2016-07-082-4/+4
| * | Add method to deal with small decimals and create the object for eth-balance ...Frankie2016-07-082-17/+34
|/ /
| * Restore button naming consistencyDan Finlay2016-07-081-2/+2
| * Add nickname rendering for recipient addressDan Finlay2016-07-083-5/+63
| * LintedDan Finlay2016-07-082-2/+2
| * Refined tx confirmation button stylesDan Finlay2016-07-081-7/+19
| * Implement tx confirmation style refinementsDan Finlay2016-07-084-24/+38
| * Add configurable params to eth-balanceDan Finlay2016-07-081-10/+17
| * Make mini account panel labels fully configurableDan Finlay2016-07-082-28/+42
| * Remove formatBalance.formatted referencesDan Finlay2016-07-081-4/+4
| * Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-084-52/+52
| |\ | |/ |/|
* | Merge pull request #410 from MetaMask/cleanupEthbugDan Finlay2016-07-083-45/+45
|\ \
| * | Revert back to original formatBalanceFrankie2016-07-083-45/+45
|/ /
* | Merge pull request #408 from MetaMask/FixNoDeclineCallbackkumavis2016-07-081-8/+7
|\ \
| * | Fix bug where rejected tx would not call backDan Finlay2016-07-081-8/+7
|/ /
| * Merge branch 'ConfirmationStyle' of github.com:MetaMask/metamask-plugin into ...Dan Finlay2016-07-070-0/+0
| |\
| | * Correct data length calculationDan Finlay2016-07-071-1/+1
| * | Correct data length calculationDan Finlay2016-07-071-1/+1
| |/
| * Update gas costDan Finlay2016-07-071-1/+1
| * Fix sender balance rendering in pending tx detailsDan Finlay2016-07-071-1/+4
| * Simplify ui dev mode styleDan Finlay2016-07-072-2/+2
| * Bump changelogDan Finlay2016-07-071-0/+1
| * Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-075-9/+12
| |\ | |/ |/|
* | Merge pull request #404 from MetaMask/fastinjectkumavis2016-07-071-1/+1
|\ \
| * | contentscript - remove timeout before stream setupkumavis2016-07-071-1/+1
|/ /
* | Merge pull request #403 from MetaMask/fastinjectkumavis2016-07-073-5/+7
|\ \
| * \ Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinjectkumavis2016-07-072-3/+4
| |\ \ | |/ / |/| |
* | | Merge pull request #402 from MetaMask/z-position-fixDan Finlay2016-07-072-3/+4
|\ \ \
| * | | Fix dropdown z-index issue.Kevin Serrano2016-07-072-3/+4
|/ / /
| * | appease the linting godskumavis2016-07-072-4/+1
| * | changelog - add web3 min distkumavis2016-07-071-0/+1
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinjectkumavis2016-07-076-46/+49
| |\ \ | |/ / |/| |
* | | Merge pull request #401 from MetaMask/ethBalanceDan Finlay2016-07-071-1/+1
|\ \ \
| * | | Handle to small of balances with "<0.00001"Frankie2016-07-071-1/+1
|/ / /
| * | web3 injection - use web3 dist for faster injectionkumavis2016-07-072-5/+9
| | * LintedDan Finlay2016-07-072-29/+6
| | * Fixed up pending-tx-detailsDan Finlay2016-07-075-25/+29
| | * Fleshed out pending tx viewDan Finlay2016-07-076-32/+87
| | * Merged latest balance formatting codeDan Finlay2016-07-076-46/+48
| | |\ | |_|/ |/| |
* | | Merge pull request #399 from MetaMask/ethBalanceDan Finlay2016-07-076-46/+49
|\ \ \ | |/ / |/| |
| * | Add a postion option for tool tipFrankie2016-07-073-1/+4
| * | Add decimal hendeling to ETH balanceFrankie2016-07-074-45/+45
|/ /
| * Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-0710-41/+55
| |\ | |/ |/|
* | Merge pull request #392 from MetaMask/kumavis-patch-1Kevin Serrano2016-07-071-2/+2
|\ \
| * | readme - camel case MetaMaskkumavis2016-07-071-2/+2
|/ /
* | Merge pull request #387 from MetaMask/ui-formattingDan Finlay2016-07-072-23/+26
|\ \
| * | Add to changelog.Kevin Serrano2016-07-061-0/+1
| * | Move account balance down a row. Adjusted positioning of buttons.Kevin Serrano2016-07-061-23/+25
* | | Merge pull request #388 from MetaMask/script-editsDan Finlay2016-07-061-9/+9
|\ \ \
| * | | Edits to the script ya know.Kevin Serrano2016-07-061-9/+9
* | | | Merge pull request #389 from MetaMask/thinFontDan Finlay2016-07-066-5/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into thinFontFrankie2016-07-063-3/+32
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #385 from MetaMask/ImprovedLoggingDan Finlay2016-07-061-2/+4
|\ \ \ \
| * | | | Simplify error logDan Finlay2016-07-061-2/+1
| * | | | Improve metamask-controller error loggingDan Finlay2016-07-061-2/+5
| | |/ / | |/| |
| | * | Add light and ultraLight fontsFrankie2016-07-066-5/+14
| |/ /
| | * Began reworking tx conf viewDan Finlay2016-07-0714-19/+394
| | * Simplify empty account balance renderingDan Finlay2016-07-062-2/+2
| |/ |/|
* | Add video script draftDan Finlay2016-07-061-0/+27
* | Add state list rebuilding on ui taskDan Finlay2016-07-061-1/+1
|/
* Version 2.5.0Dan Finlay2016-07-022-1/+3
* Merge pull request #383 from MetaMask/i377Dan Finlay2016-07-022-0/+5
|\
| * Put network status checkmarks at end of rowDan Finlay2016-07-022-0/+5
|/
* Merge pull request #381 from MetaMask/ImproveUiDevModeDan Finlay2016-07-027-8/+46
|\
| * Improved Ui Dev ModeDan Finlay2016-07-027-8/+46
|/
* Merge pull request #380 from MetaMask/FrankieDisclaimerDan Finlay2016-07-0212-114/+119
|\
| * LintedDan Finlay2016-07-021-1/+0
| * Move main drop-down state to component stateDan Finlay2016-07-023-35/+9
| * Formatted dev mode betterDan Finlay2016-07-016-7/+23
| * Added some basic stylesDan Finlay2016-07-011-1/+14
| * Simplify ui task commandDan Finlay2016-07-011-1/+1
| * Clean up beefy usageDan Finlay2016-07-012-15/+3
| * Merge branch 'FrankieDisclaimer' of github.com:MetaMask/metamask-plugin into ...kumavis2016-07-012-25/+2
| |\
| | * Add query param restoring to mockerDan Finlay2016-07-011-2/+2
| | * Remove debugs from developmentDan Finlay2016-07-011-23/+0
| * | disclaimer - render via react-markdownkumavis2016-07-012-2/+11
| |/
| * Remove scroll fixing from ui previewDan Finlay2016-07-011-20/+2
| * Remove old disclaimerDan Finlay2016-07-011-8/+0
| * Merge branch 'master' into FrankieDisclaimerDan Finlay2016-07-0135-104/+969
| |\ | |/ |/|
* | Merge pull request #378 from MetaMask/UiDevkumavis2016-07-0124-4/+811
|\ \
| * | Add ui mocking mode explanationDan Finlay2016-07-011-0/+7
| * | Cleaned up some formatting for ui mockerDan Finlay2016-07-014-7/+14
| * | Add ui mocking scriptDan Finlay2016-07-011-1/+2
| * | Make info page not chrome dependentDan Finlay2016-07-011-1/+7
| * | Add selector component to ui mockerDan Finlay2016-07-012-20/+42
| * | First simple version of ui mockerDan Finlay2016-07-0122-3/+767
* | | Merge pull request #376 from MetaMask/typofix-sign-msgkumavis2016-07-011-1/+1
|\ \ \
| * | | fix typokumavis2016-07-011-1/+1
* | | | Merge pull request #375 from MetaMask/compactLayoutkumavis2016-07-016-89/+146
|\ \ \ \ | |/ / / |/| | |
| * | | Add to CHANGELOGFrankie2016-07-011-0/+1
| * | | Merge branch 'master' into compactLayoutFrankie2016-07-016-11/+12
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #373 from MetaMask/DoubleConfirmationkumavis2016-07-015-10/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump changelogDan Finlay2016-07-011-0/+1
| * | | Remove useless and buggy clearWallet functionDan Finlay2016-07-013-16/+0
| * | | Emphasizing how weird this bug is by removing all behavior from the method.Dan Finlay2016-07-011-5/+1
| * | | Replicated really strange bug with testDan Finlay2016-07-012-2/+17
| * | | Fix broken action referenceDan Finlay2016-07-011-0/+5
|/ / /
| * | Implemt new account layoutFrankie2016-07-016-35/+59
| * | WIP: Working on new layoutFrankie2016-07-014-82/+114
| | * Add new user agreementDan Finlay2016-07-012-1/+56
| |/ |/|
* | Fix gitattributesDan Finlay2016-06-301-1/+1
* | Merge branch 'master' of github.com:MetaMask/metamask-pluginDan Finlay2016-06-305-10/+82
|\|
| * Merge pull request #370 from MetaMask/networkIndicationkumavis2016-06-305-10/+82
| |\
| | * Merge branch 'master' of github.com:MetaMask/metamask-plugin into networkIndi...kumavis2016-06-309-41/+131
| | |\ | | |/ | |/|
| | * Merge branch 'master' into networkIndicationFrankie2016-06-304-6/+10
| | |\
| | * | Add to change logFrankie2016-06-304-21/+22
| | * | Add network name to indicator and some css fixesFrankie2016-06-304-11/+51
| | * | Add ✓ charchter to indicate active networkFrankie2016-06-302-0/+31
* | | | Add gitattributes file for the changelogDan Finlay2016-06-301-1/+1
|/ / /
* | | Merge pull request #368 from MetaMask/CopyTxHashkumavis2016-06-309-41/+131
|\ \ \ | |_|/ |/| |
| * | Unify tooltip stylesDan Finlay2016-06-304-26/+59
| * | Merge branch 'master' into CopyTxHashDan Finlay2016-06-303-5/+6
| |\ \ | |/ / |/| |
* | | Unify wording for transaction options (#369)Kevin Serrano2016-06-303-5/+7
| * | Add tooltip to copy buttonDan Finlay2016-06-303-10/+43
| * | Bump changelogDan Finlay2016-06-301-0/+2
| * | Use clipboard icon for copy buttonDan Finlay2016-06-301-3/+8
| * | Add copy button to transaction listDan Finlay2016-06-301-0/+3
| * | Replace manual copy buttons with new CopyButton componentDan Finlay2016-06-302-17/+6
| * | Add CopyButton componentDan Finlay2016-06-301-0/+26
|/ /
* / Version 2.4.5Dan Finlay2016-06-302-1/+3
|/
* Merge pull request #356 from MetaMask/networkDropdownFixkumavis2016-06-301-0/+21
|\
| * Remove missused actionFrankie2016-06-291-1/+0
| * Make it so that when you click the custom rpc url it closes the dropdown menuFrankie2016-06-291-1/+1
| * fix lintFrankie2016-06-291-4/+4
| * Merge branch 'master' into networkDropdownFixFrankie2016-06-294-18/+18
| |\ | |/ |/|
* | Modify network icons to reflect current design. (#355)Kevin Serrano2016-06-294-16/+14
* | Fix out-of-place positioning of pending tx badges. (#354)Kevin Serrano2016-06-292-2/+4
| * Add custom to drop down menuFrankie2016-06-291-0/+22
|/
* fix bad mergekumavis2016-06-291-6/+1
* Merge pull request #352 from MetaMask/pr/351kumavis2016-06-293-7/+5
|\
| * Merge branch 'master' into pr/351kumavis2016-06-296-87/+39
| |\ | |/ |/|
* | Merge pull request #350 from MetaMask/notif2kumavis2016-06-293-82/+28
|\ \
| * \ Merge branch 'master' into notif2kumavis2016-06-298-7/+33
| |\ \ | |/ / |/| |
* | | Merge pull request #345 from MetaMask/FixSomeFormattingkumavis2016-06-294-4/+13
|\ \ \
| * \ \ Merge branch 'master' into FixSomeFormattingkumavis2016-06-296-5/+30
| |\ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into FixSomeFormattingkumavis2016-06-291-3/+3
| |\ \ \
| * | | | Simplify `send ether` button to `send`.Dan Finlay2016-06-291-1/+1
| * | | | Fix formatting on terms & conditions pageDan Finlay2016-06-292-1/+2
| | | * | clean - remove svg notifications dockumavis2016-06-291-38/+0
| | | * | fix typokumavis2016-06-291-1/+1
| | | * | background - prepare state for notifcationskumavis2016-06-292-44/+28
| | | * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into notif2kumavis2016-06-294-2/+8
| | |/| | | | |/ / | |/| |
| | * | Merge branch 'master' of github.com:MetaMask/metamask-pluginkumavis2016-06-285-5/+7
| | |\ \
| | * | | notif - change size for better readabilitykumavis2016-06-281-3/+3
| | | | * Second layer of 20 character check modified.Kevin Serrano2016-06-291-1/+1
| | | | * Changelog update and reduce allowed characters from 30 to 20.Kevin Serrano2016-06-292-2/+3
| | | | * Merge branch 'master' into title-truncateKevin Serrano2016-06-296-6/+23
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #344 from Zanibas/character-limitkumavis2016-06-292-2/+6
|\ \ \ \ \
| * | | | | Code style fix.Kevin Serrano2016-06-291-2/+2
| * | | | | Merge changelog.Kevin Serrano2016-06-294-2/+9
| |\| | | |
| * | | | | Additional length check just in case.Kevin Serrano2016-06-291-2/+3
| * | | | | Enforce 30 character limit on wallet name.Kevin Serrano2016-06-292-0/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #348 from MetaMask/i341kumavis2016-06-294-4/+17
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | 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
| | | | * Wallet name now is properly truncated.Kevin Serrano2016-06-292-2/+2
| | | | * Truncate account name further.Kevin Serrano2016-06-291-1/+1
| |_|_|/ |/| | |
* | | | 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
|/ /
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-21 16:00:34 +0800