aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
* Use const and fix lint warningsDaijiro Wachi2017-10-311-2/+2
* Remove warning message when show import pageDaijiro Wachi2017-10-312-0/+2
* Add option to copy directly to clipboard.Kevin Serrano2017-10-271-3/+11
* Resolve merge conflictsKevin Serrano2017-10-2725-111/+230
|\
| * Merge pull request #2476 from MetaMask/100MweiMinGasPriceDan Finlay2017-10-262-12/+15
| |\
| | * Add labels to clarify warning.Kevin Serrano2017-10-261-4/+4
| | * Account for non-submitted mins and maxKevin Serrano2017-10-261-2/+2
| | * Add clarifying comment about wei conversion.Kevin Serrano2017-10-261-0/+1
| | * Cut out intermediary wei steps.Kevin Serrano2017-10-261-4/+2
| | * Remove unneeded toString conversions.Kevin Serrano2017-10-261-2/+2
| | * Move upsize conversions for input warning at front of fn.Kevin Serrano2017-10-261-3/+5
| | * Fix mismatched decimal/hex conversion in pending-txKevin Serrano2017-10-261-1/+1
| | * Remove css build bundle from uatDan Finlay2017-10-261-4491/+0
| | * Resolve merge conflict.Kevin Serrano2017-10-252-1/+4492
| | |\
| | | * Reduce minimum gas price to 100 MWEIDan Finlay2017-10-252-7/+4498
| | * | Fix for gas price to be lowered.Kevin Serrano2017-10-252-11/+13
| | |/
| * | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-256-11/+9
| |\ \ | | |/ | |/|
| | * Fix lint warningsDaijiro Wachi2017-10-226-11/+9
| * | Add error messages when importing an accounttmashuang2017-10-241-1/+2
| * | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-2412-52/+200
| |\ \
| | * | Add Import With Seed PhraseChi Kei Chan2017-10-211-4/+14
| | * | Fix linterChi Kei Chan2017-10-217-1/+17
| | * | ShapeShift IntegrationChi Kei Chan2017-10-213-4/+42
| | * | Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-213-7/+28
| | * | Shuffle tokensJacky Chan2017-10-211-3/+3
| | * | Add Go to Coinbase; Show Buy Ether after signupJacky Chan2017-10-213-7/+21
| | * | Implement Import Account ScreenJacky Chan2017-10-211-10/+17
| | * | Add BackupPhraseScreenJacky Chan2017-10-211-7/+11
| | * | Add NoticeScreenJacky Chan2017-10-211-13/+15
| | * | Add UniqueImageScreenJacky Chan2017-10-212-21/+30
| | * | CreatePasswordScreenJacky Chan2017-10-211-0/+1
| | * | Adding CreatePasswordScreenJacky Chan2017-10-212-0/+26
| | |/
| * / Add support for alternative ENS TLDsDan Finlay2017-10-231-1/+1
| |/
| * Fix bug that breaks ui dev modeDan Finlay2017-10-191-1/+6
| * Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-191-1/+1
| * Increase line-height for account nicknamesDaijiro Wachi2017-10-181-0/+1
| * Move etherscan link logic into moduleDan Finlay2017-10-145-35/+3
| * Merge pull request #2318 from MetaMask/network-controller-clientFrankie2017-10-121-1/+1
| |\
| | * ui - network - fix localhost active statuskumavis2017-10-111-1/+1
| * | Fix link to token support pageDan Finlay2017-10-121-1/+1
| |/
* | Merge branch 'master' into version-debuggingKevin Serrano2017-10-109-12/+217
|\|
| * Merge pull request #2296 from MetaMask/precision-fixDan Finlay2017-10-101-4/+7
| |\
| | * Fix precision to account for small wei increase.Kevin Serrano2017-10-061-4/+7
| * | More appropriate stylingSergey Ukustov2017-10-081-1/+2
| * | Merge branch 'master' into SignTypedDataDan Finlay2017-10-065-32/+27
| |\|
| * | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-032-26/+9
| |\ \
| * | | Respect code styleSergey Ukustov2017-09-302-3/+2
| * | | Add eth_signTypedData handlerSergey Ukustov2017-09-308-8/+210
* | | | Make the function callback friendly.Kevin Serrano2017-10-102-4/+11
* | | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-062-5/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Revert to normal balances.Kevin Serrano2017-10-052-5/+5
* | | | lintKevin Serrano2017-10-051-1/+1
* | | | Further adjustment to maintain APIKevin Serrano2017-10-051-2/+2
* | | | Rename to maintain APIKevin Serrano2017-10-052-2/+8
* | | | Configured for callback-required function.'Kevin Serrano2017-10-052-9/+12
* | | | change global to windowKevin Serrano2017-10-051-1/+1
* | | | Include browser versionKevin Serrano2017-10-051-0/+2
* | | | Include OS versionKevin Serrano2017-10-051-0/+2
|/ / /
* | | Merge pull request #2175 from MetaMask/RemoveSlackLinkKevin Serrano2017-10-041-7/+0
|\ \ \
| * \ \ Merge branch 'master' into RemoveSlackLinkKevin Serrano2017-10-036-237/+669
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into RemoveSlackLinkKevin Serrano2017-09-273-7/+9
| |\ \ \
| * | | | Remove slack linkDan Finlay2017-09-271-7/+0
* | | | | Merge pull request #2251 from BrandenSoropia/remove-metamask-titleKevin Serrano2017-10-041-8/+0
|\ \ \ \ \
| * | | | | Removed MetaMasktitle. Fixed #1730.Branden Soropia2017-10-021-8/+0
| | |_|/ / | |/| | |
* / | | | ui - tx history - simplify error+warning display codekumavis2017-10-031-12/+22
|/ / / /
* | | | network - remove long dead etherscan provider codekumavis2017-09-301-10/+0
* | | | network - convert localhost from custom rpc to network typekumavis2017-09-302-16/+9
| |_|/ |/| |
* | | Merge branch 'master' into new-currency-testkumavis2017-09-283-7/+9
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-237-29/+56
| |\|
| * | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-144-12/+49
| |\ \
| * | | Add computed balance to account detail viewDan Finlay2017-09-142-3/+3
| * | | Use computed balance for tx confirmationDan Finlay2017-09-142-4/+6
* | | | Add AUD, HKD, SGD, IDR, PHP to currency conversion listtmashuang2017-09-281-0/+55
* | | | Remove old conversion list.Kevin Serrano2017-09-271-207/+0
* | | | Polish names on currency list.Kevin Serrano2017-09-271-7/+7
* | | | Account for undefined currencies.Kevin Serrano2017-09-271-1/+2
* | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-212-0/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #2075 from MetaMask/mixed-caseDan Finlay2017-09-192-0/+12
| |\ \ \
| | * \ \ Merge branch 'master' into mixed-caseDan Finlay2017-09-192-26/+41
| | |\ \ \
| | * | | | Check if all lower or upper before doing checksum.Kevin Serrano2017-09-131-1/+1
| | * | | | Add specific error message for failed address checksum.Kevin Serrano2017-09-132-0/+12
| | | |_|/ | | |/| |
* | | | | Comply with current currency API and add additional styling.Kevin Serrano2017-09-192-2/+2
* | | | | Fix the property query for new currencies.Kevin Serrano2017-09-191-2/+2
* | | | | 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
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 20:44:29 +0800