aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-0213-39/+22
|\
| * rename selectedAccount to selectedAddresskumavis2017-01-3113-39/+22
* | code clan up and testsFrankie2017-02-021-3/+3
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-293-5/+6
|\|
| * migration 5 - move keyring controller state to substatekumavis2017-01-293-5/+6
* | Clean up message manger includes:Frankie2017-01-2913-49/+52
|/
* Merge branch 'dev' of github.com:MetaMask/metamask-plugin into kumavis-refactor2kumavis2017-01-271-2/+0
|\
| * Fix ui overlapFrankie2017-01-271-2/+0
* | metamask controller - cleanup remote apikumavis2017-01-271-2/+1
|/
* Merge branch 'dev' into i#1048kumavis2017-01-258-12/+107
|\
| * Merge pull request #1050 from MetaMask/fixConfTxBalanceLogickumavis2017-01-251-1/+1
| |\
| | * fix baseFrankie2017-01-251-2/+2
| | * Fix issue where ConfTx view lets you approve txs when the account has insuffi...Frankie2017-01-251-1/+1
| * | Merge pull request #1051 from MetaMask/hotfix1048Frankie2017-01-251-2/+2
| |\ \ | | |/ | |/|
| | * hotfix - dont assume hd keyring positionkumavis2017-01-251-2/+2
| * | Merge branch 'dev' into i715-AddJsonImportDan Finlay2017-01-191-1/+1
| |\|
| * | Add ability to import v3 JSON walletsDan Finlay2017-01-194-5/+14
| * | Implement naieve JSON file importingDan Finlay2017-01-192-5/+76
| * | Added new modular private key import systemDan Finlay2017-01-192-2/+17
* | | background controller - extract KeyringC.placeSeedWords to MetamaskCkumavis2017-01-251-1/+15
* | | Fix issue where generating a new account would put it in loose keysFrankie2017-01-251-2/+2
| |/ |/|
* | Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-191-1/+1
|\ \ | |/ |/|
| * Merge branch 'master' into fixSignedVsSubmittedFrankie2017-01-195-10/+11
| |\
| * | Fix the dissplay for submitted transactions and the listner wating to hear wh...Frankie2017-01-191-1/+1
* | | Fix test to log out despite number of menu itemsDan Finlay2017-01-181-1/+1
* | | Remove outdated referenceDan Finlay2017-01-181-4/+0
* | | Remove unused UI filesDan Finlay2017-01-182-109/+0
* | | Allow importing of private key stringsDan Finlay2017-01-184-8/+95
* | | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenuDan Finlay2017-01-1815-74/+368
|\ \ \
| * | | Develop import subviewsDan Finlay2016-11-055-17/+86
| * | | Add import account placeholder templateDan Finlay2016-11-053-30/+71
| * | | LintedDan Finlay2016-11-053-12/+8
| * | | Add account adding subview placeholdersDan Finlay2016-11-054-39/+121
| * | | Remove unused classDan Finlay2016-11-051-1/+1
| * | | Convert buy subview to new tab bar componentDan Finlay2016-11-051-36/+47
| * | | Scaffold new account viewDan Finlay2016-11-057-1/+125
* | | | Add "import account" menu item + template viewDan Finlay2017-01-184-0/+63
* | | | Fix message signing UI renderingDan Finlay2017-01-171-5/+10
| |_|/ |/| |
* | | Merge branch 'master' into devDan Finlay2017-01-174-8/+7
|\ \ \
| * | | update coinbase info and viewFrankie2017-01-112-5/+5
| * | | remove network Id 2 from explorer link and Add network Id 3Frances Pangilinan2016-12-212-3/+2
* | | | Dont render conf-tx if their are no txParams to showFrankie2017-01-151-2/+4
| |_|/ |/| |
* | | remove orphaned commentFrankie2017-01-141-1/+0
* | | lintFrankie2017-01-141-1/+1
* | | Clean up codeFrankie2017-01-143-33/+37
* | | Fix sorting and instances where something could be undefinedFrankie2017-01-123-4/+5
* | | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-121-5/+4
|\ \ \
| * | | Send update to UI when changing selected accountDan Finlay2017-01-121-5/+4
* | | | 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-126-45/+40
|/ / /
* | | quick typo fix.Kevin Serrano2017-01-071-2/+2
* | | Switch order of header and indicator.Kevin Serrano2017-01-061-1/+1
* | | Linting.Kevin Serrano2017-01-052-2/+1
* | | Make network somewhat more modular, add new network indicator.Kevin Serrano2017-01-054-17/+24
* | | Convert more actions to new simple patternDan Finlay2017-01-041-18/+2
* | | Restore missing lineDan Finlay2017-01-041-0/+1
* | | Corrected instances of showWarning to displayWarningDan Finlay2017-01-041-3/+3
* | | Apply new pattern to repetitive functionsDan Finlay2017-01-041-19/+2
* | | Update account list after adding accountDan Finlay2017-01-041-10/+24
* | | Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManagerDan Finlay2017-01-031-2/+2
|\ \ \
| * \ \ Merge branch 'dev' into TxManagerFrankie2016-12-244-16/+57
| |\ \ \
| * \ \ \ Merge branch 'dev' into TxManagerFrankie2016-12-2212-49/+255
| |\ \ \ \
| * | | | | First pass at revision requestsFrances Pangilinan2016-12-221-2/+2
* | | | | | Fix rendering of loose accountsDan Finlay2016-12-242-3/+5
* | | | | | Show a "LOOSE" warning on accounts not belonging to HD Seed phraseDan Finlay2016-12-233-7/+42
| |_|/ / / |/| | | |
* | | | | Merge pull request #948 from MetaMask/RecoverLostAccountsDan Finlay2016-12-234-16/+57
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Rename function to be an actionDan Finlay2016-12-231-2/+2
| * | | | LintedDan Finlay2016-12-213-5/+3
| * | | | Make notices confirmation configurableDan Finlay2016-12-214-13/+56
* | | | | Lint.Kevin Serrano2016-12-211-1/+1
* | | | | Validate URIs before entering them in.Kevin Serrano2016-12-211-2/+26
|/ / / /
* | | | Merge pull request #937 from MetaMask/i900-forgot-password-flowDan Finlay2016-12-205-22/+28
|\ \ \ \
| * | | | Modify actions to support better transition.Kevin Serrano2016-12-203-1/+18
| * | | | Lint.Kevin Serrano2016-12-201-2/+2
| * | | | Redirect to seed word screen for forgotten passwords.Kevin Serrano2016-12-204-20/+9
* | | | | Merged master into devDan Finlay2016-12-209-25/+201
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Clean up first noticeDan Finlay2016-12-171-2/+1
| * | | Add date to notices display.Kevin Serrano2016-12-171-1/+15
| * | | clean - code stylekumavis2016-12-171-4/+0
| * | | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-172-1/+5
| * | | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-176-0/+187
| * | | Remove morden testnet providerDan Finlay2016-12-164-25/+1
* | | | Revert "Interface enhancements"Dan Finlay2016-12-1711-54/+101
* | | | Fixed header h1 alignment and network nameLuis Iván Cuende2016-12-152-5/+3
* | | | Better account details viewLuis Iván Cuende2016-12-155-42/+14
* | | | Better editable labelLuis Iván Cuende2016-12-155-40/+15
* | | | Better buttonsLuis Iván Cuende2016-12-142-4/+9
* | | | Beautified disclaimerLuis Iván Cuende2016-12-143-11/+14
| |/ / |/| |
* | | Fix vault encrypting & unlocking bugDan Finlay2016-12-012-7/+32
* | | Add integration tests for logging out and back inDan Finlay2016-12-011-1/+2
* | | Made integration test create a first vaultDan Finlay2016-12-011-1/+2
* | | Fix tx adding codeDan Finlay2016-11-301-25/+0
* | | Merge branch 'master' into devDan Finlay2016-11-241-3/+3
|\| |
| * | Merge branch 'master' into new-faucetDan Finlay2016-11-231-2/+2
| |\ \
| | * | Add temporary morden explorer link supportDan Finlay2016-11-221-1/+1
| | * | Add ropsten link supportDan Finlay2016-11-221-2/+2
| * | | Ropsten has sole access to the faucet.Kevin Serrano2016-11-231-3/+3
| * | | Add to changelog.Kevin Serrano2016-11-231-1/+1
| |/ /
* | | Cosmetic changes, rename links.Kevin Serrano2016-11-241-9/+9
* | | Add link back to unlock.Kevin Serrano2016-11-241-0/+16
* | | Fix proper behavior for restoring accounts when password forgotten.Kevin Serrano2016-11-242-0/+2
* | | Modify forgot password flow to go back to init screen.Kevin Serrano2016-11-242-36/+1
* | | Fix undefined provider menu itemDan Finlay2016-11-231-2/+5
* | | LintedDan Finlay2016-11-231-1/+1
* | | Merge pull request #858 from MetaMask/i842-WaitForSeedWordkumavis2016-11-232-5/+7
|\ \ \
| * | | Restore ropsten link supportDan Finlay2016-11-231-3/+3
| * | | Merge branch 'dev' into i842-WaitForSeedWordDan Finlay2016-11-231-2/+2
| |\ \ \
| * | | | Use callback in placeSeedWord method.Dan Finlay2016-11-221-2/+4
* | | | | 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
| |/ / /
* | | | Fix camel casing on setSelectedAccount action.Dan Finlay2016-11-223-4/+4
* | | | Change fauceting to become a response of an emit.Kevin Serrano2016-11-221-2/+2
* | | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-229-21/+20
* | | | Remove entropy from encryption and project.Kevin Serrano2016-11-222-3/+3
|/ / /
* | | Merge pull request #837 from MetaMask/FixMenuItemKevin Serrano2016-11-221-7/+8
|\ \ \
| * | | Fix custom provider menu itemDan Finlay2016-11-221-7/+8
* | | | Merge branch 'dev' into i831-AddRopsten-DevDan Finlay2016-11-2231-509/+6078
|\| | | | |/ / |/| |
| * | Convert conversion util to pure json.Kevin Serrano2016-11-193-6/+5731
| * | Revert one cb to previous state.Kevin Serrano2016-11-161-1/+1
| * | Minimize dispatches by using emitters and relying on state updates.Kevin Serrano2016-11-161-19/+6
| * | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-152-4/+4
| * | Fix lint rules for ternary operator placement.Kevin Serrano2016-11-121-18/+18
| * | Typo fix.Kevin Serrano2016-11-121-9/+9
| * | Linting to the max.Kevin Serrano2016-11-1216-51/+36
| * | Merge branch 'master' into i328-MultiVaultkumavis2016-11-112-2/+6
| |\ \
| * \ \ Merge branch 'master' into i328-MultiVaultkumavis2016-11-111-0/+9
| |\ \ \
| * \ \ \ Merge branch 'master' into i328-MultiVaultFrankie2016-11-113-16/+11
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into i328-MultiVaultDan Finlay2016-11-081-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove insane actions hashDan Finlay2016-11-051-6/+2
| * | | | | Add reveal of seed words.Kevin Serrano2016-11-023-0/+43
| * | | | | Make identicon tolerant of changing stateDan Finlay2016-11-021-0/+17
| * | | | | Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-023-3/+6
| * | | | | Make forgot password button.Dan Finlay2016-11-023-32/+23
| * | | | | Fix seed phrase restoreDan Finlay2016-11-022-4/+3
| * | | | | Made progress on parity for MultiVaultKevin Serrano2016-11-026-171/+43
| * | | | | LintedKevin Serrano2016-11-011-1/+0
| * | | | | Implement seed word confirmation page.Kevin Serrano2016-11-015-0/+392
| * | | | | Make case condition more consistent. Remove extra action. Fix incorrect displ...Kevin Serrano2016-10-312-2/+3
| * | | | | Add focus to password field.Kevin Serrano2016-10-311-0/+4
| * | | | | Add password warning div.Kevin Serrano2016-10-311-2/+7
| * | | | | Modify first-screen design to match docs.Kevin Serrano2016-10-311-2/+3
| * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-295-21/+124
| |\ \ \ \ \
| | * | | | | Configure BIP44 Keychain as default oneDan Finlay2016-10-292-4/+19
| | * | | | | Fix identicon renderingDan Finlay2016-10-281-7/+6
| | * | | | | Update first screen to match design.Dan Finlay2016-10-282-10/+99
| * | | | | | Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-292-9/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Phase out extra warning screen.Kevin Serrano2016-10-266-128/+1
| * | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-222-1/+12
| |\ \ \ \ \ \
| * | | | | | | Fix duplicate provider menu item bugDan Finlay2016-10-221-6/+1
| * | | | | | | Improved simple account generationDan Finlay2016-10-211-1/+1
| * | | | | | | Began adding first basic keyringDan Finlay2016-10-213-4/+19
| * | | | | | | Fix testsDan Finlay2016-10-211-2/+2
| * | | | | | | Linted & added salting to vaultDan Finlay2016-10-213-8/+4
| * | | | | | | Fix state updating after vault creation and unlockingDan Finlay2016-10-212-2/+9
| * | | | | | | Commented out useless advanced not on init screenDan Finlay2016-10-211-0/+2
| * | | | | | | Change actions reference to keyringController to backgroundDan Finlay2016-10-212-25/+25
| * | | | | | | LintedDan Finlay2016-10-211-1/+1
| * | | | | | | Git merge resolution.Kevin Serrano2016-10-204-38/+179
| |\ \ \ \ \ \ \
| * | | | | | | | Intermediary commit.Kevin Serrano2016-10-202-25/+25
| * | | | | | | | Initial work on UI sideKevin Serrano2016-10-164-1/+56
| * | | | | | | | Add minimal method signatures to new keyring controllerDan Finlay2016-10-131-1/+2
| * | | | | | | | Remove additional deprecated actionDan Finlay2016-10-131-15/+0
| * | | | | | | | Remove opinionated seed word codeDan Finlay2016-10-137-486/+4
* | | | | | | | | Begin adding Ropsten supportDan Finlay2016-11-225-3/+34
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | lint fixFrankie2016-11-111-1/+2
* | | | | | | | Fix funny looking errors in conf-txFrankie2016-11-112-2/+5
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | detect tx error - show warning and fix gasLimitkumavis2016-11-111-0/+9
| |_|_|_|_|/ |/| | | | |
* | | | | | Unify warning functions.Kevin G. Serrano2016-11-083-17/+12
| |_|_|_|/ |/| | | |
* | | | | Fix github link on info pageDan Finlay2016-11-011-1/+1
| |_|_|/ |/| | |
* | | | Fix provider menu selection indicationDan Finlay2016-10-262-9/+8
| |_|/ |/| |
* | | Change regex in isHex functionFrankie2016-10-221-4/+1
* | | clean up the isHex functionFrankie2016-10-221-3/+4
* | | Add test and ability for isHex to handle hex strings with hex-prefixFrankie2016-10-201-0/+1
* | | Fix up wordingFrankie2016-10-201-1/+1
* | | Add valdations to txData paramFrankie2016-10-202-0/+12
| |/ |/|
* | Create callback and Clean-up detailsFrankie2016-10-143-10/+12
* | fix spellingFrankie2016-10-141-4/+2
* | Specify base 10 in bignumberFrankie2016-10-141-1/+1
* | Fix gasPrice rangeFrankie2016-10-144-16/+12
* | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-126-16/+73
|\|
| * Merge branch 'master' into i721-ScrollAccountListDan Finlay2016-10-125-15/+72
| |\
| | * Remove logs.Kevin Serrano2016-10-121-3/+0
| | * Cleanup.Kevin Serrano2016-10-122-1/+4
| | * Move tos hash logic to build phase. Create dynamic global variables based on ...Kevin Serrano2016-10-121-1/+1
| | * Prevent back/login buttons from appearing on the terms of service.Kevin Serrano2016-10-071-0/+1
| | * Rewritten to react standards. Way easier.Kevin Serrano2016-10-051-9/+8
| | * Linting.Kevin Serrano2016-10-051-3/+3
| | * Rename drop menu item to be consistent with naming.Kevin Serrano2016-10-051-1/+1
| | * Add relevant legal links to help page.Kevin Serrano2016-10-051-8/+41
| | * Make config page title consistent with menu item.Kevin Serrano2016-10-051-1/+1
| | * Add links to relevant legal pages on user agreement page.Kevin Serrano2016-10-051-2/+6
| | * Add conditional logic for adding listener.Kevin Serrano2016-10-051-3/+5
| | * Add padding to markdown paragraphs.Kevin Serrano2016-10-051-0/+4
| | * Merge branch 'master' into tosKevin Serrano2016-10-052-3/+7
| | |\
| | * | Add CSS rules for proper formatting.Kevin Serrano2016-10-051-1/+7
| | * | Implemented scroll-to-bottom functionality for button activation.Kevin Serrano2016-10-051-2/+10
| * | | Remove flex class from account list containerDan Finlay2016-10-121-1/+1
| | |/ | |/|
* | | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-112-3/+7
|\| |
| * | Merge branch 'master' into SmallerCopiedButtonFrankie2016-10-051-3/+6
| |\ \
| | * | Removed hex prefix from private key exportDan Finlay2016-10-051-3/+6
| | |/
| * / Make seed word confirmation button font smallerDan Finlay2016-10-051-0/+1
| |/
* / Add custom gas field to send pageFrankie2016-10-113-33/+178
|/
* Space out purchase details on ShapeShift formDan Finlay2016-09-162-6/+5
* 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-168-17/+84
| |\
| * | add tx-viz link to transaction historyFrankie2016-09-161-12/+27
* | | Show loading indication when selecting ShapeShiftDan Finlay2016-09-163-11/+12
| |/ |/|
* | Clean up some of the codeFrankie2016-09-162-28/+18
* | 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-162-37/+49
* | Merge branch 'master' into i#519buyButtonTxConfFrankie2016-09-161-1/+3
|\|
| * Do not show user rejection errors within our UI.Dan Finlay2016-09-151-1/+3
* | Drop the buy button in the confTx view if account does not have enough ethFrankie2016-09-167-13/+71
|/
* Merge branch 'master' into qrCodeFrankie2016-09-145-32/+12
|\
| * PendingTxDetails - partially remove imagify supportkumavis2016-09-141-26/+11
| * Merge branch 'library' of github.com:MetaMask/metamask-plugin into librarykumavis2016-09-133-10/+8
| |\
| * | ui - remove unused currentDomain propkumavis2016-09-134-6/+1
* | | Remove unused code in qr actionsFrankie2016-09-131-2/+0
* | | Merge branch 'master' into qrCodeFrankie2016-09-133-10/+8
|\ \ \ | | |/ | |/|
| * | Ensure loading indication covers foxDan Finlay2016-09-131-0/+1
| * | Fix single account list formattingDan Finlay2016-09-132-5/+2
| * | Add accounts back to metamask stateDan Finlay2016-09-131-5/+5
| |/
* / Add qrcode-npm to package.json and swap out Qr Code generator api for node-mo...Frankie2016-09-136-45/+47
|/
* Revert "Add new eth-lightwallet salting to vault."Frankie2016-09-135-15/+18
* Fix account list formatting when only a single item.Dan Finlay2016-09-122-10/+7
* Camelcase dataset key for reactDan Finlay2016-09-113-8/+8
* Merge branch 'master' into FixLogoPasswordFollowKevin Serrano2016-09-101-0/+2
|\
| * Show loading indication during unlocking.Dan Finlay2016-09-091-0/+2
* | Fix fox logo password followingDan Finlay2016-09-091-2/+1
|/
* Merge branch 'master' into FixLogoLeakDan Finlay2016-09-096-9/+16
|\
| * Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-p...Frankie2016-09-091-14/+3
| |\
| | * Merge branch 'master' into i#589pendingTxsIssueFrankie2016-09-091-14/+3
| | |\
| * | | Fix wording in changelog and bugFrankie2016-09-091-1/+1
| |/ /
| * | Remove console.logFrankie2016-09-091-1/+0
| * | Add to CHANGELOG.md and Remove unnecessary catchFrankie2016-09-091-9/+0
| * | Merge branch 'master' into i#589pendingTxsIssueFrankie2016-09-0912-176/+111
| |\ \
| * | | Add network checks for unconfirmed TxsFrankie2016-09-095-8/+25
| * | | Filter out pending txs based on network from tx historyFrankie2016-09-081-1/+1
* | | | Fix new logo related errorsDan Finlay2016-09-091-3/+6
| |_|/ |/| |
* | | Merge branch 'master' into AddNewLogoDan Finlay2016-09-0911-175/+110
|\ \ \ | | |/ | |/|
| * | Restore broken variable referenceDan Finlay2016-09-091-0/+1
| * | Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into...Dan Finlay2016-09-091-1/+1
| |\ \
| | * \ Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-091-1/+1
| | |\ \
| * | | | Fix double tooltipDan Finlay2016-09-091-10/+1
| |/ / /
| * | | Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-073-6/+5
| |\ \ \ | | | |/ | | |/|
| * | | LintedDan Finlay2016-09-071-23/+22
| * | | Add fiat balances to tx conf viewDan Finlay2016-09-072-9/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 16:22:15 +0800