aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into PopupNotificationsDan Finlay2016-08-235-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
* | | | Fix back button hiding on popupDan Finlay2016-08-231-1/+2
* | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-2314-35/+335
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| |\|
| * | WIP: ShapeShift txFrankie2016-08-198-12/+274
* | | LintedDan Finlay2016-08-171-7/+4
* | | MVP Popup Notifications WorkingDan Finlay2016-08-173-2/+20
| |/ |/|
* | 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
| |/
| * 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
| | |/
| * | Create "buy form" add shape shiftFrankie2016-08-119-6/+933
* | | 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
|\ \ \ | | |/ | |/|
| * | 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
| |/ /
* | | Merge branch 'master' into usd-conversionKevin Serrano2016-07-261-2/+1
|\| |
| * | Add mock dev modeDan Finlay2016-07-221-2/+1
* | | Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.Kevin Serrano2016-07-237-2/+169
|\| |
| * | Buy button (#474)Frankie2016-07-227-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
|\| |
| * | Implement some cross-browser practices (#473)Dan Finlay2016-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
|/ /
* | 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
|/
* 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
| * 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-089-69/+330
|\ \ \ | | |/ | |/|
| * | 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-082-2/+2
| |\
| * | lint fixkumavis2016-07-081-1/+1
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio...kumavis2016-07-082-21/+48
| |\ \
| * | | 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-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-076-18/+193
| * | | | | | | 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 fixe...Kevin Serrano2016-07-082-1/+71
* | | | | | | | 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 hist...Kevin Serrano2016-07-082-2/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
| |_|_|_|/ |/| | | |
* | | | | 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
|\ \
| * | 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
* Remove old disclaimerDan Finlay2016-07-011-8/+0
* Merge branch 'master' into FrankieDisclaimerDan Finlay2016-07-018-90/+161
|\
| * Merge pull request #378 from MetaMask/UiDevkumavis2016-07-012-1/+11
| |\
| | * Make info page not chrome dependentDan Finlay2016-07-011-1/+7
| | * First simple version of ui mockerDan Finlay2016-07-012-1/+5
| * | Merge branch 'master' into compactLayoutFrankie2016-07-011-0/+5
| |\ \
| | * | Fix broken action referenceDan Finlay2016-07-011-0/+5
| | |/
| * | Implemt new account layoutFrankie2016-07-016-35/+59
| * | WIP: Working on new layoutFrankie2016-07-014-82/+114
| |/
* / Add new user agreementDan Finlay2016-07-011-1/+1
|/
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into networkIndi...kumavis2016-06-306-41/+128
|\
| * Unify tooltip stylesDan Finlay2016-06-304-26/+59
| * 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
| * | Replace manual copy buttons with new CopyButton componentDan Finlay2016-06-302-17/+6
| * | 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-303-21/+20
* | Add network name to indicator and some css fixesFrankie2016-06-304-11/+51
* | Add ✓ charchter to indicate active networkFrankie2016-06-302-0/+31
|/
* Remove missused actionFrankie2016-06-291-1/+0
* Make it so that when you click the custom rpc url it closes the dropdown menuFrankie2016-06-291-1/+1
* fix lintFrankie2016-06-291-4/+4
* Merge branch 'master' into networkDropdownFixFrankie2016-06-293-18/+16
|\
| * Modify network icons to reflect current design. (#355)Kevin Serrano2016-06-293-16/+13
| * Fix out-of-place positioning of pending tx badges. (#354)Kevin Serrano2016-06-291-2/+3
* | Add custom to drop down menuFrankie2016-06-291-0/+22
|/
* Merge branch 'master' into pr/351kumavis2016-06-292-2/+2
|\
| * Merge branch 'master' into FixSomeFormattingkumavis2016-06-293-4/+9
| |\
| * | Simplify `send ether` button to `send`.Dan Finlay2016-06-291-1/+1
| * | Fix formatting on terms & conditions pageDan Finlay2016-06-291-1/+1
* | | 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-293-4/+9
|\ \ \ | | |/ | |/|
| * | Merge pull request #344 from Zanibas/character-limitkumavis2016-06-291-2/+4
| |\ \
| | * | Code style fix.Kevin Serrano2016-06-291-2/+2
| | * | Merge changelog.Kevin Serrano2016-06-293-2/+7
| | |\|
| | * | 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
| * | | Move clearNotifications to popup.jsFrankie2016-06-291-9/+0
| * | | fix for lintingFrankie2016-06-291-5/+5
| * | | Merge branch 'master' into i340+1Frankie2016-06-296-2/+11
| |\ \ \ | | | |/ | | |/|
| * | | fix #341 close notifications when oppening pop upFrankie2016-06-291-0/+8
| * | | Fix it so you cant send a negitavie amount of ETHFrankie2016-06-281-1/+5
* | | | Wallet name now is properly truncated.Kevin Serrano2016-06-292-2/+2
* | | | Truncate account name further.Kevin Serrano2016-06-291-1/+1
| |/ / |/| |
* | | Change color of failure to yellow. Change pending to ellipsis. (#338)Kevin Serrano2016-06-293-2/+7
| |/ |/|
* | Add alt titles to most critical iconsKevin Serrano2016-06-283-0/+4
|/
* Merge branch 'master' into uiFixesFrankie2016-06-256-88/+142
|\
| * 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
| |\
| * | breakout pending-tx-detailskumavis2016-06-254-31/+74
* | | Fix for the mailto linkFrankie2016-06-251-1/+1
* | | Fix editable button so that it dosent float above the drop down menueFrankie2016-06-251-4/+2
| |/ |/|
* | identicon - default to imageifykumavis2016-06-251-1/+1
|/
* send-tx remove account select buttonkumavis2016-06-252-5/+7
* Merge pull request #312 from MetaMask/svg-notifkumavis2016-06-246-81/+67
|\
| * pending-tx pass the identicon pref onkumavis2016-06-242-0/+2
| * account-panel combine panel into account-panelkumavis2016-06-242-66/+37
| * accounts - rename account list item so it doesnt overlapkumavis2016-06-242-2/+3
| * 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-246-91/+20
| |\
| * | initial svg notificationskumavis2016-06-231-5/+11
* | | Add fox logo back to left of menuDan Finlay2016-06-241-8/+29
* | | Moved account change button to menu barDan Finlay2016-06-242-32/+36
| |/ |/|
* | close #309Frankie2016-06-231-1/+0
* | Remove redundant network option buttons from settings pageFrankie2016-06-231-37/+1
* | Swap out Transat font for MontserratFrankie2016-06-235-54/+20
|/
* Fix for lint errFrankie2016-06-222-13/+7
* Fix conflictFrankie2016-06-2241-1011/+918
|\
| * Manually lintedDan Finlay2016-06-2231-108/+64
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLintDan Finlay2016-06-221-10/+7
| |\
| * | Auto lintedDan Finlay2016-06-2241-927/+875
* | | Change the copy to cliboard iconFrankie2016-06-221-2/+6
* | | Change export icon to keyFrankie2016-06-222-3/+9
| |/ |/|
* | tweekZac Mitton2016-06-211-1/+0
* | added a failing case and fixed it by refactoring everything to stringsZac Mitton2016-06-211-10/+8
|/
* Fix tx approval address formattingDan Finlay2016-06-171-1/+2
* Preserve disclaimer line breaksDan Finlay2016-06-171-2/+2
* Added some real text to top of disclaimerDan Finlay2016-06-171-1/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 01:39:14 +0800