aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Frankie2016-09-136-45/+47
|/ | | | node-module
* 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
| | | | | | - Makes account list items no longer flex larger than they should be. - Makes the add account button not flex larger than it should be. - Adds a line under the add account button to define its size.
* 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
|/ | | | | | | | The new lightweight svg logo was not following text quite right. The new `lookAt` method was not using the same logic the module was using internally on mouse movement. I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like.
* Merge branch 'master' into FixLogoLeakDan Finlay2016-09-096-9/+16
|\
| * Merge branch 'i#589pendingTxsIssue' of ↵Frankie2016-09-091-14/+3
| |\ | | | | | | | | | https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue
| | * 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
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method. Also tuned up the logo to more closely resemble the old behavior. - Overlaps the title text - Points nose at cursor, not just front of eyes - Cursor is more "distant" from fox, to avoid extreme angles on edges.
* | | 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 ↵Dan Finlay2016-09-091-1/+1
| |\ \ | | | | | | | | | | | | into ModularFiatBalance
| | * \ 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
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | - No longer need to check for webGL compliance (svg rendered!) - logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element. Otherwise, worked with very little effort!! Fixes #624
* | | 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
|
* Make element enumeration Edge compatibleDan Finlay2016-08-301-10/+7
|
* Add tolerance for failed form persistingDan Finlay2016-08-301-0/+7
|
* 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-267-14/+110
|\
| * Merge branch 'master' into PopupNotificationsDan Finlay2016-08-264-11/+97
| |\
| | * LintedDan Finlay2016-08-261-3/+1
| | |
| | * Persist shapeshift form input valuesDan Finlay2016-08-261-3/+12
| | |
| | * Persist send tx form field valuesDan Finlay2016-08-261-5/+14
| | |
| | * Remove logDan Finlay2016-08-261-1/+0
| | |
| | * Make restore vault form persistDan Finlay2016-08-261-3/+14
| | |
| | * Add persistent form classDan Finlay2016-08-261-0/+60
| | |
| * | 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-236-15/+92
| |\ \ \
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both. In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways: - Hide the menu bar - Hide the back button from the notifications view. - When confirming the last tx, close the window.
| * | | | | Unify notification and popup ui filesDan Finlay2016-08-171-52/+0
| | | | | |
| * | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-179-7/+214
| |\ \ \ \ \
| * | | | | | Set up MVP for popup-based notifications.Dan Finlay2016-08-171-0/+52
| | | | | | |
* | | | | | | 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-2610-29/+110
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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-246-15/+92
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that.
| | * | | | 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-193-7/+45
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.
| * | | | | 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 ↵Frankie2016-08-203-7/+10
|/ / / / | | | | | | | | | | | | be parsed
* | | | 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 ↵Frankie2016-08-152-1/+8
| | | | | | | | | | | | code page
| * | 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 ↵Kevin Serrano2016-08-051-0/+3
| | | | | | | | | | | | for ui dev.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #542
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | When adding the classic network to the menu, I left a reference to a property that is not always existent, so we needed a fallback for it.
| * | | | | 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
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add platform specific folders to dist folder * Remove gulp hacks * Add platform specific bundling dev and dist tasks now build into platform-specific folders within the `dist` folder. Added tasks `gulp zip` and `gulp dist`. `zip` builds the platform-specific folders into platform-specific bundles within the `dist` folder. `dist` builds and then zips all at once. * Fix chrome bundle zipping * Fix broken reference in eth warning * Fix but where web3.eth.accounts are not available in firefox. * Bump changelog
| * / | | | 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
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension
| * | Implement some cross-browser practices (#473)Dan Finlay2016-07-222-4/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | * Add mozilla plugin key to manifest * Move all chrome references into platform-checking module Addresses #453 * Add chrome global back to linter blacklist * Add tests
| * Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-07-192-1/+10
| |\ | | | | | | | | | FixReopeningBug
| | * Add ui state logging functionDan Finlay2016-07-161-0/+8
| | | | | | | | | | | | | | | | | | Now from the UI console, you can always call `logState()`, and it will print the state stringified into the console, ready to drop into the ui dev mode states folder, or other inspection. This should make it easier to diagnose user bugs in the future.
| | * 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 ↵Kevin Serrano2016-07-191-1/+6
| |\ \ | | | | | | | | | | | | AustP-master
| | * | 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
| | | | | | * new tx - calculate estimatedGas and show thing in tx-details * Bump changelog
* Fix eth balance tooltip to show 6 decimals (#440)Frankie2016-07-143-4/+9
| | | | | | | | | | | | * Fix tooltip to show to the 6 decimal place on balances ovr 0... * Change font size for balance component in tx-list so it fits the notation * Add to change log * Linting * change log
* Move fox logo with filled in eyes into design folder (#433)Frankie2016-07-141-0/+0
| | | | | | | | | | * Move fox logo with filled in eyes into design folder * Crop fox * Crop fox properly * Gah Crop fox properly
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBugkumavis2016-07-126-145/+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-122-3/+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 ↵kumavis2016-07-082-18/+51
|\ | | | | | | ui-fixth-width-tx-history
| * 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 ↵kumavis2016-07-081-10/+1
| |\ | | | | | | | | | ConfirmationStyle
| * | 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-0810-69/+361
|\ \ \ | | |/ | |/|
| * | Fixed eth_balance style, completing partial mergeDan Finlay2016-07-081-10/+1
| |/
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-07-082-2/+2
| |\ | | | | | | | | | ConfirmationStyle
| * | lint fixkumavis2016-07-081-1/+1
| | |
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-07-082-21/+48
| |\ \ | | | | | | | | | | | | ConfirmationStyle
| * | | Restore button naming consistencyDan Finlay2016-07-081-2/+2
| | | |
| * | | Add nickname rendering for recipient addressDan Finlay2016-07-082-5/+19
| | | |
| * | | LintedDan Finlay2016-07-082-2/+2
| | | |
| * | | Refined tx confirmation button stylesDan Finlay2016-07-081-7/+19
| | | |
| * | | Implement tx confirmation style refinementsDan Finlay2016-07-084-24/+38
| | | |
| * | | 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-082-40/+28
| |\ \ \
| * | | | 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
| | | | |
| * | | | Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-072-4/+4
| |\ \ \ \
| * | | | | LintedDan Finlay2016-07-072-29/+6
| | | | | |
| * | | | | Fixed up pending-tx-detailsDan Finlay2016-07-073-24/+27
| | | | | |
| * | | | | Fleshed out pending tx viewDan Finlay2016-07-074-31/+86
| | | | | |
| * | | | | Merged latest balance formatting codeDan Finlay2016-07-074-29/+42
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-072-28/+39
| |\ \ \ \ \ \
| * | | | | | | Began reworking tx conf viewDan Finlay2016-07-077-18/+210
| | | | | | | |
| * | | | | | | Simplify empty account balance renderingDan Finlay2016-07-061-1/+1
| | | | | | | |
* | | | | | | | Pass the linters.Kevin Serrano2016-07-081-5/+5
| | | | | | | |
* | | | | | | | Remove reducer console log.Kevin Serrano2016-07-081-1/+0
| | | | | | | |
* | | | | | | | Add new component for tx-history to avoid messing with other styles. Add ↵Kevin Serrano2016-07-082-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed width specifically to this style.
* | | | | | | | Modified test views again. Added fixed length to center tx information.Kevin Serrano2016-07-082-1/+5
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Remove logging for states.Kevin Serrano2016-07-081-1/+0
| | | | | | |
* | | | | | | Add new test state with tx history. Fix alignment issue with transaction ↵Kevin Serrano2016-07-082-2/+3
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | history text.
* | | | | | Change function name to generateBalanceObjectFrankie2016-07-082-4/+4
| | | | | |
* | | | | | Add method to deal with small decimals and create the object for eth-balance ↵Frankie2016-07-082-17/+34
| |_|_|_|/ |/| | | | | | | | | | | | | | component
* | | | | Revert back to original formatBalanceFrankie2016-07-082-40/+28
| |_|_|/ |/| | |
* | | | Fix dropdown z-index issue.Kevin Serrano2016-07-071-3/+3
| | | |
* | | | Handle to small of balances with "<0.00001"Frankie2016-07-071-1/+1
| |_|/ |/| |
* | | Add a postion option for tool tipFrankie2016-07-072-1/+2
| | |
* | | Add decimal hendeling to ETH balanceFrankie2016-07-073-28/+40
| |/ |/|
* | Merge pull request #387 from MetaMask/ui-formattingDan Finlay2016-07-071-23/+25
|\ \ | | | | | | Ui formatting for account details
| * | Move account balance down a row. Adjusted positioning of buttons.Kevin Serrano2016-07-061-23/+25
| |/
* / Add light and ultraLight fontsFrankie2016-07-062-5/+14
|/
* Put network status checkmarks at end of rowDan Finlay2016-07-022-0/+5
|
* LintedDan Finlay2016-07-021-1/+0
|
* Move main drop-down state to component stateDan Finlay2016-07-023-35/+9
|
* Formatted dev mode betterDan Finlay2016-07-013-7/+6
|
* Added some basic stylesDan Finlay2016-07-011-1/+14
|
* disclaimer - render via react-markdownkumavis2016-07-011-2/+10
|