aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
Commit message (Expand)AuthorAgeFilesLines
* 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 wh...Frankie2017-01-191-1/+1
* | | | Add ability to import v3 JSON walletsDan Finlay2017-01-191-1/+7
|/ / /
* | | 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 pending...Frankie2017-01-124-22/+35
* | | 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
* | | | 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
* | | 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 displ...Kevin Serrano2016-10-311-1/+2
| * | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-291-7/+6
| |\ \ \ \
| | * | | | Fix identicon renderingDan Finlay2016-10-281-7/+6
* | | | | | Begin adding Ropsten supportDan Finlay2016-11-222-1/+20
| |_|_|_|/ |/| | | |
* | | | | Fix funny looking errors in conf-txFrankie2016-11-111-1/+1
| |_|_|/ |/| | |
* | | | detect tx error - show warning and fix gasLimitkumavis2016-11-111-0/+9
| |_|/ |/| |
* | | Unify warning functions.Kevin G. Serrano2016-11-082-3/+3
|/ /
* / Fix provider menu selection indicationDan Finlay2016-10-261-1/+1
|/
* Create callback and Clean-up detailsFrankie2016-10-141-3/+3
* Specify base 10 in bignumberFrankie2016-10-141-1/+1
* Fix gasPrice rangeFrankie2016-10-142-14/+9
* Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-111-3/+6
|\
| * Removed hex prefix from private key exportDan Finlay2016-10-051-3/+6
* | Add custom gas field to send pageFrankie2016-10-112-0/+65
|/
* Space out purchase details on ShapeShift formDan Finlay2016-09-161-4/+3
* Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-161-4/+15
|\
| * Fix CHANGELOG.md and restructure onClick eventsFrankie2016-09-161-17/+12
| * lintingFrankie2016-09-161-21/+22
| * Merge branch 'master' into tx-vizFrankie2016-09-163-8/+30
| |\
| * | add tx-viz link to transaction historyFrankie2016-09-161-12/+27
* | | Show loading indication when selecting ShapeShiftDan Finlay2016-09-162-0/+50
| |/ |/|
* | Clean up some of the codeFrankie2016-09-161-21/+4
* | css - smaller balance warningkumavis2016-09-161-1/+6
* | confTx - add insufficient balance warning messagekumavis2016-09-161-4/+6
* | confTx - show disabled accept btn + add colorskumavis2016-09-161-32/+28
* | Drop the buy button in the confTx view if account does not have enough ethFrankie2016-09-163-8/+44
|/
* Merge branch 'master' into qrCodeFrankie2016-09-141-26/+11
|\
| * PendingTxDetails - partially remove imagify supportkumavis2016-09-141-26/+11
* | Add qrcode-npm to package.json and swap out Qr Code generator api for node-mo...Frankie2016-09-131-3/+11
|/
* Revert "Add new eth-lightwallet salting to vault."Frankie2016-09-131-2/+2
* Camelcase dataset key for reactDan Finlay2016-09-111-2/+2
* Fix fox logo password followingDan Finlay2016-09-091-2/+1
* Fix new logo related errorsDan Finlay2016-09-091-3/+6
* Merge branch 'master' into AddNewLogoDan Finlay2016-09-097-160/+97
|\
| * Restore broken variable referenceDan Finlay2016-09-091-0/+1
| * Fix double tooltipDan Finlay2016-09-091-10/+1
| * Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-072-2/+2
| |\
| * | LintedDan Finlay2016-09-071-23/+22
| * | Add fiat balances to tx conf viewDan Finlay2016-09-071-6/+5
| * | Got basic fiat display modularizedDan Finlay2016-09-073-22/+26
| * | Fix fiat-valueDan Finlay2016-09-071-1/+0
| * | Nearly finished factoring fiat value into eth-balanceDan Finlay2016-09-076-97/+8
| * | Continuing fiat balance modularizationDan Finlay2016-09-043-73/+106
* | | Fix logo usage for metamask-logo v2.0.0Dan Finlay2016-09-091-14/+3
| |/ |/|
* | Fix capitalization.Kevin Serrano2016-09-071-1/+1
* | Fix typos and refine wording.Kevin Serrano2016-09-071-1/+1
|/
* Fix spelling errorDan Finlay2016-08-271-1/+1
* Persist shapeshift form input valuesDan Finlay2016-08-261-3/+12
* LintedDan Finlay2016-08-251-1/+0
* Improve msg signing paddingDan Finlay2016-08-251-5/+3
* Merge branch 'master' into fox-subKevin Serrano2016-08-244-11/+65
|\
| * More lintingDan Finlay2016-08-232-4/+1
| * LintedDan Finlay2016-08-233-7/+3
| * Removed view more button, added account info button.Dan Finlay2016-08-234-17/+58
| * Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-237-12/+235
| |\
| * \ Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-191-8/+9
| |\ \
| * | | Change 'View More' to 'Show More'Dan Finlay2016-08-191-1/+1
| * | | LintedDan Finlay2016-08-191-1/+1
| * | | Added `view more` button to transaction listDan Finlay2016-08-191-7/+26
* | | | Linting.Kevin Serrano2016-08-241-2/+1
* | | | Created option to pass in static file for fallback for logo.Kevin Serrano2016-08-241-3/+5
* | | | Merge branch 'master' into fox-subKevin Serrano2016-08-232-5/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix issue where if given a balance that does not need to be parsed will not b...Frankie2016-08-202-5/+8
* | | | Modify logic for component update.Kevin Serrano2016-08-201-5/+4
* | | | Create replacement logo for non-webglKevin Serrano2016-08-201-2/+8
|/ / /
* | | Merge branch 'master' into shapeshiftTxDan Finlay2016-08-191-8/+9
|\ \ \ | | |/ | |/|
| * | Fix rounding issues.Kevin Serrano2016-08-191-8/+9
| |/
* | Remove "+" from shapeshift tx and change wording in CHANGELOGFrankie2016-08-191-21/+7
* | Make ballance teal for shapeshift tx and add to change logFrankie2016-08-192-3/+5
* | Create a ShapeShift tx in tx HistoryFrankie2016-08-192-55/+90
* | Add api Public keyFrankie2016-08-191-0/+2
* | Merge branch 'master' into shapeshiftTxFrankie2016-08-194-2/+152
|\|
| * Added compliance for tests and properly accounts for N/A conversions.Kevin Serrano2016-08-171-1/+1
| * Lint.Kevin Serrano2016-08-171-4/+5
| * Remove logs.Kevin Serrano2016-08-171-3/+0
| * Hide conversions when API fails.Kevin Serrano2016-08-171-29/+42
| * Add fallback to API failure.Kevin Serrano2016-08-171-1/+5
| * linting and ignoring.Kevin Serrano2016-08-172-2/+1
| * Divided eth components for tx and account detail.Kevin Serrano2016-08-172-14/+126
| * Merge master.Kevin Serrano2016-08-166-16/+657
| |\
| | * Add margin to "go to test faucet" button and show more of the address on qr c...Frankie2016-08-152-1/+8
| * | Fix default value. Add loading indication for async.Kevin Serrano2016-08-101-3/+1
| * | Get fiat numbers rendering on tooltip. Need to find way to create line breaks.Kevin Serrano2016-08-061-2/+21
* | | WIP: ShapeShift txFrankie2016-08-194-4/+198
| |/ |/|
* | Remove ethereum classic providerDan Finlay2016-08-152-15/+0
* | Add multi message capability to Qr view for market infoFrankie2016-08-132-3/+13
* | Add a to test faucet buttonFrankie2016-08-131-1/+4
* | Merge branch 'master' into buyFormFrankie2016-08-131-1/+1
|\ \
| * | Add network indicator class to loading imageDan Finlay2016-08-121-1/+1
| |/
* | Change buy forms so that they are their own view and add Qr-codeFrankie2016-08-134-139/+178
* | Even out some of the marginsFrankie2016-08-111-2/+4
* | Fix typo for copyButtonFrankie2016-08-111-1/+1
* | Merge branch 'master' into buyFormFrankie2016-08-114-10/+37
|\|
| * Fix reference in drop menu itemDan Finlay2016-07-301-2/+3
| * Fix network name referenceDan Finlay2016-07-301-1/+6
| * Add eth classic to provider menuDan Finlay2016-07-292-8/+27
| * Implement some cross-browser practices (#473)Dan Finlay2016-07-221-1/+2
| * Triage a strange undefined balance errorDan Finlay2016-07-161-1/+2
* | Create "buy form" add shape shiftFrankie2016-08-113-0/+595
|/
* new tx - calculate estimatedGas and show thing in tx-details (#441)kumavis2016-07-141-8/+7
* Fix eth balance tooltip to show 6 decimals (#440)Frankie2016-07-142-2/+3
* Merge branch 'master' into FixSvgIconsDan Finlay2016-07-123-116/+31
|\
| * Integrate changes back into eth-balanceKevin Serrano2016-07-123-105/+30
| * Move shorten balance to util. Add as property of generateBalance object output.Kevin Serrano2016-07-122-21/+11
* | LintedDan Finlay2016-07-121-2/+1
* | Fix imageification of recipientDan Finlay2016-07-121-3/+4
|/
* lintKevin Serrano2016-07-091-5/+5
* Implement alternate shortening scheme.Kevin Serrano2016-07-092-6/+25
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into ui-fixth-wi...kumavis2016-07-082-18/+51
|\
| * 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
| |\
| * | notif - add support for forward carratkumavis2016-07-081-13/+41
| * | ui - remove doubled eth-balancekumavis2016-07-082-5/+1
* | | Resolve merge conflict.Kevin Serrano2016-07-085-60/+308
|\ \ \ | | |/ | |/|
| * | Fixed eth_balance style, completing partial mergeDan Finlay2016-07-081-10/+1
| |/
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio...kumavis2016-07-081-1/+2
| |\
| * | lint fixkumavis2016-07-081-1/+1
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio...kumavis2016-07-081-21/+36
| |\ \
| * | | Restore button naming consistencyDan Finlay2016-07-081-2/+2
| * | | Add nickname rendering for recipient addressDan Finlay2016-07-081-1/+1
| * | | LintedDan Finlay2016-07-082-2/+2
| * | | Refined tx confirmation button stylesDan Finlay2016-07-081-7/+19
| * | | Implement tx confirmation style refinementsDan Finlay2016-07-082-18/+36
| * | | 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-081-20/+15
| |\ \ \
| * | | | 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
| * | | | LintedDan Finlay2016-07-072-29/+6
| * | | | Fixed up pending-tx-detailsDan Finlay2016-07-072-23/+27
| * | | | Fleshed out pending tx viewDan Finlay2016-07-073-30/+84
| * | | | Merged latest balance formatting codeDan Finlay2016-07-072-16/+21
| |\ \ \ \
| * | | | | Began reworking tx conf viewDan Finlay2016-07-073-16/+174
* | | | | | Pass the linters.Kevin Serrano2016-07-081-5/+5
* | | | | | Add new component for tx-history to avoid messing with other styles. Add fixe...Kevin Serrano2016-07-082-1/+71
* | | | | | Modified test views again. Added fixed length to center tx information.Kevin Serrano2016-07-081-1/+4
| |_|_|_|/ |/| | | |
* | | | | Add new test state with tx history. Fix alignment issue with transaction hist...Kevin Serrano2016-07-081-1/+2
| |_|_|/ |/| | |
* | | | Change function name to generateBalanceObjectFrankie2016-07-081-2/+2
* | | | Add method to deal with small decimals and create the object for eth-balance ...Frankie2016-07-081-17/+22
| |_|/ |/| |
* | | Revert back to original formatBalanceFrankie2016-07-081-20/+15
| |/ |/|
* | Add a postion option for tool tipFrankie2016-07-072-1/+2
* | Add decimal hendeling to ETH balanceFrankie2016-07-071-15/+19
|/
* Put network status checkmarks at end of rowDan Finlay2016-07-021-0/+2
* Implemt new account layoutFrankie2016-07-012-8/+19
* WIP: Working on new layoutFrankie2016-07-011-1/+17
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into networkIndi...kumavis2016-06-303-0/+86
|\
| * Unify tooltip stylesDan Finlay2016-06-302-2/+23
| * Merge branch 'master' into CopyTxHashDan Finlay2016-06-301-3/+3
| |\
| * | Add tooltip to copy buttonDan Finlay2016-06-301-10/+41
| * | Use clipboard icon for copy buttonDan Finlay2016-06-301-3/+8
| * | Add copy button to transaction listDan Finlay2016-06-301-0/+3
| * | Add CopyButton componentDan Finlay2016-06-301-0/+26
* | | Merge branch 'master' into networkIndicationFrankie2016-06-301-3/+3
|\ \ \ | | |/ | |/|
| * | Unify wording for transaction options (#369)Kevin Serrano2016-06-301-3/+3
| |/
* | Add to change logFrankie2016-06-302-20/+19
* | Add network name to indicator and some css fixesFrankie2016-06-302-10/+33
* | Add ✓ charchter to indicate active networkFrankie2016-06-301-0/+20
|/
* Modify network icons to reflect current design. (#355)Kevin Serrano2016-06-291-2/+2
* 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-291-1/+1
* Merge branch 'master' into title-truncateKevin Serrano2016-06-291-2/+4
|\
| * Code style fix.Kevin Serrano2016-06-291-2/+2
| * Merge changelog.Kevin Serrano2016-06-292-2/+2
| |\
| * | Additional length check just in case.Kevin Serrano2016-06-291-2/+3
| * | Enforce 30 character limit on wallet name.Kevin Serrano2016-06-291-0/+1
* | | Wallet name now is properly truncated.Kevin Serrano2016-06-291-1/+1
| |/ |/|
* | Change color of failure to yellow. Change pending to ellipsis. (#338)Kevin Serrano2016-06-292-2/+2
|/
* clean - appease the linting machinekumavis2016-06-252-27/+9
* svg notif now work for msg signatureskumavis2016-06-253-33/+62
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into conf-tx-ref...kumavis2016-06-251-1/+1
|\
| * identicon - default to imageifykumavis2016-06-251-1/+1
* | breakout pending-tx-detailskumavis2016-06-253-29/+72
|/
* pending-tx pass the identicon pref onkumavis2016-06-242-0/+2
* account-panel combine panel into account-panelkumavis2016-06-242-66/+37
* icon-factory - overhaul to provide svg or imagified elkumavis2016-06-242-8/+5
* tx-conf add non-interactive mode for notificationkumavis2016-06-242-11/+20
* svg notifications - remove unneeded deps and clean codekumavis2016-06-241-5/+5
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into svg-notifkumavis2016-06-242-3/+3
|\
| * Swap out Transat font for MontserratFrankie2016-06-232-3/+3
* | initial svg notificationskumavis2016-06-231-5/+11
|/
* Manually lintedDan Finlay2016-06-2212-42/+19
* Auto lintedDan Finlay2016-06-2215-116/+98
* Fix tx approval address formattingDan Finlay2016-06-171-1/+2
* Merge pull request #286 from MetaMask/FixSpinnerDan Finlay2016-06-151-0/+1
|\
| * Made network spinner clickableDan Finlay2016-06-151-0/+1
* | Let account address take more space in account listDan Finlay2016-06-151-2/+1
|/
* Size export confirmation inputFrankie2016-06-132-2/+6
* Fix edit textFrankie2016-06-131-1/+1
* Cache identiconsDan Finlay2016-06-071-11/+6
* Merge branch 'master' into uiFixesFrankie2016-06-061-0/+65
|\
| * Add provider menu on clicking network status indicator.Dan Finlay2016-06-041-6/+26
| * Clicking network status indicator reveals provider menuDan Finlay2016-06-041-1/+2
| * Blockchain status now updates on availability changeDan Finlay2016-06-041-6/+4
| * Add network loading indicationDan Finlay2016-06-041-0/+8
| * Differentiate icon name from hover textDan Finlay2016-06-041-12/+16
| * Some minor lintingDan Finlay2016-06-041-4/+4
| * Make hover text more human friendlyDan Finlay2016-06-041-4/+4
| * network status getting set upon start-up and showing in title bar but not aut...Zac Mitton2016-06-021-0/+34
* | Add css to resize and alighn input for editable lableFrankie2016-06-061-2/+2
|/
* Fix build errorDan Finlay2016-05-271-5/+2
* Remove etherscan links from non standard blockchainsDan Finlay2016-05-271-2/+9
* Fix network reference part 2Dan Finlay2016-05-271-1/+1
* Fix network referenceDan Finlay2016-05-272-2/+2
* Add clicking txs in list shows tx conf screenDan Finlay2016-05-272-3/+12
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 18:14:30 +0800