Commit Graph

1556 Commits

Author SHA1 Message Date
Dan Finlay 6d4c685636 Merge pull request #736 from MetaMask/i735-xmlfix
Prevent injections on XML
2016-10-17 10:31:15 -07:00
Kevin Serrano bc6092e111
Merge branch 'master' into i735-xmlfix 2016-10-17 10:25:00 -07:00
kumavis 11c114599c Merge pull request #720 from MetaMask/i#495CustomGasField
add a gasPrice field
2016-10-16 12:54:23 -07:00
Kevin Serrano 0d495372da
Lint. 2016-10-15 15:41:24 -07:00
Kevin Serrano 91a8977d27
Bump changelog. 2016-10-15 15:33:55 -07:00
Kevin Serrano 8a5eacd35f
Prevent XML from web3 injections. 2016-10-15 15:33:49 -07:00
Frankie 35232c5e29 Fix for linting 2016-10-13 18:08:15 -07:00
Frankie aace26c4bd Create callback and Clean-up details 2016-10-13 16:53:32 -07:00
Frankie 328f8b0cac fix spelling 2016-10-13 16:22:45 -07:00
Frankie 67eba9f542 Specify base 10 in bignumber 2016-10-13 16:04:23 -07:00
Frankie b200f74d5f Merge branch 'master' into i#495CustomGasField 2016-10-13 15:17:30 -07:00
Frankie c400f7c0f6 Fix gasPrice range 2016-10-13 15:10:29 -07:00
kumavis 8d5b2478e3 Merge pull request #730 from MetaMask/i695-dapp-reload
dapp reload - fixed disconnect detection via polling
2016-10-12 13:52:32 -07:00
kumavis 465cff78c3 Merge branch 'master' into i695-dapp-reload 2016-10-12 13:49:18 -07:00
Kevin Serrano f68673e84a Merge pull request #733 from MetaMask/tos-fix
Fix misnamed variable.
2016-10-12 13:08:37 -07:00
Kevin Serrano d750daed5c
Remove logs. 2016-10-12 13:05:15 -07:00
Kevin Serrano 3954ed2a7e
Fix misnamed variable. 2016-10-12 13:04:21 -07:00
kumavis 88a68f732e Merge branch 'master' into i695-dapp-reload 2016-10-12 13:03:15 -07:00
kumavis a1c3c944cf dapp reload - fixed disconnect detection via polling 2016-10-12 12:35:55 -07:00
Frankie 229d95956b Merge branch 'master' into i#495CustomGasField 2016-10-11 16:19:13 -07:00
Frankie d67a5031c7 Merge pull request #723 from MetaMask/i721-ScrollAccountList
I721 scroll account list
2016-10-11 16:18:37 -07:00
Dan Finlay 5d01d50c16 Merge branch 'master' into i721-ScrollAccountList 2016-10-11 16:13:53 -07:00
Dan Finlay bbaf79f576 Merge pull request #702 from MetaMask/tos
Terms of Service UI Update
2016-10-11 16:13:21 -07:00
Kevin Serrano 39f2118d31
Remove logs. 2016-10-11 16:03:52 -07:00
Dan Finlay e1ece0f0e3 Bump changelog 2016-10-11 16:00:31 -07:00
Dan Finlay 1dc2612f8e Remove flex class from account list container 2016-10-11 15:59:55 -07:00
Dan Finlay 06910025ff Add more accounts to account list ui state 2016-10-11 15:59:39 -07:00
Kevin Serrano 5c0c370fe4
Remove comments. 2016-10-11 15:52:44 -07:00
Kevin Serrano 9d267907ee
Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tos 2016-10-11 15:51:26 -07:00
Kevin Serrano 5e9bc31c58
Cleanup. 2016-10-11 15:50:02 -07:00
Dan Finlay 5c9476e57d Fix bug where new vaults had no nicknames 2016-10-11 15:29:12 -07:00
Kevin Serrano f7361d9654
lint 2016-10-11 14:49:24 -07:00
Kevin Serrano 79a99ac93b
Move tos hash comparison logic from background to mm controller. 2016-10-11 14:33:30 -07:00
Kevin Serrano 26bd4b25ef
Remove version from terms of service. 2016-10-11 14:33:05 -07:00
Kevin Serrano ed03b89e26
Move tos hash logic to build phase. Create dynamic global variables based on build. 2016-10-11 14:32:03 -07:00
Frankie 97970e803d Add to CHANGELOG 2016-10-10 18:19:45 -07:00
Frankie 3a610f2c06 Merge branch 'master' into i#495CustomGasField 2016-10-10 18:18:07 -07:00
Frankie e1b78da3e6 Add custom gas field to send page 2016-10-10 18:17:56 -07:00
Kevin Serrano 89780bd22a
Modify changelog. 2016-10-07 02:11:14 -07:00
Kevin Serrano 0ecf364c5b
Prevent back/login buttons from appearing on the terms of service. 2016-10-07 02:11:03 -07:00
Kevin Serrano 21d1959435
Fix linting and guarantees set TOS hash. 2016-10-07 01:54:12 -07:00
Kevin Serrano e4f2cd2e09
Fix retention of terms of service hash across reloads of plugin. 2016-10-07 01:42:13 -07:00
Kevin Serrano 7c5ebb6a53
Renamed variables to make more sense. 2016-10-07 01:41:27 -07:00
Kevin Serrano d200ef4a10
Add missing path require statement. 2016-10-07 01:14:25 -07:00
Kevin Serrano 6a1a85ffdd
Merge branch 'tos' into tosplusupdatecheck 2016-10-07 00:11:00 -07:00
Kevin Serrano 4b3f374638
Merge branch 'master' into tos 2016-10-07 00:10:43 -07:00
Kevin Serrano 0a9b814f11
On update, check whether the TOS has changed using hashes. 2016-10-06 03:25:03 -07:00
Kevin Serrano 4ea3246912
Add controller functions for storing and checking TOS hashes. 2016-10-06 03:24:28 -07:00
Kevin Serrano db06813404
Add new functions for storing TOS hashes in config manager. 2016-10-06 03:23:47 -07:00
Kevin Serrano 3fbccdee90
Add string-hash as a package. 2016-10-06 03:21:33 -07:00