aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
Commit message (Expand)AuthorAgeFilesLines
* 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-243-16/+34
| |\
| * \ 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-233-16/+34
|\ \ \ | |_|/ |/| |
| * | Rename function to be an actionDan Finlay2016-12-231-2/+2
| * | LintedDan Finlay2016-12-212-4/+2
| * | Make notices confirmation configurableDan Finlay2016-12-213-13/+33
* | | 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
|\|
| * 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
* | Merge pull request #858 from MetaMask/i842-WaitForSeedWordkumavis2016-11-231-2/+4
|\ \
| * \ 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-222-3/+3
* | | 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-228-17/+16
* | | 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-2227-500/+6070
|\| | | |/ |/|
| * 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-1213-43/+29
| * 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-211-24/+24
| * | | | | | | LintedDan Finlay2016-10-211-1/+1
| * | | | | | | Git merge resolution.Kevin Serrano2016-10-204-38/+179
| |\ \ \ \ \ \ \
| * | | | | | | | Intermediary commit.Kevin Serrano2016-10-201-24/+24
| * | | | | | | | 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-224-3/+31
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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-144-29/+11
|\
| * 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-133-3/+0
* | | 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-094-5/+11
|\
| * Merge branch 'master' into i#589pendingTxsIssueFrankie2016-09-091-14/+3
| |\
| * | 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-093-4/+20
| * | | 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
| * | | 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-079-109/+19
| * | | Continuing fiat balance modularizationDan Finlay2016-09-043-73/+106
* | | | Fix logo usage for metamask-logo v2.0.0Dan Finlay2016-09-091-14/+3
| |_|/ |/| |
* | | Fix typoJohn Weldon2016-09-081-1/+1
| |/ |/|
* | Fix capitalization.Kevin Serrano2016-09-071-1/+1
* | Fix typos and refine wording.Kevin Serrano2016-09-072-5/+4
|/
* Show conf screen after send requestDan Finlay2016-09-021-2/+1
* Skip loading indication from send screenDan Finlay2016-09-021-1/+0
* Show custom rpc menu item alwaysDan Finlay2016-08-301-6/+9
* Fix spelling errorDan Finlay2016-08-271-1/+1
* make the back button its own functionFrankie2016-08-271-21/+22
* Merge branch 'master' into i#563forgotPasswordFrankie2016-08-266-14/+53
|\
| * Merge branch 'master' into PopupNotificationsDan Finlay2016-08-263-11/+40
| |\
| | * Persist shapeshift form input valuesDan Finlay2016-08-261-3/+12
| | * Persist send tx form field valuesDan Finlay2016-08-261-5/+14
| | * Make restore vault form persistDan Finlay2016-08-261-3/+14
| * | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-252-7/+4
| |\|
| * | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-242-7/+14
| |\ \
| * | | LintedDan Finlay2016-08-241-1/+0
| * | | Close notification on opening main UIDan Finlay2016-08-241-7/+1
| * | | Close popup even if last tx is dismissed from main UIDan Finlay2016-08-241-7/+8
| * | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-235-15/+74
| |\ \ \
| * | | | Fix back button hiding on popupDan Finlay2016-08-231-1/+2
| * | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-2314-35/+335
| |\ \ \ \
| * | | | | LintedDan Finlay2016-08-171-7/+4
| * | | | | MVP Popup Notifications WorkingDan Finlay2016-08-173-2/+20
* | | | | | Change style on back button to be more like the rest of the appFrankie2016-08-261-25/+55
* | | | | | Merge branch 'master' into i#563forgotPasswordFrankie2016-08-269-29/+92
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | LintedDan Finlay2016-08-251-1/+0
| * | | | | Improve msg signing paddingDan Finlay2016-08-251-5/+3
| * | | | | Fix empty sign message bugDan Finlay2016-08-251-1/+1
| | |_|_|/ | |/| | |
| * | | | Merge branch 'master' into fox-subKevin Serrano2016-08-245-15/+74
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | More lintingDan Finlay2016-08-232-4/+1
| | * | | LintedDan Finlay2016-08-234-8/+4
| | * | | Removed view more button, added account info button.Dan Finlay2016-08-235-22/+67
| | * | | Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-2313-21/+316
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-192-13/+19
| | |\ \ \
| | * | | | 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-192-7/+27
| | | |_|/ | | |/| |
| * | | | 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-233-7/+10
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Modify logic for component update.Kevin Serrano2016-08-201-5/+4
| * | | | Create replacement logo for non-webglKevin Serrano2016-08-202-3/+10
* | | | | Add a back button on lock screen to go back to init menuFrankie2016-08-265-43/+136
| |/ / / |/| | |
* | | | Fix issue where if given a balance that does not need to be parsed will not b...Frankie2016-08-203-7/+10
|/ / /
* | | Merge branch 'master' into shapeshiftTxDan Finlay2016-08-192-13/+19
|\ \ \ | | |/ | |/|
| * | Lint and changelog.Kevin Serrano2016-08-191-2/+2
| * | Fix rounding issues.Kevin Serrano2016-08-192-14/+20
| |/
* | 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-196-58/+97
* | Add api Public keyFrankie2016-08-191-0/+2
* | Merge branch 'master' into shapeshiftTxFrankie2016-08-1911-8/+222
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 08:42:31 +0800