aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Tolerate nonces of any formatDan Finlay2017-05-231-2/+2
| * | | Render txs with no nonceDan Finlay2017-05-231-1/+1
| * | | LintDan Finlay2017-05-222-6/+3
| * | | Label the pending tx icon with a tooltipDan Finlay2017-05-221-5/+12
| * | | Add transaction number (nonce) to tx listDan Finlay2017-05-221-0/+21
| * | | Fix decimal toleranceDan Finlay2017-05-181-1/+1
| * | | Fix bug where decimals in gas inputs gave strange resultsDan Finlay2017-05-181-1/+1
* | | | Increase accuracy of our rounding schemes.Kevin Serrano2017-05-241-3/+26
* | | | Modify test, replace clone package.Kevin Serrano2017-05-181-7/+4
* | | | Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-181-1/+1
|\| | |
| * | | Fix bug where edited gas parameters did not take effectDan Finlay2017-05-171-1/+1
| |/ /
* | | Fix merge conflicts.Kevin Serrano2017-05-1717-92/+141
|\| |
| * | Fix fiat renderingDan Finlay2017-05-1710-18/+35
| * | Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxFormkumavis2017-05-1613-79/+111
| |\ \
| | * | lint - mandatory danglekumavis2017-05-161-1/+1
| | * | ui - send - clean props assignmentkumavis2017-05-161-8/+10
| | * | Merge branch 'master' into i1407-FixNonEditingTxFormDan Finlay2017-05-161-5730/+207
| | |\ \
| | * | | LintedDan Finlay2017-05-162-5/+6
| | * | | Verify updating gas value updatesDan Finlay2017-05-161-2/+0
| | * | | Got test failing nearly correctlyDan Finlay2017-05-161-1/+12
| | * | | Skip jazzicons in unit testsDan Finlay2017-05-161-4/+9
| | * | | Remove redux dependency from eth-balance and its dependent treeDan Finlay2017-05-1311-35/+49
| | * | | Break up pending-tx component for better unit testabilityDan Finlay2017-05-111-38/+39
| * | | | Remove all traces of testnetThomas Huang2017-05-164-4/+4
| * | | | Change default network to rinkebyThomas Huang2017-05-163-7/+7
| | |/ / | |/| |
* | | | Fix reset button.Kevin Serrano2017-05-172-8/+10
* | | | Complete transition into BN.Kevin Serrano2017-05-172-13/+157
|/ / /
* | | Prettify JSONKevin Serrano2017-05-121-1/+207
* | | Trim currency list.Kevin Serrano2017-05-121-5730/+1
|/ /
* | ens - add mainnet ens supportkumavis2017-05-101-7/+9
* | Redefine txmeta when submitting.Kevin Serrano2017-05-091-1/+1
* | Merge branch 'i1381-GasPriceInGwei' of github.com:MetaMask/metamask-plugin in...Kevin Serrano2017-05-093-7/+16
|\ \
| * | CleanupDan Finlay2017-05-091-2/+2
| * | Input gas in gweiDan Finlay2017-05-081-7/+14
| * | Fix ens iterated element without key errorDan Finlay2017-05-081-0/+1
| * | allow copy(logState()) to copy to clipboardDan Finlay2017-05-081-0/+1
* | | ui - remove web3, use eth-querykumavis2017-05-092-2/+2
* | | Fox watches over us again.Kevin Serrano2017-05-031-6/+6
|/ /
* | Adjust fox look heightDan Finlay2017-05-011-1/+1
* | Make fox look away while typing passwordDan Finlay2017-05-011-6/+6
* | Merge branch 'master' into rinkebyDan Finlay2017-04-289-16/+12
|\ \
| * | Fix linting warningsThomas Huang2017-04-279-16/+12
* | | Linting.Kevin Serrano2017-04-262-2/+2
* | | Add missing changes. Create unique style for rinkeby icon.Kevin Serrano2017-04-267-4/+20
* | | change network name to rinkeby when selectedNickyg2017-04-261-1/+10
* | | add rinkeby networkNickyg2017-04-264-1/+21
|/ /
* | 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
* | 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
|/
* Fix account detail transition fix.Kevin Serrano2017-04-062-2/+2
* clean - remove unused extension refkumavis2017-04-051-3/+2
* add platforms to mascara + move buyEther window open to uikumavis2017-04-053-10/+13
* Merge branch 'master' into mascarafrankiebee2017-04-037-63/+52
|\
| * ui - use global.platform for extension interactionkumavis2017-04-014-22/+13
| * ui - move popup auto-close after tx conf to ui entrypointkumavis2017-04-011-5/+4
| * ui - startPopup returns store after bootkumavis2017-04-012-10/+14
| * ui - reducer - app - code cleanupkumavis2017-04-011-27/+20
| * etc - fix notification-manager ref, remove duplicated test filekumavis2017-03-311-2/+4
| * introduce platform api and rename notifications to notification-managerkumavis2017-03-311-1/+1
| * extension - prefer extensionizer modulekumavis2017-03-315-5/+5
* | Merge branch 'master' into mascarafrankiebee2017-04-032-4/+8
|\|
| * Fix potential formatting issues for seed word display.Kevin Serrano2017-03-292-4/+8
* | Merge branch 'master' into mascarafrankiebee2017-03-2916-523/+536
|\|
| * Merge pull request #1268 from MetaMask/kovan-faucet-instructionsDan Finlay2017-03-291-2/+9
| |\
| | * Merge branch 'master' into kovan-faucet-instructionsDan Finlay2017-03-296-131/+47
| | |\
| | * \ Merge branch 'master' into kovan-faucet-instructionsKevin Serrano2017-03-281-0/+3
| | |\ \
| | * | | Add link to kovan faucet instructions.Kevin Serrano2017-03-281-2/+9
| * | | | Merge pull request #1273 from MetaMask/i1267-seedfixDan Finlay2017-03-293-32/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Assure that seed words are placed into state tree upon request.Kevin Serrano2017-03-283-32/+5
| | | |/ | | |/|
| * | | Merge pull request #1272 from MetaMask/hideseedwordsfromlogstateDan Finlay2017-03-291-1/+5
| |\ \ \
| | * | | Remove seedWords from UI state dump.Kevin Serrano2017-03-281-1/+5
| | |/ /
| * | | Filter txs by txMeta network value in account detailkumavis2017-03-292-3/+3
| * | | Detect tx network from txMetaDan Finlay2017-03-291-1/+1
| * | | Improve UI gas calculation logicDan Finlay2017-03-293-127/+39
| |/ /
| * / Fix edge case where notice does not require scrollbar.Kevin Serrano2017-03-281-0/+3
| |/
| * 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
| * | block explorer - account link - ropstenkumavis2017-03-281-1/+1
| |/
| * Merge branch 'master' into kovan-noticeDan Finlay2017-03-258-452/+563
| |\
| | * 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
| | * 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-2413-12/+47
| | |\
| | | * Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-241-1/+1
| | | |\
| | | * \ Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-2310-8/+41
| | | |\ \
| | | * \ \ Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-232-3/+5
| | | |\ \ \
| | * | | | | Combine pending-tx-details component into pending-tx-detailsDan Finlay2017-03-242-370/+346
| | |/ / / /
| | * | | | Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-233-46/+75
| | |\ \ \ \
| | * | | | | 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
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' into mascarafrankiebee2017-03-2420-89/+218
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Enable etherscan linking on Kovan transaction list items.Kevin Serrano2017-03-231-1/+1
| |/ / / /
| * | | | Merge branch 'master' into i238-kovanKevin Serrano2017-03-233-4/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into hide-passwordKevin Serrano2017-03-232-4/+2
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' into i1193-errorstylefixDan Finlay2017-03-232-3/+5
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Fix styling of error message.Kevin Serrano2017-03-232-4/+2
| | | | |_|/ | | | |/| |
| | * | | | Merge branch 'master' into hide-passwordKevin Serrano2017-03-232-3/+5
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Hide the password in the private key retrieval screen.Kevin Serrano2017-03-231-0/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'master' into i238-kovanDan Finlay2017-03-232-3/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'master' into i1033-spinnerfixkumavis2017-03-233-45/+74
| | |\| |
| | * | | 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
| | * | | Add action to hide loading indication on an incorrect pw.Kevin Serrano2017-03-211-2/+5
| | | |/ | | |/|
| * | | 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
| | |/ | |/|
| * | Adjust private key confirmation style and logic.Kevin Serrano2017-03-213-46/+75
| |/
| * Improve personal_sign styleDan Finlay2017-03-172-11/+23
| * Merge branch 'master' into i1165-predictiveKevin Serrano2017-03-154-16/+13
| |\
| | * Merge branch 'master' into i1211-currencyretentionKevin Serrano2017-03-151-1/+5
| | |\
| | * | Rename variables to proper currency state variables.Kevin Serrano2017-03-154-16/+13
| * | | Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into i...Kevin Serrano2017-03-151-1/+5
| |\ \ \
| | * \ \ Merge branch 'master' into i1165-predictivekumavis2017-03-151-1/+5
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Render config screen from unlock.Kevin Serrano2017-03-141-0/+4
| | | * | Display Custom RPC on lock screen.Kevin Serrano2017-03-141-1/+1
| | | |/
| * | / Minor change in removing opts object.Kevin Serrano2017-03-151-4/+1
| |/ /
| * | Add comments.Kevin Serrano2017-03-112-0/+6
| * | Allow for adding recently used addresses to address book.Kevin Serrano2017-03-103-4/+36
| * | Create persistence address book.Kevin Serrano2017-03-101-0/+1
| * | Create distinct labels and names for addresses.Kevin Serrano2017-03-101-1/+5
| * | Display owned addresses in datalist.Kevin Serrano2017-03-102-0/+12
| |/
* | WIP: indexdb is at an err state "provider is undefined"frankiebee2017-03-241-1/+0
* | WIP: streams->indexdbfrankiebee2017-03-241-1/+1
|/
* Add ENS click to copyDan Finlay2017-03-091-9/+8
* Get basic ENS workingDan Finlay2017-03-0911-59/+188
|\
| * Add more informative messageKevin Serrano2017-03-091-0/+6
| * Fix typo, switch to log.errorKevin Serrano2017-03-091-3/+3
| * Remove unneeded setrpc method.Kevin Serrano2017-03-091-20/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-31 06:47:20 +0800