aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/ |/|
| * Fix provider menu selection indicationDan Finlay2016-10-262-9/+8
* | Phase out extra warning screen.Kevin Serrano2016-10-266-128/+1
* | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-222-1/+12
|\|
| * 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
* | 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
|\|
| * 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 i#495CustomGasFieldFrankie2016-10-112-3/+7
| |\ \
| * | | Add custom gas field to send pageFrankie2016-10-113-33/+178
* | | | 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
| |_|/ |/| |
* | | 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 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
|/
* 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
|\|
| * Added compliance for tests and properly accounts for N/A conversions.Kevin Serrano2016-08-172-2/+2
| * 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
| * Change account list balance rendering.Kevin Serrano2016-08-172-3/+6
| * Remove console logs.Kevin Serrano2016-08-171-2/+0
| * Add recent conversion date.Kevin Serrano2016-08-171-0/+4
| * Add fallback to API failure.Kevin Serrano2016-08-171-1/+5
| * Remove react-select as dependency.Kevin Serrano2016-08-171-7/+0
| * Remove logging. Clean up duplicate entries in currency list.Kevin Serrano2016-08-172-3/+2
| * linting and ignoring.Kevin Serrano2016-08-176-15/+8
| * Divided eth components for tx and account detail.Kevin Serrano2016-08-173-15/+128
| * Merge master.Kevin Serrano2016-08-1614-43/+1078
| |\
| | * Add margin to "go to test faucet" button and show more of the address on qr c...Frankie2016-08-152-1/+8
| * | Did not previously call functions before!Kevin Serrano2016-08-101-0/+3
| * | Fix default value. Add loading indication for async.Kevin Serrano2016-08-102-3/+5
| * | Enable full listing of supported currencies by Cryptonator.Kevin Serrano2016-08-102-6/+15
| * | Add fix for zero balance shorten.Kevin Serrano2016-08-081-0/+2
| * | Get fiat numbers rendering on tooltip. Need to find way to create line breaks.Kevin Serrano2016-08-062-3/+22
| * | Holding off on select formatting for now. Renamed keys for options.Kevin Serrano2016-08-052-5/+5
| * | Create default values for metamask state for conversion. Fix config files for...Kevin Serrano2016-08-051-0/+3
| * | currency now selectable and save-able.Kevin Serrano2016-08-052-2/+25
| * | Merge branch 'master' into usd-conversionKevin Serrano2016-08-058-13/+58
| |\ \
| * \ \ Merge branch 'master' into usd-conversionKevin Serrano2016-07-261-2/+1
| |\ \ \
| * \ \ \ Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.Kevin Serrano2016-07-237-2/+169
| |\ \ \ \
| * | | | | Linting!Kevin Serrano2016-07-232-3/+3
| * | | | | Add date access throughout the data flow.Kevin Serrano2016-07-222-0/+2
| * | | | | Merge branch 'master' into usd-conversionKevin Serrano2016-07-222-4/+6
| |\ \ \ \ \
| * | | | | | Add data field to pass up parameters up to reducer.Kevin Serrano2016-07-222-1/+11
| * | | | | | Add fiat actions to metamask controllere and actions.Kevin Serrano2016-07-221-0/+14
* | | | | | | WIP: ShapeShift txFrankie2016-08-198-12/+274
| |_|_|_|_|/ |/| | | | |
* | | | | | Remove ethereum classic providerDan Finlay2016-08-154-26/+1
* | | | | | Add multi message capability to Qr view for market infoFrankie2016-08-134-6/+27
* | | | | | Add a to test faucet buttonFrankie2016-08-131-1/+4
* | | | | | Merge branch 'master' into buyFormFrankie2016-08-132-7/+10
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into CustomRpcLoadingBugkumavis2016-08-121-6/+9
| |\ \ \ \ \ \
| | * | | | | | UI logging supressed for production.Kevin Serrano2016-08-122-6/+1
| | * | | | | | Create global variable that changes ui logging.Kevin Serrano2016-08-122-6/+11
| | * | | | | | Setting defaults to production.Kevin Serrano2016-08-121-2/+0
| | * | | | | | Cosmetic difference.Kevin Serrano2016-08-121-2/+1
| | * | | | | | Remove stray console.logKevin Serrano2016-08-121-1/+0
| | * | | | | | Take out unused dependency.Kevin Serrano2016-08-121-3/+1
| | * | | | | | Remove comments.Kevin Serrano2016-08-121-12/+0
| | * | | | | | Merge branch 'master' into logging-fixKevin Serrano2016-08-121-1/+2
| | |\ \ \ \ \ \
| | * | | | | | | LintKevin Serrano2016-08-121-2/+2
| | * | | | | | | Add ability to hide logging messages in production.Kevin Serrano2016-08-121-5/+26
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | 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-139-184/+256
* | | | | | | Even out some of the marginsFrankie2016-08-111-2/+4
* | | | | | | Fix typo for copyButtonFrankie2016-08-111-1/+1
* | | | | | | Fix merge messFrankie2016-08-114-14/+108
* | | | | | | Merge branch 'master' into buyFormFrankie2016-08-1117-21/+177
|\| | | | | |
| * | | | | | Fix ether warning checkbox.Kevin Serrano2016-08-111-1/+2
| |/ / / / /
| * | | | | Fix typos with missing apostropheKevin Serrano2016-08-052-2/+2
| * | | | | Fix issue with dropdown menuFrankie2016-08-041-0/+1
| * | | | | Fix reference in drop menu itemDan Finlay2016-07-301-2/+3
| * | | | | Fix network name referenceDan Finlay2016-07-301-1/+6
| * | | | | LintedDan Finlay2016-07-291-1/+1
| * | | | | Add missing reference for providerDan Finlay2016-07-291-1/+1
| * | | | | Fix margin on provider checkmarksDan Finlay2016-07-291-0/+1
| * | | | | Add eth classic to provider menuDan Finlay2016-07-295-9/+44
| * | | | | Merge branch 'master' into droppo-fixKevin Serrano2016-07-271-2/+2
| |\ \ \ \ \
| | * | | | | Add platform specific builds and zip tasks (#486)Dan Finlay2016-07-271-2/+2
| | | |_|_|/ | | |/| | |
| * / | | | Fix menu droppo issues caused by Chrome 52.Kevin Serrano2016-07-272-0/+2
| |/ / / /
| * | | / Add mock dev modeDan Finlay2016-07-221-2/+1
| | |_|/ | |/| |
| * | | Buy button (#474)Frankie2016-07-227-2/+169
| | |/ | |/|
| * | Implement some cross-browser practices (#473)Dan Finlay2016-07-222-4/+6
| |/
| * Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into Fi...Kevin Serrano2016-07-192-1/+10
| |\
| | * Add ui state logging functionDan Finlay2016-07-161-0/+8
| | * Triage a strange undefined balance errorDan Finlay2016-07-161-1/+2
| * | Readd string to conform to tests. Will discuss later.Kevin Serrano2016-07-191-1/+1
| * | Remove unused None string.Kevin Serrano2016-07-191-1/+1
| * | Merge branch 'master' of https://github.com/AustP/metamask-plugin into AustP-...Kevin Serrano2016-07-191-1/+6
| |\ \
| | * | Add eslint config to pass testsAust2016-07-191-0/+1
| | * | Make zero balance display 0. Fixes #449Aust2016-07-181-1/+5
| | |/
| * / Fix typoThibaut SCHAEFFER2016-07-181-1/+1
| |/
* / Create "buy form" add shape shiftFrankie2016-08-119-6/+933
|/
* 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-143-4/+9
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBugkumavis2016-07-125-144/+64
|\
| * Merge branch 'master' into FixSvgIconsDan Finlay2016-07-124-139/+59
| |\
| | * Integrate changes back into eth-balanceKevin Serrano2016-07-124-111/+40
| | * Move shorten balance to util. Add as property of generateBalance object output.Kevin Serrano2016-07-123-23/+28
| | * Remove unused functions. Readd if necessary.Kevin Serrano2016-07-121-18/+4
| * | LintedDan Finlay2016-07-121-2/+1
| * | Fix imageification of recipientDan Finlay2016-07-121-3/+4
| |/
* / Fix main dropdown animationDan Finlay2016-07-121-2/+2
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 12:46:49 +0800