aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
* Another merge conflict resolved.Roman Rodov2017-09-191-4/+4
* Resolve merge conflicts for currency sort merge.Roman Rodov2017-09-191-1/+3
* Merge branch 'master' into new-currency-testKevin Serrano2017-09-194-28/+43
|\
| * Merge branch 'master' into fix-tooltipDan Finlay2017-09-191-25/+40
| |\
| | * Haha silly me, only when gas is estimated and not explicit.Kevin Serrano2017-09-141-1/+1
| | * Lower warning threshold for high tx fee to account for fluctuating blockGasLi...Kevin Serrano2017-09-141-1/+2
| | * Add warning of higher failure risk since app proposed gasLimit.Kevin Serrano2017-09-141-25/+39
| * | fixed position of tooltips to avoid overflow.Kevin Serrano2017-09-133-3/+3
| |/
* | Modify conversion to new api.Kevin Serrano2017-09-152-58/+597
* | Merge branch 'master' into new-currency-testKevin Serrano2017-09-1416-44/+166
|\|
| * Fix support linkDan Finlay2017-09-131-1/+1
| * Convert state logs into a download.Kevin Serrano2017-09-131-3/+4
| * Fix typo.Kevin Serrano2017-09-121-2/+2
| * Add ability to save seed words as file.Kevin Serrano2017-09-121-0/+10
| * Add some styling.Kevin Serrano2017-09-121-0/+3
| * Move function as util function.Kevin Serrano2017-09-122-16/+18
| * Basic private key download file functionality.Kevin Serrano2017-09-121-9/+30
| * Show reject all only when tx count is > 1Kevin Serrano2017-09-122-2/+6
| * Merge github.com:MetaMask/metamask-extension into rejectallunapprovedKevin Serrano2017-09-123-10/+34
| |\
| | * Merge pull request #2047 from MetaMask/i1997-networkindicateThomas Huang2017-09-091-3/+8
| | |\
| | | * Add cursor on hover on loading. Change some wording.Kevin Serrano2017-09-081-3/+3
| | | * Add caret to indicate network is dropdown.Kevin Serrano2017-09-081-0/+5
| | * | Fix typo.Kevin Serrano2017-09-081-1/+1
| | * | Fix link to open new tab.Kevin Serrano2017-09-081-0/+1
| | * | Add front-end validation for own adddresses as a token contract address. Add ...Kevin Serrano2017-09-081-6/+24
| | * | Reword forgot password to restore seed phraseDan Finlay2017-09-081-1/+1
| | |/
| * | Convert icon to button.Kevin Serrano2017-09-082-12/+18
| * | Fold submit and buy ether into one button slotKevin Serrano2017-09-081-15/+9
| * | Merge branch 'master' of github.com:davidp94/metamask-extension into rejectal...Kevin Serrano2017-09-082-0/+23
| |\ \ | | |/ | |/|
| | * fix goHomedavidp942017-08-151-2/+6
| | * remove unused action typedavidp942017-08-151-1/+0
| | * cancel all txsDavidNinja2017-08-152-0/+20
| * | Place object property retrieval inside try-catchKevin Serrano2017-09-081-2/+3
| * | Change expected type to array.Kevin Serrano2017-09-081-1/+1
| * | Merge branch 'master' into readd-looseKevin Serrano2017-09-061-2/+13
| |\ \
| | * | Make eth_sign deprecation warning more usefulDan Finlay2017-09-061-2/+13
| * | | Resolve merge conflict from masterKevin Serrano2017-09-0611-68/+63
| |\| |
| * | | Readd loose label onto accounts.Kevin Serrano2017-08-104-4/+26
* | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-064-8/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Update etherscan links to httpsDan Finlay2017-09-021-5/+5
| * | | Update support linkDan Finlay2017-09-021-1/+1
| * | | Merge branch 'master' into i1986-AddVersionToStateLogsKevin Serrano2017-08-301-1/+1
| |\ \ \
| | * | | Multiple tokens shows the amount when greater than 1Thomas Huang2017-08-301-1/+1
| * | | | Add version to state logsDan Finlay2017-08-301-1/+4
| |/ / /
* / / / integrate infura currencyKevin Serrano2017-08-302-3/+62
|/ / /
* | | Remove eth-tx-viz link from tx history iconsDan Finlay2017-08-241-10/+1
* | | Fix eth sign formattingDan Finlay2017-08-182-2/+5
* | | Transition to home view after tx errorDan Finlay2017-08-171-18/+5
* | | Fallback to ethplorer linkDan Finlay2017-08-171-1/+18
* | | Remove dead codeDan Finlay2017-08-171-14/+0
* | | Remove default tokensDan Finlay2017-08-171-11/+1
* | | ReEnable Token ListDan Finlay2017-08-171-26/+9
* | | Merge pull request #1916 from MetaMask/fix/account-name-scrollKevin Serrano2017-08-161-1/+1
|\ \ \
| * | | Fix overflow issue on QubesOS, flagged by @kumavissdtsui2017-08-151-1/+1
| | |/ | |/|
* | | Change cursor type to indicate link.Kevin Serrano2017-08-161-0/+1
* | | fix spellingfrankiebee2017-08-161-4/+3
* | | Disable token listfrankiebee2017-08-161-9/+26
|/ /
* | Cleanup stray logs and lintsdtsui2017-08-112-6/+1
* | Add overflow support for all account names in account detailssdtsui2017-08-111-2/+11
* | Fix logic for dropdown components attaching checkmark to correct accountsdtsui2017-08-111-1/+2
* | Fix text overflow for dropdown components flagged by @frankiebeesdtsui2017-08-111-1/+14
|/
* ui - buy eth - formatting and moved network names to configkumavis2017-08-101-23/+19
* lint fixkumavis2017-08-091-1/+1
* ui - buy eth - add dharma beta to kovankumavis2017-08-091-12/+22
* ui - buy button view - refactorkumavis2017-08-091-46/+104
* Merge branch 'master' into greenkeeper/initialkumavis2017-08-093-73/+92
|\
| * Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layoutkumavis2017-08-092-70/+80
| |\
| | * Fix layout issues flagged by @tmashuangsdtsui2017-08-091-69/+79
| | * Make buy ui more central to the screensdtsui2017-08-091-1/+1
| * | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-0827-701/+974
| |\|
| * | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-051-3/+6
| |\ \
| * | | fixed: showing tx-s as errors vs. warningfrankiebee2017-08-051-3/+12
* | | | Updated commonjs require path for redux-logger and redux-thunk modulesThomas Huang2017-08-091-2/+2
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-0827-704/+980
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix integration test failures: unnecessary sandwich-expando event stopPropaga...sdtsui2017-08-051-1/+0
| * | | Lint menu-dropposdtsui2017-08-051-31/+24
| * | | Merge pull request #1862 from sdtsui/add-rctkumavis2017-08-054-2/+144
| |\ \ \
| | * | | Bring menu-droppo component into project, remove as a dependencysdtsui2017-08-052-1/+138
| | * | | Re-enable css transitions for dropdowns in header, needs menu-droppo library ...sdtsui2017-08-053-1/+6
| * | | | Cleanup breakpoint css + comment on hackinesssdtsui2017-08-051-11/+14
| * | | | Adds early breakpoint from @frankiebee 's + @kumavis 's CRsdtsui2017-08-051-0/+24
| |/ / /
| * | | ui - dropdown - use Object.assign syntax to appease coverage parserkumavis2017-08-041-3/+2
| * | | Merge branch 'master' into NewUIkumavis2017-08-041-3/+6
| |\ \ \ | | | |/ | | |/|
| | * | fix cancelTransaction not reciving a callbackfrankiebee2017-08-041-3/+6
| | |/
| * | Merge pull request #1858 from sdtsui/NewUIkumavis2017-08-047-31/+120
| |\ \
| | * | Adjust padding of accountSwitcher dropdownsdtsui2017-08-041-4/+7
| | * | Adjust top and bottom padding of accountSwitchersdtsui2017-08-041-2/+9
| | * | Lint ui/appsdtsui2017-08-043-14/+11
| | * | Allow new accounts selector to handle clickssdtsui2017-08-041-2/+2
| | * | Increase size of accountSelection dropdownsdtsui2017-08-041-8/+22
| | * | Increase size of settings dropdown and account settings dropdownsdtsui2017-08-042-2/+2
| | * | Increase size of network dropdownsdtsui2017-08-044-4/+28
| | * | De-dupe click handler for sandwich-expandosdtsui2017-08-041-6/+12
| | * | Add note with previous fa-angle-down for future refactorsdtsui2017-08-041-0/+2
| | * | Position account switcher icon back in app headersdtsui2017-08-041-2/+6
| | * | Move accountselector menu-droppo up to app-headersdtsui2017-08-041-0/+22
| | * | Disable account selection dropdown from account detailssdtsui2017-08-042-7/+16
| | * | Adjust account checksumAddress location upsdtsui2017-08-041-0/+1
| * | | Fix fox positioning.Kevin Serrano2017-08-041-1/+5
| |/ /
| * | Fix wonky widths for notices.Kevin Serrano2017-08-042-2/+6
| * | Add maximum width for private key revealKevin Serrano2017-08-041-1/+1
| * | Remove 100% properties that were messing up sizing.Kevin Serrano2017-08-041-2/+0
| * | Add QR functionalityKevin Serrano2017-08-041-0/+13
| * | lint fixkumavis2017-08-022-3/+3
| * | Fix dropdown behavior - networksdtsui2017-07-291-1/+11
| * | Fix dropdown toggle behavior - settingssdtsui2017-07-291-1/+5
| * | Fix dropdown toggle behavior - account dropdownssdtsui2017-07-291-2/+16
| * | Fix react warningDan Finlay2017-07-281-0/+6
| * | Limit max width of seed word conf screenDan Finlay2017-07-281-2/+5
| * | Correct token pluralization for one tokenDan Finlay2017-07-281-1/+3
| * | Merge branch 'master' into NewUIDan Finlay2017-07-281-1/+0
| |\|
| | * logState - dont redundantly log to consolekumavis2017-07-271-1/+0
| * | Set min gas price to 1 gweiDan Finlay2017-07-281-1/+1
| * | Ensure loading indication is full screenDan Finlay2017-07-281-0/+1
| * | Fix loading indication placementDan Finlay2017-07-281-1/+1
| * | Remove unused parameterDan Finlay2017-07-282-2/+2
| * | Restore support linkDan Finlay2017-07-281-4/+4
| * | Fix info page formattingDan Finlay2017-07-281-6/+14
| * | Fix spellingDan Finlay2017-07-281-1/+1
| * | Fix custom provider indicationDan Finlay2017-07-272-6/+6
| * | Remove object spread syntaxDan Finlay2017-07-271-7/+9
| * | Set initial scale for mobile.Dan Finlay2017-07-272-2/+4
| * | Re-center network dropdownsdtsui2017-07-272-2/+5
| * | Make account selection dropdown menu scrollable when too large for viewsdtsui2017-07-271-0/+2
| * | Remove Account Settings item from optionsMenu, unnecessarysdtsui2017-07-271-8/+0
| * | Lots of flex rearrangement on account detail viewDan Finlay2017-07-2610-132/+129
| * | Restore sort order fixDan Finlay2017-07-252-2/+5
| * | Replace ui with responsive-uiDan Finlay2017-07-2518-581/+604
| * | Fix referenceDan Finlay2017-07-211-1/+1
| * | Fix css linksDan Finlay2017-07-211-2/+2
| * | Merge branch 'master' into NewUIDan Finlay2017-07-214-5/+15
| |\|
| | * Lowered minimum gas price to 1 gweiDan Finlay2017-07-201-1/+1
| * | Move responsive ui into its own folder for easier mergesDan Finlay2017-07-21240-13677/+2
| * | Reorder Account Selector and Account Optionssdtsui2017-07-192-115/+128
| * | Hook up new dropdown componentssdtsui2017-07-187-184/+157
| * | Remove account options iconssdtsui2017-07-183-177/+0
| * | Remove accounts screensdtsui2017-07-184-271/+244
| * | Fix click handlers on AccountOptionsMenussdtsui2017-07-181-5/+5
| * | Cleanupsdtsui2017-07-185-33/+108
| * | Brighten dropdown menu item\'s textsdtsui2017-07-141-3/+11
| * | Implement redesigned dropdownsdtsui2017-07-131-0/+71
| * | Merge branch 'master' into NewUIDan Finlay2017-07-062-4/+0
| |\ \
| * | | Make responsive UI more flexyDan Finlay2017-07-045-12/+12
| * | | Get duplicate UI template workingDan Finlay2017-07-04125-5/+13679
| * | | Make folder for responsive UIDan Finlay2017-07-04121-0/+0
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-042-2/+1
* | | | lint fixeskumavis2017-08-043-5/+8
| |_|/ |/| |
* | | Fix transaction confirmation orderingDan Finlay2017-07-181-1/+5
* | | Add support page link to help pageDan Finlay2017-07-181-2/+8
* | | Fix spellingtmashuang2017-07-061-1/+1
| |/ |/|
* | Reenable Default Token ListDan Finlay2017-07-061-2/+0
|/
* Merge branch 'master' into i1720-NoSpinnerOnConfigKevin Serrano2017-07-042-23/+47
|\
| * Indicate which network is being searched forDan Finlay2017-07-041-1/+22
| * Add menu carrat next to network searching indicatorDan Finlay2017-07-042-22/+25
* | No longer show network spinner on config screenDan Finlay2017-07-041-1/+1
|/
* Merge branch 'master' into NoPopularTOkensThomas Huang2017-07-011-0/+2
|\
| * Remove send buttonDan Finlay2017-07-011-0/+2
* | Stop loading popular tokens by defaultDan Finlay2017-07-011-1/+3
|/
* Merge pull request #1700 from MetaMask/StyleImprovementsKevin Serrano2017-06-301-0/+1
|\
| * Add padding to token messagesDan Finlay2017-06-291-0/+1
* | change “ACCEPT” to “SUBMIT”frankiebee2017-06-301-1/+1
|/
* Merge pull request #1690 from MetaMask/i1669-StateCopyButtonThomas Huang2017-06-291-0/+28
|\
| * Add copy state logs buttonDan Finlay2017-06-291-0/+28
* | Merge pull request #1634 from MetaMask/i784-SendTokenButtonThomas Huang2017-06-291-7/+29
|\ \
| * \ Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-285-22/+45
| |\ \
| * \ \ Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-241-7/+4
| |\ \ \
| * \ \ \ Merge branch 'master' into i784-SendTokenButtonDan Finlay2017-06-233-10/+20
| |\ \ \ \
| * | | | | Fix propagationDan Finlay2017-06-201-1/+1
| * | | | | Add send button to TokenFactoryDan Finlay2017-06-201-7/+29
* | | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-299-53/+370
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Remove token contract validation stepDan Finlay2017-06-281-13/+1
| | |_|_|/ | |/| | |
| * | | | Do not allow adding non token addressesDan Finlay2017-06-281-1/+13
| * | | | Support other network linksDan Finlay2017-06-283-19/+27
| * | | | Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin in...Dan Finlay2017-06-281-1/+2
| |\ \ \ \
| | * | | | Fix Back Button on Add Token ViewThomas Huang2017-06-271-1/+2
| | | |_|/ | | |/| |
| * / | | Fix token adding bugDan Finlay2017-06-281-1/+3
| |/ / /
| * | | Merge branch 'master' into i1616-AddTokenAddingDan Finlay2017-06-233-10/+20
| |\ \ \ | | | |/ | | |/|
| * | | Reduce token list clutter by only showing held tokensDan Finlay2017-06-201-7/+4
| | |/ | |/|
| * | Add ability to add tokens to token listDan Finlay2017-06-164-17/+51
| * | Make add token screen a fully working formDan Finlay2017-06-161-11/+141
| * | Merge branch 'AddTokenList' into AddingTokensDan Finlay2017-06-162-15/+10
| |\ \
| * | | Remove logDan Finlay2017-06-161-1/+0
| * | | Create add token button and template viewDan Finlay2017-06-156-24/+170
* | | | Merge pull request #1681 from MetaMask/AddressStrippingDan Finlay2017-06-281-1/+1
|\ \ \ \
| * | | | Remove trailing periods and white spaceThomas Huang2017-06-281-1/+1
* | | | | Add Back Button for Import ScreenThomas Huang2017-06-281-0/+9
* | | | | Merge pull request #1675 from MetaMask/warning-fixesDan Finlay2017-06-282-2/+2
|\ \ \ \ \
| * | | | | Fix react warning for keys on ens address bookKevin Serrano2017-06-271-1/+1
| * | | | | Fix react warning on create-vault-completeKevin Serrano2017-06-271-1/+1
| | |_|_|/ | |/| | |
* | | | | Rename Send to NextThomas Huang2017-06-281-1/+1
| |/ / / |/| | |
* | | | Change disabling button as state property.Kevin Serrano2017-06-271-5/+4
* | | | Prevent users from accidentally submitting two transactions by disabling button.Kevin Serrano2017-06-271-0/+3
|/ / /
* | | Merge pull request #1603 from MetaMask/AddTokenListKevin Serrano2017-06-2313-33/+374
|\ \ \
| * | | Add better event lifecycle management to token list.Dan Finlay2017-06-201-4/+18
| | |/ | |/|
| * | Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-162-15/+10
| |\ \ | | |/ | |/|
| * | Hide message on normal loadingDan Finlay2017-06-151-1/+3
| * | Multiple loading style improvementsDan Finlay2017-06-152-8/+16
| * | Remove excessive logDan Finlay2017-06-151-1/+0
| * | Add no tokens messageDan Finlay2017-06-151-9/+13
| * | Vertically center loading indicationDan Finlay2017-06-151-2/+10
| * | Refresh token balance on network changeDan Finlay2017-06-151-5/+22
| * | Persist selected account tabDan Finlay2017-06-153-12/+41
| * | Rename history to sentDan Finlay2017-06-141-1/+1
| * | Auto populate token list with popular token balancesDan Finlay2017-06-147-32/+68
| * | Merge branch 'master' into AddTokenListDan Finlay2017-06-1341-6195/+1018
| |\ \
| * | | Add placeholder etherscan token iconsDan Finlay2017-04-253-3/+35
| * | | Get token list looking okDan Finlay2017-04-225-12/+136
| * | | Add functional but ugly and hard-coded token listDan Finlay2017-04-215-14/+109
* | | | Merge pull request #1655 from MetaMask/fix-malitoThomas Huang2017-06-221-5/+1
|\ \ \ \
| * | | | Fix broken malito link.Kevin Serrano2017-06-221-5/+1
| | |_|/ | |/| |
* / | | Make seed confirmation wording scarierDan Finlay2017-06-211-1/+1
|/ / /
* | | Add a new warning for file import JSONKevin Serrano2017-06-151-0/+3
* | | Merge pull request #1600 from MetaMask/i1554-ensSymFixKevin Serrano2017-06-141-15/+7
|\ \ \ | |_|/ |/| |
| * | Cleanup zero addresses.Kevin Serrano2017-06-141-5/+6
| * | Fix check icon appearing in inappropriate situations.Kevin Serrano2017-06-131-13/+4
* | | only prefix ethereum addressfrankiebee2017-06-131-5/+6
* | | prefix the address with "ethereum:"frankiebee2017-06-131-2/+1
|/ /
* | Merge pull request #1574 from MetaMask/internfixDan Finlay2017-06-131-1/+1
|\ \
| * | Modify wording to new accept.Kevin Serrano2017-06-101-1/+1
| * | Merge branch 'master' of github.com:nihar97/metamask-plugin into internfixKevin Serrano2017-06-091-1/+1
| |\ \
| | * | continue button changed to agreeNihar2017-05-171-1/+1
* | | | Merge pull request #1570 from MetaMask/addfaqDan Finlay2017-06-132-11/+10
|\ \ \ \
| * | | | Modify FAQ to be more visible.Kevin Serrano2017-06-092-11/+10
| |/ / /
* | | | Merge branch 'master' into gasupdaterDan Finlay2017-06-135-13/+89
|\| | |
| * | | Fix bug that prevented publishing contractsDan Finlay2017-06-061-1/+1
| * | | Merge pull request #1545 from MetaMask/inValidAddressFixkumavis2017-06-064-3/+20
| |\ \ \
| | * | | Fix for quick switch on ENS namesfrankiebee2017-06-061-0/+2
| | * | | set the ensResolution to an invalid address if an error ocurs durring look upfrankiebee2017-06-061-0/+1
| | * | | Fix linting errorfrankiebee2017-06-062-2/+1
| | * | | move address check to util.isValidAddressfrankiebee2017-06-063-3/+4
| | * | | Fix punctuationfrankiebee2017-06-061-1/+1
| | * | | Dissallow transactions to be sent to 0x0000000000000000000000000000000000000000frankiebee2017-06-064-2/+16
| * | | | Remove dead style codeDan Finlay2017-06-051-3/+0
| * | | | Move address copying into reusable componentDan Finlay2017-06-052-20/+54
| * | | | Add copy links to mini tx panelsDan Finlay2017-06-051-10/+38
| |/ / /
* / / / Update gasblocklimit params with every block.Kevin Serrano2017-06-032-3/+12
|/ / /
* | | remove more in operatorsDan Finlay2017-05-271-1/+1
* | | Remove commentDan Finlay2017-05-271-1/+0
* | | Fix contract map referenceDan Finlay2017-05-271-1/+1
* | | Move off in operatorDan Finlay2017-05-271-1/+1
* | | Add names to contract map & conf viewDan Finlay2017-05-271-3/+8
* | | Move to eth-contract-metadataDan Finlay2017-05-271-3/+4
* | | Add address image map to icon factoryDan Finlay2017-05-261-18/+21
* | | Add max gas limit to UIKevin Serrano2017-05-251-0/+2
* | | Minor cleanup of lintKevin Serrano2017-05-251-1/+0
* | | Minor cleanupKevin Serrano2017-05-251-2/+2
* | | Fix bug where submit was enabled when invalid params were filled out.Kevin Serrano2017-05-252-5/+11
* | | Cleanup code.Kevin Serrano2017-05-251-7/+15
* | | Fix test, create new value for precision/scaleKevin Serrano2017-05-242-3/+5
* | | Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-243-6/+31
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 10:17:56 +0800