aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into NoPopularTOkensThomas Huang2017-07-011-0/+2
|\
| * Remove send buttonDan Finlay2017-07-011-0/+2
| | | | | | | | Some token precisions are not respected by TokenFactory, so it's not sufficient for a default send form. Removing for now.
* | Stop loading popular tokens by defaultDan Finlay2017-07-011-1/+3
|/ | | | Improves performance when loading the token tab.
* Merge pull request #1700 from MetaMask/StyleImprovementsKevin Serrano2017-06-301-0/+1
|\ | | | | Add padding to token messages
| * Add padding to token messagesDan Finlay2017-06-291-0/+1
| |
* | change “ACCEPT” to “SUBMIT”frankiebee2017-06-301-1/+1
|/
* Merge pull request #1634 from MetaMask/i784-SendTokenButtonThomas Huang2017-06-291-7/+29
|\ | | | | Add send token button (link to TokenFactory)
| * Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-281-1/+3
| |\
| * \ Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-241-7/+4
| |\ \
| * \ \ Merge branch 'master' into i784-SendTokenButtonDan Finlay2017-06-231-4/+18
| |\ \ \
| * | | | Fix propagationDan Finlay2017-06-201-1/+1
| | | | |
| * | | | Add send button to TokenFactoryDan Finlay2017-06-201-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A simple solution to a temporary token send screen: Linking to EtherScan. Will hold us over until we make our own token send view.
* | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-292-32/+78
|\ \ \ \ \ | | |_|_|/ | |/| | | Add ability to add tokens to token list
| * | | | Support other network linksDan Finlay2017-06-281-1/+3
| | |_|/ | |/| |
| * | | Merge branch 'master' into i1616-AddTokenAddingDan Finlay2017-06-231-4/+18
| |\ \ \ | | | |/ | | |/|
| * | | Reduce token list clutter by only showing held tokensDan Finlay2017-06-201-7/+4
| | |/ | |/| | | | | | | We could change this when we allow hiding/removing tokens, but for now, this is a simple and pleasant solution.
| * | Add ability to add tokens to token listDan Finlay2017-06-161-10/+30
| | | | | | | | | | | | Fiex #1616
| * | Merge branch 'AddTokenList' into AddingTokensDan Finlay2017-06-161-15/+7
| |\ \
| * | | Create add token button and template viewDan Finlay2017-06-151-22/+49
| | | |
* | | | Merge pull request #1675 from MetaMask/warning-fixesDan Finlay2017-06-281-1/+1
|\ \ \ \ | | | | | | | | | | React Warning Fixes
| * | | | Fix react warning for keys on ens address bookKevin Serrano2017-06-271-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
|/ / /
* | / Add better event lifecycle management to token list.Dan Finlay2017-06-201-4/+18
| |/ |/| | | | | | | Token list now renders errors when a token lookup fails. Also now cleans up event listeners when re-initializing the token list.
* | Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-161-15/+7
|\ \ | |/ |/|
| * Merge pull request #1600 from MetaMask/i1554-ensSymFixKevin Serrano2017-06-141-15/+7
| |\ | | | | | | ENS symbol renders on proper networks
| | * Cleanup zero addresses.Kevin Serrano2017-06-141-5/+6
| | |
| | * Fix check icon appearing in inappropriate situations.Kevin Serrano2017-06-131-13/+4
| | |
* | | Multiple loading style improvementsDan Finlay2017-06-151-1/+4
| | | | | | | | | | | | | | | | | | | | | - When seeking network, show a full screen loading indication + message. - Network menu is still accessible "over" this indication. - Top Menu-Droppo components now slide *under* the menu bar like they should. - Loading indication opacity increased to increase message legibility.
* | | 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-151-2/+13
| | | | | | | | | | | | Also improve error handling with token balances.
* | | Auto populate token list with popular token balancesDan Finlay2017-06-144-19/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | Half implements #175 Things to do: - Add ability to add tokens to the list. - Persist the token tab selection (so it is an implicit preference) - Check what's up with the token-tracker polling, it seems like it is not waiting the interval.
* | | Merge branch 'master' into AddTokenListDan Finlay2017-06-1321-311/+646
|\| |
| * | 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
| |\ | | | | | | Wording fix for notice button
| | * 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 branch 'master' into gasupdaterDan Finlay2017-06-133-13/+87
| |\| |
| | * | Fix bug that prevented publishing contractsDan Finlay2017-06-061-1/+1
| | | |
| | * | Merge pull request #1545 from MetaMask/inValidAddressFixkumavis2017-06-062-3/+18
| | |\ \ | | | | | | | | | | Dissallow transactions to be sent to 0x000...
| | | * | 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-061-1/+0
| | | | |
| | | * | move address check to util.isValidAddressfrankiebee2017-06-061-2/+2
| | | | |
| | | * | Fix punctuationfrankiebee2017-06-061-1/+1
| | | | |
| | | * | Dissallow transactions to be sent to 0x0000000000000000000000000000000000000000frankiebee2017-06-062-1/+14
| | | | |
| | * | | Remove dead style codeDan Finlay2017-06-051-3/+0
| | | | |
| | * | | Move address copying into reusable componentDan Finlay2017-06-052-20/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "copyable" component allows any elements to be wrapped to include: - a tool tip that changes/debounces its label when clicked. - a customizable copyable value. Fixes #1539
| | * | | Add copy links to mini tx panelsDan Finlay2017-06-051-10/+38
| | |/ /
| * / / Update gasblocklimit params with every block.Kevin Serrano2017-06-031-2/+9
| |/ /
| * | 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
| | |
| * | Fix merge conflicts.Kevin Serrano2017-05-1710-76/+100
| |\|
| | * Fix fiat renderingDan Finlay2017-05-175-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #1439. When reorganizing fiat-value component to not use global state, had missed its necessary `currentCurrency` parameter. This now passes it in wherever it's used.
| | * Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxFormkumavis2017-05-168-66/+84
| | |\ | | | | | | | | Add test around conf-tx view's gas editing.
| | | * 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-136-22/+24
| | | | | | | | | | | | | | | | For better unit testability of the conf-tx view.
| | | * Break up pending-tx component for better unit testabilityDan Finlay2017-05-111-38/+39
| | | |
| | * | Remove all traces of testnetThomas Huang2017-05-162-2/+2
| | | |
| | * | Change default network to rinkebyThomas Huang2017-05-162-5/+5
| | |/
| * | Fix reset button.Kevin Serrano2017-05-172-8/+10
| | |
| * | Complete transition into BN.Kevin Serrano2017-05-172-13/+157
| |/
| * 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 ↵Kevin Serrano2017-05-092-7/+15
| |\ | | | | | | | | | into i1381-GasPriceInGwei
| | * CleanupDan Finlay2017-05-091-2/+2
| | |
| | * Input gas in gweiDan Finlay2017-05-081-7/+14
| | | | | | | | | | | | | | | | | | | | | Also enforces "safe low gas" minimum recommended by this article by eth-gas-station: https://medium.com/@ethgasstation/the-safe-low-gas-price-fb44fdc85b91 Fixes #1381
| | * Fix ens iterated element without key errorDan Finlay2017-05-081-0/+1
| | |
| * | ui - remove web3, use eth-querykumavis2017-05-091-1/+1
| |/
| * Merge branch 'master' into rinkebyDan Finlay2017-04-284-8/+7
| |\
| | * Fix linting warningsThomas Huang2017-04-274-8/+7
| | |
| * | Linting.Kevin Serrano2017-04-261-1/+1
| | |
| * | Add missing changes. Create unique style for rinkeby icon.Kevin Serrano2017-04-263-3/+9
| | |
| * | change network name to rinkeby when selectedNickyg2017-04-261-1/+10
| | |
| * | add rinkeby networkNickyg2017-04-262-1/+7
| |/
| * fix spellingfrankiebee2017-04-252-4/+4
| |
| * Css fixesfrankiebee2017-04-242-7/+9
| |
| * make buy button greenfrankiebee2017-04-241-1/+1
| |
| * remove updateCoinBaseAmount actionJared Pereira2017-04-241-3/+0
| |
| * remove updateBuyAddress actionJared Pereira2017-04-242-7/+1
| |
| * Initial redo attempt of the buy view to look like vladt's desighnfrankiebee2017-04-194-189/+124
| |
| * Create a custom radio list componentfrankiebee2017-04-191-0/+61
| |
* | Add placeholder etherscan token iconsDan Finlay2017-04-252-2/+10
| |
* | Get token list looking okDan Finlay2017-04-224-10/+120
| |
* | Add functional but ugly and hard-coded token listDan Finlay2017-04-214-13/+73
|/
* clean - remove unused extension refkumavis2017-04-051-3/+2
|
* add platforms to mascara + move buyEther window open to uikumavis2017-04-052-7/+8
|
* ui - use global.platform for extension interactionkumavis2017-04-013-8/+3
|
* extension - prefer extensionizer modulekumavis2017-03-314-4/+4
|
* Merge branch 'master' into kovan-faucet-instructionsDan Finlay2017-03-291-98/+37
|\
| * Improve UI gas calculation logicDan Finlay2017-03-291-98/+37
| | | | | | | | | | | | | | | | - Now striping hex prefixed gas values, which may have been causing mis-estimation. - Unified calculation logic to be entirely functional. - Greatly simplified how the pending-tx form keeps updated form state. Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value.
* | Merge branch 'master' into kovan-faucet-instructionsKevin Serrano2017-03-281-0/+3
|\|
| * Fix edge case where notice does not require scrollbar.Kevin Serrano2017-03-281-0/+3
| |
* | Add link to kovan faucet instructions.Kevin Serrano2017-03-281-2/+9
|/
* Merge branch 'master' into kovan-noticeDan Finlay2017-03-254-434/+538
|\
| * Fix tx selecting bugDan Finlay2017-03-251-0/+1
| |
| * 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
| | | | | | | | | | | | | | | | Sorry apparently the gas fixes weren't in the last commit, but are in this one. As reported in previous commit, fixes a bug where initial estimate is not derived from the network. Also fixes a bug where clicking "reset" does not clear our custom validation warnings.
| * 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-241-1/+2
| |
| * 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 ↵Dan Finlay2017-03-244-2/+18
| |\ | | | | | | | | | github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm
| | * Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-241-1/+1
| | |\
| | | * Enable etherscan linking on Kovan transaction list items.Kevin Serrano2017-03-231-1/+1
| | | |
| | * | Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-233-1/+17
| | |\|
| * | | Combine pending-tx-details component into pending-tx-detailsDan Finlay2017-03-242-370/+346
| |/ / | | | | | | | | | | | | | | | | | | | | | These were only separated originally so we could make the notification-based TX approval work, which provided its own buttons. This two templates are logically highly coupled, and keeping them working while separate has been difficult at times, and has even required resorting to dubious practices, like using React's `refs` pattern. This combines them into one fairly large component, but I think it's ok, we can still break this up into components, just not the separation that it had previously.
| * | Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-231-36/+56
| |\ \
| * | | Got basic validations workingDan Finlay2017-03-233-94/+179
| | | |
| * | | 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 i238-kovanKevin Serrano2017-03-231-0/+1
|\ \ \
| * | | Hide the password in the private key retrieval screen.Kevin Serrano2017-03-231-0/+1
| | |/ | |/|
* | | Add kovan to drop-menu-itemKevin Serrano2017-03-231-1/+4
| | |
* | | Add conditional kovan to current network component.Kevin Serrano2017-03-231-0/+12
|/ /
* / Adjust private key confirmation style and logic.Kevin Serrano2017-03-211-36/+56
|/
* Improve personal_sign styleDan Finlay2017-03-172-11/+23
| | | | textarea was not resizing the way I'd expected, so made it permanently larger, to accomodate larger messages.
* Merge branch 'master' into i1165-predictiveKevin Serrano2017-03-151-2/+2
|\
| * Rename variables to proper currency state variables.Kevin Serrano2017-03-151-2/+2
| |
* | Minor change in removing opts object.Kevin Serrano2017-03-151-4/+1
| |
* | Add comments.Kevin Serrano2017-03-111-0/+5
| |
* | Allow for adding recently used addresses to address book.Kevin Serrano2017-03-101-2/+11
| |
* | Create distinct labels and names for addresses.Kevin Serrano2017-03-101-1/+5
| |
* | Display owned addresses in datalist.Kevin Serrano2017-03-101-0/+10
|/
* Add ENS click to copyDan Finlay2017-03-091-9/+8
| | | | Also bump ethjs-ens version to get proper error for unregistered names.
* Get basic ENS workingDan Finlay2017-03-096-52/+119
|\ | | | | | | & merge master into ENS branch.
| * Remove logDan Finlay2017-03-071-1/+0
| |
| * Render personal_sign messages as utf-8 textDan Finlay2017-03-072-12/+46
| | | | | | | | | | | | | | | | | | | | | | Calls to `personal_sign` are now: - When hex encoded, preserved as hex encoded, but displayed as utf-8 text. - When not hex encoded, decoded as utf-8 text as hex for signing. - The messages proposed for signing are displayed as UTF-8 text. - When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal. Fixes #1173
| * Prevent submission of invalid gas parameters.Kevin Serrano2017-03-022-3/+26
| |
| * Various improvements to gas input.Kevin Serrano2017-03-023-27/+22
| |
| * Only allow numbers in gas inputsDan Finlay2017-03-021-0/+1
| |
* | Add ens recognition to send form inputDan Finlay2017-03-011-0/+131
|/ | | | | | | | Attempts to lookup `.eth` addresses on ENS. Is currently failing. I've written an isolation example of the problem here: https://github.com/flyswatter/ens-test
* Add reset button to reset gas fields.Kevin Serrano2017-03-012-4/+20
|
* Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-011-2/+12
|\ | | | | | | i765-gaslimits
| * Gas and Gaslimit revert to default if set to 0Kevin Serrano2017-03-011-2/+12
| |
* | Add a couple more debug logsDan Finlay2017-03-011-0/+1
|/
* lintsKevin Serrano2017-03-011-3/+0
|
* Remove advanced options for now.Kevin Serrano2017-03-011-15/+4
|
* Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-011-0/+2
|\ | | | | | | i765-gaslimits
| * lintKevin Serrano2017-03-011-2/+4
| |
* | LintedDan Finlay2017-03-011-2/+2
| |
* | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-012-4/+17
|\| | | | | | | i765-gaslimits
| * Hide gas options behind an advanced options checkbox.Kevin Serrano2017-03-011-4/+16
| |
| * Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-03-011-30/+38
| |\ | | | | | | | | | i765-gaslimits
| * | Add margins to align.Kevin Serrano2017-03-011-0/+1
| | |
* | | Remove gasMultiplier txMeta paramDan Finlay2017-03-011-5/+1
| |/ |/| | | | | | | | | This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter.
* | Fix infinite loop bugDan Finlay2017-03-011-30/+38
|/
* Reorder rows for better table logicDan Finlay2017-02-281-32/+37
|
* Emit updated tx values on accept clickDan Finlay2017-02-281-0/+7
|
* Remove unused functionDan Finlay2017-02-281-5/+0
|
* Got gas live re-estimatingDan Finlay2017-02-282-20/+23
|
* Align input fields for gas.Kevin Serrano2017-02-281-0/+1
|
* Fix merge conflicts.Kevin Serrano2017-02-282-8/+68
|\
| * LintedDan Finlay2017-02-282-12/+6
| |
| * Add non-working gas recalculating logic to tx-details viewDan Finlay2017-02-281-6/+69
| |
* | Further styling to get hex component working. Fix some typos.Kevin Serrano2017-02-283-16/+44
|/
* Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-02-283-5/+109
|\ | | | | | | i765-gaslimits
| * Merge branch 'master' into i765-gaslimitsDan Finlay2017-02-283-5/+109
| |\
| | * Improve pending tx blue dot styleDan Finlay2017-02-241-5/+1
| | |
| | * Fix cancel msg signing behavior.Dan Finlay2017-02-241-1/+1
| | |
| | * Make personal sign view look niceDan Finlay2017-02-241-5/+16
| | |
| | * Got personal_sign workingDan Finlay2017-02-242-2/+52
| | | | | | | | | | | | Also fixed bug where signing would not close popup.
| | * Add alternate UI for pending personal_sign messagesDan Finlay2017-02-241-9/+0
| | |
| | * Add personal sign actions and templateDan Finlay2017-02-231-0/+56
| | |
* | | Move input boxes into table and into details component.Kevin Serrano2017-02-283-17/+39
|/ /
* | Make gasPrice accessible to the UI.Kevin Serrano2017-02-251-2/+1
| |
* | Merge github.com:MetaMask/metamask-plugin into i765-gaslimitsKevin Serrano2017-02-241-2/+11
|\|
| * Notices must be scrolled down to proceed from.Kevin Serrano2017-02-211-0/+9
| |
| * Fix typo.Kevin Serrano2017-02-211-2/+2
| |
* | Broke hex decimal input into its own componentDan Finlay2017-02-182-24/+71
| | | | | | | | Also added a new state to try to make UI dev mode work again, but it has other issues, like #1128, that need to be addressed before UI dev mode can be used again.
* | Change state to props, add modifiable fields.Kevin Serrano2017-02-181-9/+33
|/
* Merge branch 'master' into i1089-networkfrontKevin Serrano2017-02-161-0/+9
|\
| * Revert old style message sighingFrankie2017-02-101-0/+9
| |
* | Change networks from lock screen.Kevin Serrano2017-02-161-1/+1
|/
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-025-5/+2
|\
| * rename selectedAccount to selectedAddresskumavis2017-01-315-5/+2
| |
* | Clean up message manger includes:Frankie2017-01-293-10/+3
|/ | | | | | | | | Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern
* Merge branch 'dev' into i715-AddJsonImportDan Finlay2017-01-191-1/+1
|\
| * Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-191-1/+1
| |\
| | * Merge branch 'master' into fixSignedVsSubmittedFrankie2017-01-192-6/+5
| | |\
| | * | Fix the dissplay for submitted transactions and the listner wating to hear ↵Frankie2017-01-191-1/+1
| | | | | | | | | | | | | | | | when tx's were included in a block
* | | | Add ability to import v3 JSON walletsDan Finlay2017-01-191-1/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715
* | | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenuDan Finlay2017-01-182-36/+81
|\ \ \ | |_|/ |/| |
| * | LintedDan Finlay2016-11-051-5/+4
| | |
| * | Convert buy subview to new tab bar componentDan Finlay2016-11-051-36/+47
| | |
| * | Scaffold new account viewDan Finlay2016-11-051-0/+35
| | |
* | | Merge branch 'master' into devDan Finlay2017-01-172-6/+5
|\ \ \ | |_|/ |/| |
| * | update coinbase info and viewFrankie2017-01-111-4/+4
| | |
| * | remove network Id 2 from explorer link and Add network Id 3Frances Pangilinan2016-12-211-2/+1
| | |
* | | Clean up codeFrankie2017-01-142-30/+35
| | |
* | | Fix sorting and instances where something could be undefinedFrankie2017-01-121-2/+2
| | |
* | | Fix wording and icon of failed txsFrankie2017-01-121-0/+6
| | |
* | | Take some of the tx Logic out of the UI and create a visble state for ↵Frankie2017-01-124-22/+35
| | | | | | | | | | | | pending and unaproved transactions
* | | Linting.Kevin Serrano2017-01-051-1/+0
| | |
* | | Make network somewhat more modular, add new network indicator.Kevin Serrano2017-01-051-5/+2
| | |
* | | Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManagerDan Finlay2017-01-031-2/+2
|\ \ \
| * \ \ Merge branch 'dev' into TxManagerFrankie2016-12-241-0/+110
| |\ \ \
| * \ \ \ Merge branch 'dev' into TxManagerFrankie2016-12-222-15/+0
| |\ \ \ \
| * | | | | First pass at revision requestsFrances Pangilinan2016-12-221-2/+2
| | | | | |
* | | | | | Fix rendering of loose accountsDan Finlay2016-12-241-1/+3
| |_|/ / / |/| | | |
* | | | | LintedDan Finlay2016-12-211-0/+110
| |/ / / |/| | |
* | | | Merged master into devDan Finlay2016-12-202-15/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Remove morden testnet providerDan Finlay2016-12-162-15/+0
| | | | | | | | | | | | | | | | Instances configured to point at Morden will now point at Ropsten.
* | | | Revert "Interface enhancements"Dan Finlay2016-12-174-12/+35
| | | |
* | | | Better account details viewLuis Iván Cuende2016-12-153-4/+6
| | | |
* | | | Better editable labelLuis Iván Cuende2016-12-152-32/+7
| |/ / |/| |
* | | Fix tx adding codeDan Finlay2016-11-301-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Broken in this commit: https://github.com/MetaMask/metamask-plugin/commit/bc39cd7b894ddf0f3724d4af3cfc30c2638e0939 Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed.
* | | Merge branch 'master' into devDan Finlay2016-11-241-3/+3
|\| |
| * | Ropsten has sole access to the faucet.Kevin Serrano2016-11-231-3/+3
| | |
| * | Add to changelog.Kevin Serrano2016-11-231-1/+1
| | |
* | | Merge branch 'dev' into dev-cleanupKevin Serrano2016-11-231-2/+2
|\ \ \
| * | | Make ropsten faucet button point at the correct url.Kevin Serrano2016-11-231-2/+2
| | | |
* | | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-222-2/+2
|/ / /
* | | Merge branch 'dev' into i831-AddRopsten-DevDan Finlay2016-11-229-27/+32
|\ \ \ | |/ / |/| |
| * | Fix lint rules for ternary operator placement.Kevin Serrano2016-11-121-18/+18
| | |
| * | Linting to the max.Kevin Serrano2016-11-129-38/+27
| | |
| * | Merge branch 'master' into i328-MultiVaultkumavis2016-11-111-1/+1
| |\ \
| * \ \ Merge branch 'master' into i328-MultiVaultkumavis2016-11-111-0/+9
| |\ \ \
| * \ \ \ Merge branch 'master' into i328-MultiVaultFrankie2016-11-112-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Make identicon tolerant of changing stateDan Finlay2016-11-021-0/+17
| | | | |
| * | | | Make case condition more consistent. Remove extra action. Fix incorrect ↵Kevin Serrano2016-10-311-1/+2
| | | | | | | | | | | | | | | | | | | | display of network.
| * | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-291-7/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | i328-MultiVault
| | * | | | Fix identicon renderingDan Finlay2016-10-281-7/+6
| | | | | |
* | | | | | Begin adding Ropsten supportDan Finlay2016-11-222-1/+20
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 21:02:13 +0800