tangerine-wallet-browser - Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix edge case where notice does not require scrollbar.	Kevin Serrano	2017-03-28	1	-0/+3
\|
*	Merge branch 'ropsten-fix-2' of github.com:MetaMask/metamask-plugin into ↵	kumavis	2017-03-28	1	-1/+1
\|\ \| \| \| \| \| \|	ropsten-fix
\| *	block explorer - ropsten	kumavis	2017-03-28	1	-1/+1
\| \| \| \| \| \| \| \|	etherscan differentiates between "attacked ropsten" vs "revived ropsten" https://ropsten.etherscan.io/ is the revived ropsten
* \|	block explorer - account link - ropsten	kumavis	2017-03-28	1	-1/+1
\|/ \| \| \|	etherscan differentiates between "attacked ropsten" vs "revived ropsten" https://ropsten.etherscan.io/ is the revived ropsten
*	Merge branch 'master' into kovan-notice	Dan Finlay	2017-03-25	8	-452/+563
\|\
\| *	Add personalMessages to function to calculate pending tx index.	Kevin Serrano	2017-03-25	1	-1/+2
\| \|
\| *	Fix tx selecting bug	Dan Finlay	2017-03-25	2	-2/+3
\| \|
\| *	Remove goHome action causing erratic UI behavior.	Kevin Serrano	2017-03-25	1	-1/+0
\| \|
\| *	Remove unnecessary log	Dan Finlay	2017-03-25	1	-2/+0
\| \|
\| *	Disable accept button when gas limit is too low	Dan Finlay	2017-03-25	1	-8/+5
\| \|
\| *	Make gas calculations on render more consistent	Dan Finlay	2017-03-24	1	-10/+16
\| \|
\| *	Fix initial tx fee estimation	Dan Finlay	2017-03-24	2	-4/+5
\| \|
\| *	Fix a couple things	Dan Finlay	2017-03-24	2	-15/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sorry apparently the gas fixes weren't in the last commit, but are in this one. As reported in previous commit, fixes a bug where initial estimate is not derived from the network. Also fixes a bug where clicking "reset" does not clear our custom validation warnings.
\| *	Make reset button clear errors	Dan Finlay	2017-03-24	1	-0/+1
\| \|
\| *	Fix initial gas price estimate	Dan Finlay	2017-03-24	1	-4/+5
\| \|
\| *	Prevent default for reset and reject buttons	Dan Finlay	2017-03-24	2	-1/+3
\| \|
\| *	Override browser default validation message	Dan Finlay	2017-03-24	1	-0/+1
\| \|
\| *	Fix some broken refs	Dan Finlay	2017-03-24	1	-2/+2
\| \|
\| *	Merge branch 'i1234-HardGasLimits-BrowserForm' of ↵	Dan Finlay	2017-03-24	13	-12/+47
\| \|\ \| \| \| \| \| \| \| \| \|	github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm
\| \| *	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	Kevin Serrano	2017-03-24	1	-1/+1
\| \| \|\
\| \| \| *	Enable etherscan linking on Kovan transaction list items.	Kevin Serrano	2017-03-23	1	-1/+1
\| \| \| \|
\| \| * \|	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	Dan Finlay	2017-03-23	10	-8/+41
\| \| \|\\|
\| \| * \|	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	Kevin Serrano	2017-03-23	2	-3/+5
\| \| \|\ \
\| * \| \| \|	Combine pending-tx-details component into pending-tx-details	Dan Finlay	2017-03-24	2	-370/+346
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These were only separated originally so we could make the notification-based TX approval work, which provided its own buttons. This two templates are logically highly coupled, and keeping them working while separate has been difficult at times, and has even required resorting to dubious practices, like using React's `refs` pattern. This combines them into one fairly large component, but I think it's ok, we can still break this up into components, just not the separation that it had previously.
\| * \| \|	Merge branch 'master' into i1234-HardGasLimits-BrowserForm	Dan Finlay	2017-03-23	3	-46/+75
\| \|\ \ \
\| * \| \| \|	Got basic validations working	Dan Finlay	2017-03-23	5	-108/+199
\| \| \| \| \|
\| * \| \| \|	Some progress	Dan Finlay	2017-03-23	2	-7/+16
\| \| \| \| \|
* \| \| \| \|	Reset disabled state for confirm button after every notice.	Kevin Serrano	2017-03-23	1	-1/+4
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge branch 'master' into i238-kovan	Kevin Serrano	2017-03-23	3	-4/+3
\|\ \ \ \
\| * \ \ \	Merge branch 'master' into hide-password	Kevin Serrano	2017-03-23	2	-4/+2
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'master' into i1193-errorstylefix	Dan Finlay	2017-03-23	2	-3/+5
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	Fix styling of error message.	Kevin Serrano	2017-03-23	2	-4/+2
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'master' into hide-password	Kevin Serrano	2017-03-23	2	-3/+5
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Hide the password in the private key retrieval screen.	Kevin Serrano	2017-03-23	1	-0/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'master' into i238-kovan	Dan Finlay	2017-03-23	2	-3/+5
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge branch 'master' into i1033-spinnerfix	kumavis	2017-03-23	3	-45/+74
\| \|\\| \|
\| * \| \|	Add one more loading indication.	Kevin Serrano	2017-03-23	1	-0/+1
\| \| \| \|
\| * \| \|	Uncomment lines relating to showing indicator.	Kevin Serrano	2017-03-22	1	-2/+2
\| \| \| \|
\| * \| \|	Remove redundant removal of loading indicator. Integrate loading indicator ↵	Kevin Serrano	2017-03-22	2	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disappear with display warning.
\| * \| \|	Add action to hide loading indication on an incorrect pw.	Kevin Serrano	2017-03-21	1	-2/+5
\| \| \|/ \| \|/\|
* \| \|	Add Kovan test network to our application.	Kevin Serrano	2017-03-23	1	-0/+9
\| \| \|
* \| \|	Add kovan to drop-menu-item	Kevin Serrano	2017-03-23	1	-1/+4
\| \| \|
* \| \|	Add conditional kovan to current network component.	Kevin Serrano	2017-03-23	1	-0/+12
\| \| \|
* \| \|	Add kovan conditional to config screen.	Kevin Serrano	2017-03-23	1	-0/+5
\| \| \|
* \| \|	Add conditional kovan logic to etherscan link generators.	Kevin Serrano	2017-03-23	2	-2/+7
\| \| \|
* \| \|	Modify css rule for unused hollow diamond.	Kevin Serrano	2017-03-23	1	-1/+1
\| \|/ \|/\|
* \|	Adjust private key confirmation style and logic.	Kevin Serrano	2017-03-21	3	-46/+75
\|/
*	Improve personal_sign style	Dan Finlay	2017-03-17	2	-11/+23
\| \| \| \|	textarea was not resizing the way I'd expected, so made it permanently larger, to accomodate larger messages.
*	Merge branch 'master' into i1165-predictive	Kevin Serrano	2017-03-15	4	-16/+13
\|\
\| *	Merge branch 'master' into i1211-currencyretention	Kevin Serrano	2017-03-15	1	-1/+5
\| \|\
\| * \|	Rename variables to proper currency state variables.	Kevin Serrano	2017-03-15	4	-16/+13
\| \| \|
* \| \|	Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into ↵	Kevin Serrano	2017-03-15	1	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	i1165-predictive
\| * \ \	Merge branch 'master' into i1165-predictive	kumavis	2017-03-15	1	-1/+5
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Render config screen from unlock.	Kevin Serrano	2017-03-14	1	-0/+4
\| \| \| \|
\| \| * \|	Display Custom RPC on lock screen.	Kevin Serrano	2017-03-14	1	-1/+1
\| \| \|/
* \| /	Minor change in removing opts object.	Kevin Serrano	2017-03-15	1	-4/+1
\|/ /
* \|	Add comments.	Kevin Serrano	2017-03-11	2	-0/+6
\| \|
* \|	Allow for adding recently used addresses to address book.	Kevin Serrano	2017-03-10	3	-4/+36
\| \|
* \|	Create persistence address book.	Kevin Serrano	2017-03-10	1	-0/+1
\| \|
* \|	Create distinct labels and names for addresses.	Kevin Serrano	2017-03-10	1	-1/+5
\| \|
* \|	Display owned addresses in datalist.	Kevin Serrano	2017-03-10	2	-0/+12
\|/
*	Add ENS click to copy	Dan Finlay	2017-03-09	1	-9/+8
\| \| \| \|	Also bump ethjs-ens version to get proper error for unregistered names.
*	Get basic ENS working	Dan Finlay	2017-03-09	11	-59/+188
\|\ \| \| \| \| \| \|	& merge master into ENS branch.
\| *	Add more informative message	Kevin Serrano	2017-03-09	1	-0/+6
\| \|
\| *	Fix typo, switch to log.error	Kevin Serrano	2017-03-09	1	-3/+3
\| \|
\| *	Remove unneeded setrpc method.	Kevin Serrano	2017-03-09	1	-20/+8
\| \|
\| *	Nodeify and promisify calls to background.	Kevin Serrano	2017-03-09	1	-9/+25
\| \|
\| *	Refactor of code into separate reducers and actions.	Kevin Serrano	2017-03-08	2	-21/+10
\| \|
\| *	Merge branch 'master' into i1144-moarrpc	Kevin Serrano	2017-03-08	5	-41/+93
\| \|\
\| \| *	Remove log	Dan Finlay	2017-03-07	1	-1/+0
\| \| \|
\| \| *	Render personal_sign messages as utf-8 text	Dan Finlay	2017-03-07	2	-12/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Calls to `personal_sign` are now: - When hex encoded, preserved as hex encoded, but displayed as utf-8 text. - When not hex encoded, decoded as utf-8 text as hex for signing. - The messages proposed for signing are displayed as UTF-8 text. - When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal. Fixes #1173
\| \| *	Prevent submission of invalid gas parameters.	Kevin Serrano	2017-03-02	2	-3/+26
\| \| \|
\| \| *	Various improvements to gas input.	Kevin Serrano	2017-03-02	3	-27/+22
\| \| \|
\| \| *	Only allow numbers in gas inputs	Dan Finlay	2017-03-02	1	-0/+1
\| \| \|
\| * \|	Break out rpc update and rpclist into two reducers.	Kevin Serrano	2017-03-08	3	-11/+31
\| \| \|
\| * \|	More conflict resolution.	Kevin Serrano	2017-03-02	2	-2/+10
\| \|\ \
\| \| * \	Merge branch 'master' into i1144-moarrpc	Dan Finlay	2017-02-28	10	-87/+263
\| \| \|\ \
\| \| * \| \|	Concatenate custom RPC labels that are too long	Dan Finlay	2017-02-28	1	-1/+9
\| \| \| \| \|
\| * \| \| \|	Fix merge conflicts.	Kevin Serrano	2017-03-02	14	-180/+534
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| / \| \| \| \|/ \| \| \|/\|
\| * \| \|	Tested against code to play nice with unit tests.	Kevin Serrano	2017-02-24	3	-8/+17
\| \| \| \|
\| * \| \|	Make the UI play nice with empty RPC lists.	Kevin Serrano	2017-02-23	1	-1/+1
\| \| \| \|
\| * \| \|	Linto	Kevin Serrano	2017-02-23	1	-1/+1
\| \| \| \|
\| * \| \|	Implemented functionality for displaying recent custom RPCs	Kevin Serrano	2017-02-23	2	-2/+26
\| \| \| \|
\| * \| \|	Connect to actions.	Kevin Serrano	2017-02-22	2	-0/+2
\| \| \| \|
* \| \| \|	Add ens recognition to send form input	Dan Finlay	2017-03-01	2	-5/+143
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Attempts to lookup `.eth` addresses on ENS. Is currently failing. I've written an isolation example of the problem here: https://github.com/flyswatter/ens-test
* \| \| \|	Fix loading indication for conf-tx view	Dan Finlay	2017-03-01	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	Add reset button to reset gas fields.	Kevin Serrano	2017-03-01	2	-4/+20
\| \| \|
* \| \|	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵	Dan Finlay	2017-03-01	1	-2/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	i765-gaslimits
\| * \ \	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵	Kevin Serrano	2017-03-01	2	-3/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i765-gaslimits
\| * \| \| \|	Gas and Gaslimit revert to default if set to 0	Kevin Serrano	2017-03-01	1	-2/+12
\| \| \| \| \|
* \| \| \| \|	Add a couple more debug logs	Dan Finlay	2017-03-01	1	-0/+1
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵	Dan Finlay	2017-03-01	1	-18/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i765-gaslimits
\| * \| \|	lints	Kevin Serrano	2017-03-01	1	-3/+0
\| \| \| \|
\| * \| \|	Remove advanced options for now.	Kevin Serrano	2017-03-01	1	-15/+4
\| \| \| \|
* \| \| \|	Use correct action to update and submit tx	Dan Finlay	2017-03-01	2	-3/+3
\|/ / /
* \| \|	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵	Dan Finlay	2017-03-01	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	i765-gaslimits
\| * \| \|	lint	Kevin Serrano	2017-03-01	1	-2/+4
\| \| \| \|
* \| \| \|	Linted	Dan Finlay	2017-03-01	2	-4/+2
\| \| \| \|
* \| \| \|	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵	Dan Finlay	2017-03-01	2	-4/+17
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i765-gaslimits
\| * \| \|	Hide gas options behind an advanced options checkbox.	Kevin Serrano	2017-03-01	1	-4/+16
\| \| \| \|
\| * \| \|	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵	Kevin Serrano	2017-03-01	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i765-gaslimits
\| * \ \ \	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵	Kevin Serrano	2017-03-01	2	-2/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i765-gaslimits
\| * \ \ \ \	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵	Kevin Serrano	2017-03-01	2	-30/+39
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i765-gaslimits
\| * \| \| \| \| \|	Add margins to align.	Kevin Serrano	2017-03-01	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove gasMultiplier txMeta param	Dan Finlay	2017-03-01	3	-84/+7
\| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter.
* \| \| \| \| \|	Fix bug that showed conf-tx screen on boot at wrong times	Dan Finlay	2017-03-01	1	-1/+1
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Fixed bug that made send screen sometimes transition to account detail	Dan Finlay	2017-03-01	2	-2/+3
\| \|/ / / \|/\| \| \|
* \| \| \|	Fix infinite loop bug	Dan Finlay	2017-03-01	2	-30/+39
\|/ / /
* \| \|	Fix reference	Dan Finlay	2017-03-01	1	-1/+1
\| \| \|
* \| \|	Reorder rows for better table logic	Dan Finlay	2017-02-28	1	-32/+37
\| \| \|
* \| \|	Emit updated tx values on accept click	Dan Finlay	2017-02-28	2	-1/+20
\| \| \|
* \| \|	Remove unused function	Dan Finlay	2017-02-28	1	-5/+0
\| \| \|
* \| \|	Add action for updating and approving a tx in one action	Dan Finlay	2017-02-28	1	-0/+15
\| \| \|
* \| \|	Got gas live re-estimating	Dan Finlay	2017-02-28	2	-20/+23
\| \| \|
* \| \|	Align input fields for gas.	Kevin Serrano	2017-02-28	1	-0/+1
\| \| \|
* \| \|	Fix merge conflicts.	Kevin Serrano	2017-02-28	2	-8/+68
\|\ \ \
\| * \| \|	Linted	Dan Finlay	2017-02-28	2	-12/+6
\| \| \| \|
\| * \| \|	Add non-working gas recalculating logic to tx-details view	Dan Finlay	2017-02-28	1	-6/+69
\| \| \| \|
* \| \| \|	Further styling to get hex component working. Fix some typos.	Kevin Serrano	2017-02-28	3	-16/+44
\|/ / /
* \| \|	Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵	Kevin Serrano	2017-02-28	10	-73/+249
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	i765-gaslimits
\| * \ \	Merge branch 'master' into i765-gaslimits	Dan Finlay	2017-02-28	10	-73/+249
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Improve pending tx blue dot style	Dan Finlay	2017-02-24	2	-9/+4
\| \| \| \|
\| \| * \|	Fix cancel msg signing behavior.	Dan Finlay	2017-02-24	4	-13/+20
\| \| \| \|
\| \| * \|	Make personal sign view look nice	Dan Finlay	2017-02-24	1	-5/+16
\| \| \| \|
\| \| * \|	Got personal_sign working	Dan Finlay	2017-02-24	8	-48/+133
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also fixed bug where signing would not close popup.
\| \| * \|	Add alternate UI for pending personal_sign messages	Dan Finlay	2017-02-24	2	-14/+12
\| \| \| \|
\| \| * \|	Add personal sign actions and template	Dan Finlay	2017-02-23	4	-26/+106
\| \| \|/
* \| /	Move input boxes into table and into details component.	Kevin Serrano	2017-02-28	3	-17/+39
\|/ /
* \|	Make gasPrice accessible to the UI.	Kevin Serrano	2017-02-25	1	-2/+1
\| \|
* \|	Merge github.com:MetaMask/metamask-plugin into i765-gaslimits	Kevin Serrano	2017-02-24	5	-3/+46
\|\\|
\| *	Fix UI Dev Mode for Tx Approval	Dan Finlay	2017-02-21	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The state object had been changed, but our mock states for tx approval were using the old keys. Rather than try to muck about and figure out each and every change, I've re-generated a UI dev state for tx approval, which should help @zanibas on his current project. We can continue adding new dev states as needed from here. If anyone catches a state that doesn't render correctly, it's worth checking if a new snapshot doesn't solve things. Debugged by adding new debugging loggers, and I've left them in place for easier future debugging.
\| *	Merge branch 'master' into i1128-noticesdev	Dan Finlay	2017-02-21	2	-0/+24
\| \|\
\| \| *	Set default log levels	Dan Finlay	2017-02-21	1	-0/+1
\| \| \|
\| \| *	Add debug logging to ui routing logic.	Dan Finlay	2017-02-21	2	-0/+23
\| \| \|
\| * \|	Notices must be scrolled down to proceed from.	Kevin Serrano	2017-02-21	1	-0/+9
\| \| \|
\| * \|	Fix typo.	Kevin Serrano	2017-02-21	1	-2/+2
\| \| \|
\| * \|	Re-enable notices on dev.	Kevin Serrano	2017-02-21	1	-1/+1
\| \|/
* \|	Broke hex decimal input into its own component	Dan Finlay	2017-02-18	3	-25/+71
\| \| \| \| \| \| \| \|	Also added a new state to try to make UI dev mode work again, but it has other issues, like #1128, that need to be addressed before UI dev mode can be used again.
* \|	Change state to props, add modifiable fields.	Kevin Serrano	2017-02-18	2	-28/+54
\|/
*	Merge branch 'master' into i1089-networkfront	Kevin Serrano	2017-02-16	1	-0/+9
\|\
\| *	Revert old style message sighing	Frankie	2017-02-10	1	-0/+9
\| \|
* \|	Remove custom RPC option when on lock screen.	Kevin Serrano	2017-02-16	1	-1/+1
\| \|
* \|	Change networks from lock screen.	Kevin Serrano	2017-02-16	2	-7/+7
\| \|
* \|	fix debug	Kevin Serrano	2017-02-10	1	-1/+1
\| \|
* \|	Prevent notices from opening in test and debug mode.	Kevin Serrano	2017-02-10	1	-1/+1
\| \|
* \|	Delete all code related to disclaimers.	Kevin Serrano	2017-02-10	4	-155/+13
\|/
*	Remove egregious alert	Dan Finlay	2017-02-07	1	-1/+0
\|
*	Mostly got shapeshift tx management into its own controller	Dan Finlay	2017-02-04	1	-1/+2
\| \| \| \|	Rendering the list is still having issues, so this isn't done yet.
*	migration #9 - break out CurrencyController substate	kumavis	2017-02-03	1	-2/+6
\|
*	migration 7 - break off TransactionManager substate	kumavis	2017-02-03	1	-0/+30
\|
*	actions - dont expect background to provide newState, manually update	kumavis	2017-02-03	1	-12/+27
\|
*	Merge branch 'dev' into messageManagerCleanUp	Frankie	2017-02-02	1	-1/+1
\|\
\| *	default a return of an empty array	Frankie	2017-02-02	1	-1/+1
\| \|
\| *	linting	Frankie	2017-02-02	1	-1/+1
\| \|
\| *	fix transactions not showing up in history	Frankie	2017-02-02	1	-1/+1
\| \|
* \|	Merge branch 'dev' into messageManagerCleanUp	Frankie	2017-02-02	13	-39/+22
\|\\|
\| *	rename selectedAccount to selectedAddress	kumavis	2017-01-31	13	-39/+22
\| \|
* \|	code clan up and tests	Frankie	2017-02-02	1	-3/+3
\| \|
* \|	Merge branch 'dev' into messageManagerCleanUp	Frankie	2017-01-29	3	-5/+6
\|\\|
\| *	migration 5 - move keyring controller state to substate	kumavis	2017-01-29	3	-5/+6
\| \|
* \|	Clean up message manger includes:	Frankie	2017-01-29	13	-49/+52
\|/ \| \| \| \| \| \| \| \|	Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern
*	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into kumavis-refactor2	kumavis	2017-01-27	1	-2/+0
\|\
\| *	Fix ui overlap	Frankie	2017-01-27	1	-2/+0
\| \|
* \|	metamask controller - cleanup remote api	kumavis	2017-01-27	1	-2/+1
\|/
*	Merge branch 'dev' into i#1048	kumavis	2017-01-25	8	-12/+107
\|\
\| *	Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic	kumavis	2017-01-25	1	-1/+1
\| \|\ \| \| \| \| \| \|	Fix conf tx balance logic
\| \| *	fix base	Frankie	2017-01-25	1	-2/+2
\| \| \|
\| \| *	Fix issue where ConfTx view lets you approve txs when the account has ↵	Frankie	2017-01-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	insufficient balance
\| * \|	Merge pull request #1051 from MetaMask/hotfix1048	Frankie	2017-01-25	1	-2/+2
\| \|\ \ \| \| \|/ \| \|/\|	hotfix - addNewAccount - dont assume hd keyring position
\| \| *	hotfix - dont assume hd keyring position	kumavis	2017-01-25	1	-2/+2
\| \| \|
\| * \|	Merge branch 'dev' into i715-AddJsonImport	Dan Finlay	2017-01-19	1	-1/+1
\| \|\\|
\| * \|	Add ability to import v3 JSON wallets	Dan Finlay	2017-01-19	4	-5/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715
\| * \|	Implement naieve JSON file importing	Dan Finlay	2017-01-19	2	-5/+76
\| \| \| \| \| \| \| \| \| \| \| \|	Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production.
\| * \|	Added new modular private key import system	Dan Finlay	2017-01-19	2	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
* \| \|	background controller - extract KeyringC.placeSeedWords to MetamaskC	kumavis	2017-01-25	1	-1/+15
\| \| \|
* \| \|	Fix issue where generating a new account would put it in loose keys	Frankie	2017-01-25	1	-2/+2
\| \|/ \|/\|
* \|	Merge branch 'master' into Version-3.1.0	Dan Finlay	2017-01-19	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Merge branch 'master' into fixSignedVsSubmitted	Frankie	2017-01-19	5	-10/+11
\| \|\
\| * \|	Fix the dissplay for submitted transactions and the listner wating to hear ↵	Frankie	2017-01-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	when tx's were included in a block
* \| \|	Fix test to log out despite number of menu items	Dan Finlay	2017-01-18	1	-1/+1
\| \| \|
* \| \|	Remove outdated reference	Dan Finlay	2017-01-18	1	-4/+0
\| \| \|
* \| \|	Remove unused UI files	Dan Finlay	2017-01-18	2	-109/+0
\| \| \|
* \| \|	Allow importing of private key strings	Dan Finlay	2017-01-18	4	-8/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1021 A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string. Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
* \| \|	Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu	Dan Finlay	2017-01-18	15	-74/+368
\|\ \ \
\| * \| \|	Develop import subviews	Dan Finlay	2016-11-05	5	-17/+86
\| \| \| \|
\| * \| \|	Add import account placeholder template	Dan Finlay	2016-11-05	3	-30/+71
\| \| \| \|
\| * \| \|	Linted	Dan Finlay	2016-11-05	3	-12/+8
\| \| \| \|
\| * \| \|	Add account adding subview placeholders	Dan Finlay	2016-11-05	4	-39/+121
\| \| \| \|
\| * \| \|	Remove unused class	Dan Finlay	2016-11-05	1	-1/+1
\| \| \| \|
\| * \| \|	Convert buy subview to new tab bar component	Dan Finlay	2016-11-05	1	-36/+47
\| \| \| \|
\| * \| \|	Scaffold new account view	Dan Finlay	2016-11-05	7	-1/+125
\| \| \| \|
* \| \| \|	Add "import account" menu item + template view	Dan Finlay	2017-01-18	4	-0/+63
\| \| \| \|
* \| \| \|	Fix message signing UI rendering	Dan Finlay	2017-01-17	1	-5/+10
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	[A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004) removed logic that rendered pending messages for approval. This commit fixes that.
* \| \|	Merge branch 'master' into dev	Dan Finlay	2017-01-17	4	-8/+7
\|\ \ \
\| * \| \|	update coinbase info and view	Frankie	2017-01-11	2	-5/+5
\| \| \| \|
\| * \| \|	remove network Id 2 from explorer link and Add network Id 3	Frances Pangilinan	2016-12-21	2	-3/+2
\| \| \| \|
* \| \| \|	Dont render conf-tx if their are no txParams to show	Frankie	2017-01-15	1	-2/+4
\| \|_\|/ \|/\| \|
* \| \|	remove orphaned comment	Frankie	2017-01-14	1	-1/+0
\| \| \|
* \| \|	lint	Frankie	2017-01-14	1	-1/+1
\| \| \|
* \| \|	Clean up code	Frankie	2017-01-14	3	-33/+37
\| \| \|
* \| \|	Fix sorting and instances where something could be undefined	Frankie	2017-01-12	3	-4/+5
\| \| \|
* \| \|	Merge branch 'dev' into integrateTxManagerUI	Frankie	2017-01-12	1	-5/+4
\|\ \ \
\| * \| \|	Send update to UI when changing selected account	Dan Finlay	2017-01-12	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #981
* \| \| \|	Fix wording and icon of failed txs	Frankie	2017-01-12	1	-0/+6
\| \| \| \|
* \| \| \|	Take some of the tx Logic out of the UI and create a visble state for ↵	Frankie	2017-01-12	6	-45/+40
\|/ / / \| \| \| \| \| \| \| \| \|	pending and unaproved transactions
* \| \|	quick typo fix.	Kevin Serrano	2017-01-07	1	-2/+2
\| \| \|
* \| \|	Switch order of header and indicator.	Kevin Serrano	2017-01-06	1	-1/+1
\| \| \|
* \| \|	Linting.	Kevin Serrano	2017-01-05	2	-2/+1
\| \| \|
* \| \|	Make network somewhat more modular, add new network indicator.	Kevin Serrano	2017-01-05	4	-17/+24
\| \| \|
* \| \|	Convert more actions to new simple pattern	Dan Finlay	2017-01-04	1	-18/+2
\| \| \|
* \| \|	Restore missing line	Dan Finlay	2017-01-04	1	-0/+1
\| \| \|
* \| \|	Corrected instances of showWarning to displayWarning	Dan Finlay	2017-01-04	1	-3/+3
\| \| \|
* \| \|	Apply new pattern to repetitive functions	Dan Finlay	2017-01-04	1	-19/+2
\| \| \|
* \| \|	Update account list after adding account	Dan Finlay	2017-01-04	1	-10/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed by finally making a function generator for a pattern we use frequently, communicating to the background process. Fixes #961
* \| \|	Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager	Dan Finlay	2017-01-03	1	-2/+2
\|\ \ \
\| * \ \	Merge branch 'dev' into TxManager	Frankie	2016-12-24	4	-16/+57
\| \|\ \ \
\| * \ \ \	Merge branch 'dev' into TxManager	Frankie	2016-12-22	12	-49/+255
\| \|\ \ \ \
\| * \| \| \| \|	First pass at revision requests	Frances Pangilinan	2016-12-22	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Fix rendering of loose accounts	Dan Finlay	2016-12-24	2	-3/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Show a "LOOSE" warning on accounts not belonging to HD Seed phrase	Dan Finlay	2016-12-23	3	-7/+42
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #948 from MetaMask/RecoverLostAccounts	Dan Finlay	2016-12-23	4	-16/+57
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Auto-Recover accounts lost to BIP44 derivation fix
\| * \| \| \|	Rename function to be an action	Dan Finlay	2016-12-23	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Linted	Dan Finlay	2016-12-21	3	-5/+3
\| \| \| \| \|
\| * \| \| \|	Make notices confirmation configurable	Dan Finlay	2016-12-21	4	-13/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Confirm button will now dismiss the lost accounts array.
* \| \| \| \|	Lint.	Kevin Serrano	2016-12-21	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Validate URIs before entering them in.	Kevin Serrano	2016-12-21	1	-2/+26
\|/ / / /
* \| \| \|	Merge pull request #937 from MetaMask/i900-forgot-password-flow	Dan Finlay	2016-12-20	5	-22/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	I900 forgot password flow
\| * \| \| \|	Modify actions to support better transition.	Kevin Serrano	2016-12-20	3	-1/+18
\| \| \| \| \|
\| * \| \| \|	Lint.	Kevin Serrano	2016-12-20	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Redirect to seed word screen for forgotten passwords.	Kevin Serrano	2016-12-20	4	-20/+9
\| \| \| \| \|
* \| \| \| \|	Merged master into dev	Dan Finlay	2016-12-20	9	-25/+201
\|\ \ \ \ \ \| \|/ / / / \|/\| \| / / \| \| \|/ / \| \|/\| \|
\| * \| \|	Clean up first notice	Dan Finlay	2016-12-17	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant title from notice component. Make link color the same orange as the rest of the UI.
\| * \| \|	Add date to notices display.	Kevin Serrano	2016-12-17	1	-1/+15
\| \| \| \|
\| * \| \|	clean - code style	kumavis	2016-12-17	1	-4/+0
\| \| \| \|
\| * \| \|	Add ability to show notices to user & get confirmation.	Kevin Serrano	2016-12-17	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
\| * \| \|	Add ability to show notices to user & get confirmation.	Kevin Serrano	2016-12-17	6	-0/+187
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
\| * \| \|	Remove morden testnet provider	Dan Finlay	2016-12-16	4	-25/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instances configured to point at Morden will now point at Ropsten.
* \| \| \|	Revert "Interface enhancements"	Dan Finlay	2016-12-17	11	-54/+101
\| \| \| \|
* \| \| \|	Fixed header h1 alignment and network name	Luis Iván Cuende	2016-12-15	2	-5/+3
\| \| \| \|
* \| \| \|	Better account details view	Luis Iván Cuende	2016-12-15	5	-42/+14
\| \| \| \|
* \| \| \|	Better editable label	Luis Iván Cuende	2016-12-15	5	-40/+15
\| \| \| \|
* \| \| \|	Better buttons	Luis Iván Cuende	2016-12-14	2	-4/+9
\| \| \| \|
* \| \| \|	Beautified disclaimer	Luis Iván Cuende	2016-12-14	3	-11/+14
\| \|/ / \|/\| \|
* \| \|	Fix vault encrypting & unlocking bug	Dan Finlay	2016-12-01	2	-7/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is only a bug in dev, but was committed yesterday. Sometimes the `encrypt` method was being passed values other than the password as the encryption key, leading to un-unlockable vaults. To find this, and avoid it for all time hereafter, I added several more steps to our oft-neglected integration test suite, which now fully initializes a vault, locks it, and unlocks it again, to make sure all of those steps definitely work always.
* \| \|	Add integration tests for logging out and back in	Dan Finlay	2016-12-01	1	-1/+2
\| \| \|
* \| \|	Made integration test create a first vault	Dan Finlay	2016-12-01	1	-1/+2
\| \| \|
* \| \|	Fix tx adding code	Dan Finlay	2016-11-30	1	-25/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Broken in this commit: https://github.com/MetaMask/metamask-plugin/commit/bc39cd7b894ddf0f3724d4af3cfc30c2638e0939 Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed.
* \| \|	Merge branch 'master' into dev	Dan Finlay	2016-11-24	1	-3/+3
\|\\| \|
\| * \|	Merge branch 'master' into new-faucet	Dan Finlay	2016-11-23	1	-2/+2
\| \|\ \
\| \| * \|	Add temporary morden explorer link support	Dan Finlay	2016-11-22	1	-1/+1
\| \| \| \|