1205 Commits

Author	SHA1	Message	Date
frankiebee	3b06a29e1b	Merge branch 'master' into reloadDapp	2017-05-24 23:10:58 -04:00
frankiebee	473b88f399	Reload the page when switching networks for sites that use web3	2017-05-24 23:00:58 -04:00
Dan Finlay	764806d211	Merge pull request #1494 from MetaMask/1472-gasceiling ... Add Max GasLimit Ceiling	2017-05-24 16:36:00 -07:00
Kevin Serrano	26fd016b63	Add new blockGasLimit property to txMeta object.	2017-05-24 16:17:03 -07:00
kumavis	e6b278569e	inpage-provider - disable polling after first block	2017-05-24 11:34:26 -07:00
kumavis	664fc07800	Merge pull request #1487 from MetaMask/stopPolling ... Stop polling	2017-05-24 09:14:30 -07:00
frankiebee	db982cf795	stop polling when switching networks	2017-05-24 11:52:18 -04:00
kumavis	6be1aa82c0	Merge branch 'master' into Version-3.7.1	2017-05-24 00:18:40 -07:00
Dan Finlay	e55329d28b	Version 3.7.1	2017-05-24 00:15:59 -07:00
Frankie	97ea7454b3	Merge branch 'master' into networkController	2017-05-23 20:36:11 -04:00
frankiebee	c5d74e6421	include ethQuery in txController	2017-05-23 20:06:19 -04:00
frankiebee	243eeff7cb	Fix for tests	2017-05-23 19:49:57 -04:00
Dan Finlay	17604f1ef5	Version 3.7.0	2017-05-23 14:49:45 -07:00
Dan Finlay	e4d09aebf4	Cleanup	2017-05-23 14:49:10 -07:00
Dan Finlay	cd2ad1733d	Continually resubmit pending txs	2017-05-23 12:22:15 -07:00
frankiebee	529304c005	Wrap the provider in a proxy	2017-05-23 01:56:10 -04:00
frankiebee	e08c1541e5	Add a migration for the network controller	2017-05-23 01:55:20 -04:00
frankiebee	13a41f3129	Merge branch 'master' into networkController	2017-05-22 19:48:10 -04:00
kumavis	b217ad1ae8	clean - remove console logs	2017-05-22 16:06:22 -07:00
kumavis	1c1400b584	deps - use stream-subprovider from provider-engine	2017-05-22 15:59:07 -07:00
Dan Finlay	cbfaa6f56f	Rename stream to streamSubprovider	2017-05-22 15:41:13 -07:00
Dan Finlay	48d9a21071	Use filter subprovider in-page to avoid filter leaks	2017-05-22 15:23:29 -07:00
Dan Finlay	709c0eb307	Use stream-provider v3 api	2017-05-22 15:21:25 -07:00
Dan Finlay	c5432da567	Add new streaming subprovider but getting a loop ... Regarding #1458 Uses a new streaming subprovider architecture on an experimental branch of StreamProvider: https://github.com/flyswatter/web3-stream-provider/tree/StreamSubprovider	2017-05-20 20:38:38 -07:00
frankiebee	f87ea49b5a	Create a network controller to manage switcing networks an updating the provider	2017-05-19 00:14:10 +02:00
Dan Finlay	2a25f99461	Version 3.6.5	2017-05-17 14:36:50 -07:00
Dan Finlay	68d6ea44a0	Fix path references	2017-05-16 11:39:00 -07:00
Dan Finlay	2df9344be5	Rename tx manager to tx controller	2017-05-16 10:35:28 -07:00
kumavis	28aba6e9de	migration 13 - change provider from testnet to ropsten	2017-05-15 23:56:13 -07:00
Thomas Huang	3367363b12	Remove all traces of testnet	2017-05-15 19:11:16 -07:00
Thomas Huang	62ee038889	Merge branch 'master' into i1419-rinkebydefaultnetwork	2017-05-15 18:06:48 -07:00
Thomas Huang	4c10e2021a	Change default network to rinkeby	2017-05-15 18:05:11 -07:00
Dan Finlay	fe3e943169	Merge pull request #1422 from MetaMask/drop-asyncq ... background - drop async-q in favor of async/await	2017-05-15 15:35:19 -07:00
kumavis	5c9449dec1	background - drop async-q in favor of async/await	2017-05-12 13:09:23 -07:00
kumavis	2c8bbe3b25	migrator - fix typo	2017-05-12 12:27:40 -07:00
kumavis	092807f56e	Merge branch 'master' of github.com:MetaMask/metamask-plugin into fixMigrator2	2017-05-12 12:25:21 -07:00
kumavis	70a328e028	migrator - cleaner migration runner with es7	2017-05-11 18:15:59 -07:00
frankiebee	6c01b26845	use asyncQ.waterfall instead of asyncQ.eachSeries	2017-05-11 23:25:33 +02:00
Kevin Serrano	73e1cd2317	Trim currency list.	2017-05-11 12:30:39 -07:00
frankiebee	1772d34e94	fix migrator	2017-05-11 10:10:50 +02:00
Dan Finlay	3ed7205b75	Version 3.6.4	2017-05-09 17:08:33 -07:00
Dan Finlay	ff1a1284cc	Version 3.6.3	2017-05-08 22:05:38 -07:00
Dan Finlay	662a646fa9	Version 3.6.2	2017-05-08 16:20:37 -07:00
kumavis	68be86abe9	ui - remove web3, use eth-query	2017-05-08 12:29:08 -07:00
kumavis	fb08c4a131	metamask - publicConfig - fix init state	2017-05-04 17:56:30 -07:00
kumavis	10ba760ed3	metamask - selected accounts - dont reveal when locked	2017-05-04 17:50:59 -07:00
Kevin Serrano	833b9f183f	Minor lint	2017-05-03 07:22:36 -07:00
Dan Finlay	7ddbd1a193	Version 3.6.1	2017-04-30 12:39:17 -07:00
Dan Finlay	a3149c1752	Use loglevel for more logs	2017-04-30 12:38:38 -07:00
kumavis	6ace0c9afb	notification-manager - remove promise listener ... seems chrome changed their API? MDN suggests that a Promise should be returned but getting `undefined` https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/windows/create Chrome docs suggest its a callback API lolwut https://developer.chrome.com/extensions/windows#method-create	2017-04-28 16:04:00 -07:00
Dan Finlay	6d1fe7845c	Version 3.6.0 ... t # Explicit paths specified without -i or -o; assuming --only paths...	2017-04-27 15:11:14 -07:00
Dan Finlay	a9a39bdf8f	Merge branch 'master' into Version-3.5.4	2017-04-27 15:10:16 -07:00
Dan Finlay	d1a1069180	Merge branch 'master' into rinkeby	2017-04-27 14:50:19 -07:00
Thomas Huang	6bdb4c8728	Fix linting warnings	2017-04-26 21:05:45 -07:00
Kevin Serrano	242dc1e99f	Add missing changes. Create unique style for rinkeby icon.	2017-04-25 14:39:01 -07:00
Nickyg	e9aa37b699	add rinkeby network	2017-04-26 01:40:33 +05:30
Dan Finlay	f1beb0720a	Version 3.5.4	2017-04-25 10:59:43 -07:00
Dan Finlay	c3746e62ec	Version 3.5.3	2017-04-24 13:58:46 -07:00
Dan Finlay	d05d9a5f57	Add missing tx manager state	2017-04-24 13:55:33 -07:00
kumavis	9b9570fd2b	auto-faucet - only skip faucet on explicit test environment	2017-04-04 18:48:33 -07:00
kumavis	5a91adf7d8	add platforms to mascara + move buyEther window open to ui	2017-04-04 18:23:46 -07:00
kumavis	5d967eeebb	Merge pull request #1307 from MetaMask/mascara ... Proof of Concept: Mascara	2017-04-04 11:27:45 -07:00
kumavis	4779999bfc	clean - metamask controller - remove log	2017-04-04 11:13:07 -07:00
Kevin Serrano	39181ed33f	Merge pull request #1308 from MetaMask/FixFaucet ... Fix faucet to only autoFaucet first account	2017-04-04 09:43:25 -07:00
frankiebee	0a7b388b39	Fix faucet to only autoFaucet first account	2017-04-04 18:38:56 +02:00
frankiebee	f80d1ce3e6	Switch auto-faucet from XMLHttpRequest to fetch	2017-04-04 14:55:48 +02:00
frankiebee	f81fdbc34f	Merge branch 'master' into mascara	2017-04-02 23:04:55 -07:00
frankiebee	89c924101e	Merge branch 'master' into mascara	2017-04-02 22:26:25 -07:00
kumavis	86e882c51a	notification-manager - rename show -> showPoup + make getPopup private	2017-03-31 18:41:51 -07:00
kumavis	aa06183c64	ui - use global.platform for extension interaction	2017-03-31 18:04:13 -07:00
kumavis	810f5881f6	Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform	2017-03-31 17:57:47 -07:00
kumavis	60a48e713f	ui - move popup auto-close after tx conf to ui entrypoint	2017-03-31 13:32:47 -07:00
kumavis	49d8877fd7	ui - startPopup returns store after boot	2017-03-31 13:20:16 -07:00
kumavis	6259ffaef4	extension - remove local extension files, we use extensionizer	2017-03-30 18:35:22 -07:00
kumavis	5036263f88	introduce platform api and rename notifications to notification-manager	2017-03-30 18:33:19 -07:00
kumavis	be88c87b25	extension - prefer extensionizer module	2017-03-30 18:30:24 -07:00
kumavis	1dce352523	tx-manager - add eip155 support	2017-03-30 14:23:23 -07:00
frankiebee	29a602a89b	Clean up	2017-03-30 11:28:22 -07:00
Kevin Serrano	738201e8e5	Merge pull request #1288 from MetaMask/i1285-FixFirefoxCurrencyChecks ... Fix currency checking for firefox	2017-03-30 09:31:15 -04:00
Kevin Serrano	9a6b84644a	Merge pull request #1293 from MetaMask/ImproveGasEstimates ... tx-utils - gas buffer ceiling at 90% of block gas limit	2017-03-30 09:25:28 -04:00
kumavis	ff49e5e5cf	tx-utils - gas buffer ceiling at 90% of block gas limit	2017-03-29 23:21:31 -07:00
Dan Finlay	8ade8bdf32	Fix currency checking for firefox ... By adding cryptonator to our permitted CORS hosts. Fixes #1285. Will probably trigger additional permissions requests to our users.	2017-03-29 13:35:51 -07:00
frankiebee	84b3415b44	WIP: lost enital call from dapp to getAccounts	2017-03-29 10:53:43 -07:00
Dan Finlay	98dd684524	Linted	2017-03-29 10:42:43 -07:00
Dan Finlay	610ec2bdf5	Fix popup behavior for Firefox ... Firefox does not support the `focused` parameter when opening a new window, and we don't actually require it for Chrome either, new popups are at the foreground by default already.	2017-03-29 10:40:57 -07:00
Kevin Serrano	576fb26c15	Add missing migration.	2017-03-29 11:08:15 -04:00
frankiebee	a20a237282	Merge branch 'master' into mascara	2017-03-28 18:02:39 -07:00
Dan Finlay	3b6b06db92	Version 2.5.2	2017-03-28 15:01:01 -07:00
Dan Finlay	7b9ac18557	Merge pull request #1268 from MetaMask/kovan-faucet-instructions ... Add Kovan faucet instructions	2017-03-28 14:56:02 -07:00
Dan Finlay	f2587b7e80	Merge pull request #1273 from MetaMask/i1267-seedfix ... Assure that seed words are placed into state tree upon request.	2017-03-28 14:54:04 -07:00
Dan Finlay	a3e08d779e	Merge branch 'master' into kovan-faucet-instructions	2017-03-28 14:50:55 -07:00
kumavis	0f1ea5861f	Merge pull request #1276 from MetaMask/ImproveGasEstimates ... Improve UI gas calculation logic	2017-03-28 14:48:03 -07:00
kumavis	6310a05dae	tx manager - emit update on new unapproved tx	2017-03-28 14:39:29 -07:00
kumavis	e864623d3c	tx manager - add eth-query	2017-03-28 13:56:35 -07:00
kumavis	1495240969	tx manager - adjust new tx flow and txMeta decorations	2017-03-28 13:35:27 -07:00
Dan Finlay	81d3658343	Improve UI gas calculation logic ... - Now striping hex prefixed gas values, which may have been causing mis-estimation. - Unified calculation logic to be entirely functional. - Greatly simplified how the pending-tx form keeps updated form state. Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value.	2017-03-28 11:52:15 -07:00
Kevin Serrano	0625b4a110	Fix injection logic.	2017-03-28 14:30:39 -04:00
Kevin Serrano	a95d96d507	Assure that seed words are placed into state tree upon request.	2017-03-28 11:23:25 -04:00
Dan Finlay	ec9f73ed91	Merge branch 'master' into master	2017-03-27 16:15:40 -07:00
Kevin Serrano	67892c49a6	Merge branch 'master' into kovan-faucet-instructions	2017-03-27 16:45:04 -04:00
Dan Finlay	d41c8ef598	Version 3.5.1	2017-03-27 13:39:19 -07:00
Kevin Serrano	c1136a6317	Add link to kovan faucet instructions.	2017-03-27 16:05:21 -04:00
Dan Finlay	d9c2f4f5e8	Version 3.5.0	2017-03-27 11:48:10 -07:00
Stefaan Ponnet	0faddb2ed2	Allow injection in IFrames + dynamic IFrames	2017-03-26 13:57:44 +02:00
Kevin Serrano	30e8d25013	Merge branch 'master' into i1210-txdisappearance	2017-03-24 17:13:57 -04:00
Dan Finlay	3a888ede2a	Merge branch 'master' into notice-modification	2017-03-24 13:56:30 -07:00
frankiebee	8e30acb41a	Merge branch 'master' into mascara	2017-03-23 15:44:29 -07:00
Dan Finlay	2cab2f767c	Remove gas limit param ... Fixes #1256 by removing redundant param.	2017-03-23 13:56:32 -07:00
frankiebee	197e6e0b77	WIP: indexdb is at an err state "provider is undefined"	2017-03-23 11:41:32 -07:00
frankiebee	45ab81fb45	WIP: streams->indexdb	2017-03-23 11:06:38 -07:00
Kevin Serrano	fa0bbd66b6	Fix persistence of transactions between networks.	2017-03-23 11:28:06 -04:00
Kevin Serrano	16c76d5229	Create migration to erase body in read notices.	2017-03-23 10:15:59 -04:00
Kevin Serrano	bcaf0864c1	Remove notice body after reading.	2017-03-23 09:58:57 -04:00
Dan Finlay	af9d782363	Merge branch 'master' into i238-kovan	2017-03-22 15:55:01 -07:00
Kevin Serrano	16bdfd3d6e	Merge branch 'master' into i238-kovan	2017-03-22 15:41:38 -07:00
Kevin Serrano	2687b8604b	Merge branch 'master' into i1237-xmlfix2	2017-03-22 15:39:30 -07:00
Kevin Serrano	1b7326048d	Add current block number and hash to the state.	2017-03-22 16:41:19 -04:00
Kevin Serrano	33dd7954a7	Add kovan config settings to config manager.	2017-03-22 16:00:50 -04:00
Kevin Serrano	c5f96be98d	Add kovan to config file.	2017-03-22 15:59:46 -04:00
Kevin Serrano	b5b88392b9	Merge branch 'master' into i1237-xmlfix2	2017-03-22 11:33:56 -07:00
Kevin Serrano	9906da86a4	Modify logic for injection conditions.	2017-03-22 14:25:56 -04:00
frankiebee	8c7be43403	Have better error messages	2017-03-22 09:48:41 -07:00
Dan Finlay	b6e2eaf7b1	Remove eth-lightwallet	2017-03-16 11:16:03 -07:00
Frankie	57d1a1f186	Merge branch 'master' into i#1203MainNetSwitch	2017-03-16 11:00:12 -07:00
Kevin Serrano	a186e40d17	Merge branch 'master' into i1165-predictive	2017-03-14 17:52:03 -07:00
kumavis	53efc53a40	Merge branch 'master' into i#1203MainNetSwitch	2017-03-14 17:26:06 -07:00
Kevin Serrano	37ffcfcf0e	Rename variables to proper currency state variables.	2017-03-14 17:06:16 -07:00
Kevin Serrano	177f2dc948	Fix description of some migrations.	2017-03-14 17:05:47 -07:00
frankiebee	f6e551ef5f	Swithch the default network to mainnet	2017-03-13 21:14:19 -07:00
Kevin Serrano	4933e2e2ee	Limit the number of addresses stored in our book.	2017-03-13 16:37:53 -07:00
Kevin Serrano	7dcab52a9e	Connect keyring controller to address book to prevent additional duplicates.	2017-03-10 10:34:46 -08:00
Kevin Serrano	7182a2be43	Improve duplicate checking in address book.	2017-03-10 10:05:10 -08:00
Kevin Serrano	2ab86b001d	Add comments.	2017-03-10 09:34:13 -08:00
Kevin Serrano	b34ee4daa1	Allow for adding recently used addresses to address book.	2017-03-09 15:10:27 -08:00
Kevin Serrano	b296640f1b	Rename functions for consistency.	2017-03-09 15:09:50 -08:00
Kevin Serrano	9f6c040554	Create persistence address book.	2017-03-09 13:58:42 -08:00
Kevin Serrano	d270cbc9d2	Create distinct labels and names for addresses.	2017-03-09 13:07:38 -08:00
Dan Finlay	05346ec3c3	Version 3.4.0	2017-03-08 13:38:55 -08:00
Kevin Serrano	acc9a2a9d0	Modify message.	2017-03-08 10:53:11 -08:00
Kevin Serrano	6f980cfe10	Add more informative message	2017-03-08 10:46:17 -08:00
Kevin Serrano	b0280dc162	Merge branch 'master' into i1065-removealert	2017-03-08 10:22:08 -08:00
Dan Finlay	67c3126e63	Merge branch 'master' into kumavis-patch-1	2017-03-08 10:16:50 -08:00
Kevin Serrano	529eb25ced	Convert alert to a log.error	2017-03-08 10:13:45 -08:00
Kevin Serrano	86f71d504c	Merge branch 'master' into i1144-moarrpc	2017-03-08 09:28:36 -08:00
Kevin Serrano	cf2268c3d2	Nodeify and promisify calls to background.	2017-03-08 09:06:41 -08:00
kumavis	92b8443824	tx-utils - add encoding utils	2017-03-07 22:51:39 -08:00
kumavis	c063fab993	tx-utils - stricter naming type-based convention	2017-03-07 22:47:35 -08:00
kumavis	17b805c76e	tx-utils - clean and comment	2017-03-07 22:18:14 -08:00
Dan Finlay	0889309bf3	Merge branch 'master' into i1118-IncreaseGasBuffer	2017-03-07 21:30:43 -08:00
jaredpereira	52ee007fcb	Merge branch 'master' into i1118-IncreaseGasBuffer	2017-03-07 22:55:56 -05:00
Jared Pereira	4916331c53	change BN.mul to BN.muln	2017-03-07 22:42:16 -05:00
frankiebee	2f7a95c257	Fix grammar in erro message	2017-03-07 18:56:38 -08:00
frankiebee	af5ad218e2	Merge branch 'master' into i#1032	2017-03-07 17:59:21 -08:00
frankiebee	3e8b584c98	fix issue where account import allows for duplicates	2017-03-07 17:59:03 -08:00
Jared Pereira	4256e631a6	remove constant buffer and add multiplier	2017-03-07 19:57:57 -05:00
Kevin Serrano	e7e024bcdd	Refactor of code into separate reducers and actions.	2017-03-07 16:01:51 -08:00
Kevin Serrano	08ca7dac5a	Merge branch 'master' into i1144-moarrpc	2017-03-07 10:37:31 -08:00
Dan Finlay	51aa95a65c	Merge branch 'master' into i1173-ShowPersonalMessage	2017-03-06 16:34:24 -08:00
Dan Finlay	e66e755766	Fix normalizeMsgData function to always return hex prefixed	2017-03-06 16:33:33 -08:00
Frankie	b84f1b0532	Fix issue where old txMeta object was being used to pass the txHash to the cb	2017-03-06 15:41:11 -08:00
Dan Finlay	9bd8c5f723	Render personal_sign messages as utf-8 text ... 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	2017-03-06 15:04:11 -08:00
Kevin Serrano	e66035254f	More conflict resolution.	2017-03-01 10:04:25 -08:00
Kevin Serrano	0a3849ec84	Fix merge conflicts.	2017-03-01 10:01:21 -08:00
Dan Finlay	ddc136a7c2	Add a couple more debug logs	2017-02-28 15:41:20 -08:00
Dan Finlay	f908aaafbc	Use correct action to update and submit tx	2017-02-28 14:45:21 -08:00
Dan Finlay	e07e4b7bc7	Linted	2017-02-28 14:13:58 -08:00
Dan Finlay	da88481560	Remove gasMultiplier txMeta param ... 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.	2017-02-28 14:08:00 -08:00
Dan Finlay	2e16e1eb94	Fixed bug that made send screen sometimes transition to account detail	2017-02-28 12:00:07 -08:00
Dan Finlay	1eb4a5d62c	Add background method for updating and approving a tx in one call	2017-02-27 18:25:46 -08:00
Dan Finlay	462c7ae213	Merge branch 'master' into i765-gaslimits	2017-02-27 12:59:19 -08:00
Dan Finlay	b5d03cd524	add controllers to root scripts folder	2017-02-27 10:40:37 -08:00
Dan Finlay	5edb3db969	Merge branch 'master' into i1144-moarrpc	2017-02-27 10:36:48 -08:00
Dan Finlay	8c66260bdb	Removed redundant personal_recover logic	2017-02-24 17:07:54 -08:00
Dan Finlay	f2851402f3	Mostly fix personal_recover	2017-02-24 16:36:29 -08:00
Kevin Serrano	dfc89d6c6d	Make gasPrice accessible to the UI.	2017-02-24 15:06:55 -08:00
Dan Finlay	961a83769b	Fix cancel msg signing behavior.	2017-02-23 16:02:58 -08:00
Dan Finlay	4697aca02c	Got personal_sign working ... Also fixed bug where signing would not close popup.	2017-02-23 14:23:45 -08:00
Kevin Serrano	62854398f1	Tested against code to play nice with unit tests.	2017-02-23 13:56:58 -08:00
Dan Finlay	7ec25526b7	Add alternate UI for pending personal_sign messages	2017-02-23 11:18:49 -08:00
Dan Finlay	564f920ae0	Add personal sign actions and template	2017-02-22 16:30:09 -08:00
Kevin Serrano	7a0ce31bd3	Implemented functionality for displaying recent custom RPCs	2017-02-22 15:12:56 -08:00
Dan Finlay	8684fc40c7	Allow provider to init before keyringController	2017-02-21 14:41:55 -08:00
Dan Finlay	6c0916c28d	Fix reference	2017-02-21 14:37:01 -08:00
Dan Finlay	92fb07999a	Point metamask-controller personalSignRecover method to keyring-controller	2017-02-21 14:32:35 -08:00
Dan Finlay	0584988688	Move sigUtil and keyrings to external modules ... These external modules now have their own test coverage and build enforcement. This allowed me to somewhat more easily add good tests around our personalSign strategy (held now in [eth-sig-util](https://github.com/flyswatter/eth-sig-util), and allow each of the keyrings to import that, etc.	2017-02-21 14:25:47 -08:00
Kevin Serrano	026e0e3383	Fix naming	2017-02-21 12:51:46 -08:00
Kevin Serrano	db48f8984f	Basic infrasture for RPC list added.	2017-02-21 12:32:13 -08:00
Dan Finlay	04e80d36be	Version 3.3.0	2017-02-20 14:46:55 -08:00
Dan Finlay	48ab446436	Add memstore update after adding new keyring	2017-02-15 16:25:47 -08:00
kumavis	943bcec0d7	keyring controller - update memStore after restoreKeyring	2017-02-15 16:04:40 -08:00
Dan Finlay	352bb5cb39	Merge branch 'master' into dev	2017-02-15 15:49:04 -08:00
Kevin Serrano	75f7c1244a	Made migrations non-destructive; fixed currency migration.	2017-02-15 11:14:53 -08:00
Kevin Serrano	cd75d86187	Add migrations for removing terms of use data.	2017-02-14 13:21:00 -08:00
Dan Finlay	f2486fbdd3	got hash test passing	2017-02-13 21:25:02 -08:00
Kevin Serrano	f9601ac2dd	Merge branch 'dev' into disclaimer-notify	2017-02-09 19:04:17 -08:00
kumavis	d1a6b8c8ed	Merge branch 'dev' into i1085-synchronousnet	2017-02-09 18:41:01 -08:00
Dan Finlay	26ae3d206f	Version 3.2.2	2017-02-09 18:21:11 -08:00
Kevin Serrano	65c84ac4b2	Delete all code related to disclaimers.	2017-02-09 18:17:50 -08:00
Kevin Serrano	1d0fcf129c	Fix bugs with notice. Add disclaimer notice.	2017-02-09 17:47:51 -08:00
Frankie	de6455151e	Revert old style message sighing	2017-02-09 17:32:49 -08:00