| Commit message (Expand) | Author | Age | Files | Lines |
* | fix wording | frankiebee | 2017-08-12 | 1 | -1/+1 |
* | add deprecation warning for web3 | frankiebee | 2017-08-12 | 1 | -1/+4 |
* | tx utils - detect estimateGas err and set simulationFailed | kumavis | 2017-08-09 | 1 | -3/+11 |
* | util - sufficientBalance - validate input | kumavis | 2017-08-09 | 1 | -1/+6 |
* | fix getPendingTransactions function for pendingTxTracker | frankiebee | 2017-08-09 | 1 | -1/+1 |
* | fix class names | frankiebee | 2017-08-09 | 2 | -2/+3 |
* | remove logging of the message and log the error | frankiebee | 2017-08-08 | 1 | -1/+1 |
* | fix spelling | frankiebee | 2017-08-08 | 1 | -6/+3 |
* | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-05 | 4 | -45/+15 |
|\ |
|
| * | Merge pull request #1857 from MetaMask/hotFixCancleTx | kumavis | 2017-08-04 | 1 | -1/+2 |
| |\ |
|
| | * | fix cancelTransaction not reciving a callback | frankiebee | 2017-08-04 | 1 | -1/+2 |
| * | | blacklist - use module eth-phishing-detect | kumavis | 2017-08-04 | 1 | -23/+0 |
| |/ |
|
| * | Merge pull request #1848 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-03 | 1 | -48/+13 |
| |\ |
|
| * | | blacklist controller - breakout from metamask and infura controllers | kumavis | 2017-08-03 | 1 | -22/+7 |
| * | | phishing detection - move phishing detection into contentscript and metamask ... | kumavis | 2017-08-03 | 2 | -3/+6 |
| * | | obj-multiplex - missing name error + prefer const over var | kumavis | 2017-08-03 | 1 | -6/+10 |
* | | | break out tx status pendding watchers | frankiebee | 2017-08-05 | 1 | -0/+165 |
* | | | move util functions to util.js | frankiebee | 2017-08-05 | 2 | -32/+40 |
| |/
|/| |
|
* | | use async with #publishTransaction | frankiebee | 2017-08-03 | 1 | -2/+2 |
* | | move newUnapprovedTransaction to transactions.js | frankiebee | 2017-08-03 | 1 | -8/+4 |
* | | lint fixes | frankiebee | 2017-08-02 | 1 | -6/+1 |
* | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-02 | 2 | -9/+57 |
|\| |
|
| * | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 1 | -0/+38 |
| * | nonce-tracker - hotfix for provider proxying | kumavis | 2017-07-27 | 1 | -4/+11 |
| * | nonce-tracker - add raw baseNonceHex to nonceDetails | kumavis | 2017-07-27 | 1 | -1/+1 |
| * | tx controller + nonce tracker - record nonce components on txMeta | kumavis | 2017-07-27 | 1 | -2/+5 |
| * | nonce-tracker - validation - add validation failing value type to error message | kumavis | 2017-07-27 | 1 | -3/+3 |
| * | nonce-tracker - validation - add validation failing value to error message | kumavis | 2017-07-27 | 1 | -3/+3 |
* | | fix addTxDefaults | frankiebee | 2017-08-02 | 1 | -1/+2 |
* | | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 1 | -44/+17 |
|/ |
|
* | Add stack traces both in errors and as a way to track txMetas | frankiebee | 2017-07-26 | 1 | -0/+8 |
* | transactions - block nonce-tracker while updating pending transactions | kumavis | 2017-07-19 | 1 | -14/+29 |
* | nonce-tracker - fix lock mechanism to be a real mutex | kumavis | 2017-07-19 | 1 | -11/+15 |
* | nonce-tracker - return nonce as integer | kumavis | 2017-07-19 | 1 | -1/+1 |
* | nonce-tracker - validate nonce calc components | kumavis | 2017-07-19 | 1 | -3/+9 |
* | turn off auto faucet and remove file | frankiebee | 2017-07-18 | 1 | -20/+0 |
* | make publishTransaction and signTransaction async methods | frankiebee | 2017-07-14 | 1 | -2/+7 |
* | Fix test to match behavior | frankiebee | 2017-07-13 | 1 | -1/+1 |
* | use new nodeify | frankiebee | 2017-07-13 | 1 | -21/+6 |
* | Use txParams | frankiebee | 2017-07-12 | 1 | -4/+4 |
* | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-12 | 1 | -0/+9 |
|\ |
|
| * | Improve insufficient balance checking in retry loop | Dan Finlay | 2017-07-12 | 1 | -0/+9 |
* | | fix nonce calculation order | frankiebee | 2017-07-06 | 1 | -6/+7 |
* | | nonce-tracker: only check transactions that are not supposed to be ignored | frankiebee | 2017-06-28 | 1 | -6/+7 |
* | | fix nonceTracker | frankiebee | 2017-06-22 | 1 | -8/+6 |
* | | add a test for #getNonceLock | frankiebee | 2017-06-22 | 1 | -6/+16 |
* | | introduce nonce-tracker | kumavis | 2017-06-15 | 1 | -0/+49 |
|/ |
|
* | Linting | Thomas Huang | 2017-06-13 | 1 | -2/+2 |
* | Update gasblocklimit params with every block. | Kevin Serrano | 2017-06-03 | 2 | -9/+2 |
* | Convert gasLimit to not use muln in BN | Kevin Serrano | 2017-06-02 | 1 | -2/+8 |
* | Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider | Thomas Huang | 2017-05-26 | 1 | -17/+5 |
|\ |
|
| * | Remove stream subprovider | Dan Finlay | 2017-05-26 | 1 | -17/+5 |
* | | fix spelling | frankiebee | 2017-05-25 | 1 | -2/+2 |
* | | Merge branch 'master' into reloadDapp | frankiebee | 2017-05-25 | 2 | -2/+14 |
|\| |
|
| * | Merge pull request #1494 from MetaMask/1472-gasceiling | Dan Finlay | 2017-05-25 | 1 | -1/+12 |
| |\ |
|
| | * | Add new blockGasLimit property to txMeta object. | Kevin Serrano | 2017-05-25 | 1 | -1/+12 |
| * | | inpage-provider - disable polling after first block | kumavis | 2017-05-25 | 1 | -1/+2 |
| |/ |
|
* / | Reload the page when switching networks for sites that use web3 | frankiebee | 2017-05-25 | 1 | -22/+25 |
|/ |
|
* | Merge branch 'master' into networkController | Frankie | 2017-05-24 | 1 | -5/+17 |
|\ |
|
| * | clean - remove console logs | kumavis | 2017-05-23 | 1 | -2/+0 |
| * | deps - use stream-subprovider from provider-engine | kumavis | 2017-05-23 | 1 | -1/+1 |
| * | Rename stream to streamSubprovider | Dan Finlay | 2017-05-23 | 1 | -4/+4 |
| * | Use filter subprovider in-page to avoid filter leaks | Dan Finlay | 2017-05-23 | 1 | -2/+6 |
| * | Add new streaming subprovider but getting a loop | Dan Finlay | 2017-05-21 | 1 | -5/+15 |
* | | Fix for tests | frankiebee | 2017-05-24 | 1 | -0/+29 |
* | | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 1 | -3/+2 |
* | | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 2 | -20/+47 |
|\| |
|
| * | Remove all traces of testnet | Thomas Huang | 2017-05-16 | 1 | -10/+5 |
| * | Change default network to rinkeby | Thomas Huang | 2017-05-16 | 1 | -5/+5 |
| * | migrator - fix typo | kumavis | 2017-05-13 | 1 | -1/+1 |
| * | migrator - cleaner migration runner with es7 | kumavis | 2017-05-12 | 1 | -25/+13 |
| * | use asyncQ.waterfall instead of asyncQ.eachSeries | frankiebee | 2017-05-12 | 1 | -4/+10 |
| * | fix migrator | frankiebee | 2017-05-11 | 1 | -9/+8 |
* | | Create a network controller to manage switcing networks an updating the provider | frankiebee | 2017-05-19 | 2 | -72/+3 |
|/ |
|
* | Minor lint | Kevin Serrano | 2017-05-03 | 1 | -1/+1 |
* | notification-manager - remove promise listener | kumavis | 2017-04-29 | 1 | -3/+0 |
* | Merge branch 'master' into rinkeby | Dan Finlay | 2017-04-28 | 8 | -21/+21 |
|\ |
|
| * | Fix linting warnings | Thomas Huang | 2017-04-27 | 8 | -22/+22 |
* | | Add missing changes. Create unique style for rinkeby icon. | Kevin Serrano | 2017-04-26 | 1 | -1/+5 |
* | | add rinkeby network | Nickyg | 2017-04-26 | 1 | -0/+5 |
|/ |
|
* | auto-faucet - only skip faucet on explicit test environment | kumavis | 2017-04-05 | 1 | -1/+1 |
* | add platforms to mascara + move buyEther window open to ui | kumavis | 2017-04-05 | 2 | -3/+24 |
* | Switch auto-faucet from XMLHttpRequest to fetch | frankiebee | 2017-04-04 | 1 | -5/+11 |
* | notification-manager - rename show -> showPoup + make getPopup private | kumavis | 2017-04-01 | 1 | -10/+10 |
* | extension - remove local extension files, we use extensionizer | kumavis | 2017-03-31 | 2 | -85/+0 |
* | introduce platform api and rename notifications to notification-manager | kumavis | 2017-03-31 | 2 | -67/+74 |
* | Merge pull request #1293 from MetaMask/ImproveGasEstimates | Kevin Serrano | 2017-03-30 | 1 | -3/+4 |
|\ |
|
| * | tx-utils - gas buffer ceiling at 90% of block gas limit | kumavis | 2017-03-30 | 1 | -3/+4 |
* | | Linted | Dan Finlay | 2017-03-30 | 1 | -1/+1 |
* | | Fix popup behavior for Firefox | Dan Finlay | 2017-03-30 | 2 | -2/+7 |
|/ |
|
* | tx manager - adjust new tx flow and txMeta decorations | kumavis | 2017-03-29 | 1 | -17/+15 |
* | Improve UI gas calculation logic | Dan Finlay | 2017-03-29 | 1 | -0/+7 |
* | Remove gas limit param | Dan Finlay | 2017-03-24 | 1 | -3/+3 |
* | Merge branch 'master' into i238-kovan | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
|\ |
|
| * | Add current block number and hash to the state. | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
* | | Add kovan config settings to config manager. | Kevin Serrano | 2017-03-23 | 1 | -0/+4 |
|/ |
|
* | Remove eth-lightwallet | Dan Finlay | 2017-03-17 | 3 | -513/+0 |
* | Merge branch 'master' into kumavis-patch-1 | Dan Finlay | 2017-03-09 | 3 | -207/+0 |
|\ |
|
| * | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-09 | 1 | -5/+8 |
| |\ |
|
| * \ | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 1 | -8/+14 |
| |\ \ |
|
| * \ \ | More conflict resolution. | Kevin Serrano | 2017-03-02 | 3 | -237/+0 |
| |\ \ \ |
|
| | * | | | add controllers to root scripts folder | Dan Finlay | 2017-02-28 | 3 | -238/+0 |
| | * | | | Merge branch 'master' into i1144-moarrpc | Dan Finlay | 2017-02-28 | 7 | -34/+127 |
| | |\ \ \ |
|
| * | \ \ \ | Fix merge conflicts. | Kevin Serrano | 2017-03-02 | 8 | -55/+129 |
| |\ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | Tested against code to play nice with unit tests. | Kevin Serrano | 2017-02-24 | 1 | -2/+11 |
| * | | | | | Implemented functionality for displaying recent custom RPCs | Kevin Serrano | 2017-02-23 | 1 | -14/+15 |
| * | | | | | Fix naming | Kevin Serrano | 2017-02-22 | 1 | -2/+2 |
| * | | | | | Basic infrasture for RPC list added. | Kevin Serrano | 2017-02-22 | 1 | -3/+23 |
* | | | | | | tx-utils - add encoding utils | kumavis | 2017-03-08 | 1 | -1/+1 |
* | | | | | | tx-utils - stricter naming type-based convention | kumavis | 2017-03-08 | 1 | -9/+15 |
* | | | | | | tx-utils - clean and comment | kumavis | 2017-03-08 | 1 | -15/+11 |
| |_|_|_|/
|/| | | | |
|
* | | | | | change BN.mul to BN.muln | Jared Pereira | 2017-03-08 | 1 | -1/+1 |
* | | | | | remove constant buffer and add multiplier | Jared Pereira | 2017-03-08 | 1 | -5/+8 |
| |_|_|/
|/| | | |
|
* | | | | Fix normalizeMsgData function to always return hex prefixed | Dan Finlay | 2017-03-07 | 1 | -1/+1 |
* | | | | Render personal_sign messages as utf-8 text | Dan Finlay | 2017-03-07 | 1 | -8/+14 |
| |/ /
|/| | |
|
* | | | Linted | Dan Finlay | 2017-03-01 | 1 | -1/+0 |
* | | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 4 | -21/+3 |
* | | | Fixed bug that made send screen sometimes transition to account detail | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| |/
|/| |
|
* | | Got personal_sign working | Dan Finlay | 2017-02-24 | 1 | -2/+2 |
* | | Add alternate UI for pending personal_sign messages | Dan Finlay | 2017-02-24 | 2 | -1/+3 |
* | | Fix reference | Dan Finlay | 2017-02-22 | 1 | -1/+1 |
* | | Move sigUtil and keyrings to external modules | Dan Finlay | 2017-02-22 | 6 | -32/+122 |
|/ |
|
* | Merge branch 'dev' into disclaimer-notify | Kevin Serrano | 2017-02-10 | 1 | -0/+5 |
|\ |
|
| * | Allowed net_version to be called synchronously | Kevin Serrano | 2017-02-09 | 1 | -0/+5 |
* | | Delete all code related to disclaimers. | Kevin Serrano | 2017-02-10 | 2 | -24/+0 |
|/ |
|
* | Fix typo | Dan Finlay | 2017-02-05 | 1 | -1/+1 |
* | Remove shapeshift tx list from idStore | Dan Finlay | 2017-02-05 | 1 | -2/+1 |
* | Stop removing old shapeshift txs | Dan Finlay | 2017-02-05 | 1 | -16/+0 |
* | Do not remove completed shapeshift deposits | Dan Finlay | 2017-02-04 | 1 | -1/+2 |
* | Fix bug when clearing old shapeshift txs | Dan Finlay | 2017-02-04 | 1 | -1/+3 |
* | Automatically remove shapeshift txs over 11 minutes old with no payment | Dan Finlay | 2017-02-04 | 1 | -0/+22 |
* | Got ShapeShiftController back to working | Dan Finlay | 2017-02-04 | 1 | -12/+7 |
* | Mostly got shapeshift tx management into its own controller | Dan Finlay | 2017-02-04 | 2 | -34/+100 |
* | eth-store - update store state after manipulating | kumavis | 2017-02-04 | 1 | -0/+2 |
* | id mgmt - update to latest eth_sign spec | kumavis | 2017-02-04 | 1 | -8/+27 |
* | migrations - fix migration #9 and add safety checks to migrator | kumavis | 2017-02-04 | 1 | -1/+12 |
* | eths-store - eagerly set current block | kumavis | 2017-02-04 | 1 | -0/+2 |
* | migration #9 - break out CurrencyController substate | kumavis | 2017-02-03 | 3 | -50/+70 |
* | eth-store - cbs default to noop | kumavis | 2017-02-03 | 1 | -5/+5 |
* | eth-store - convert to obs-store subclass | kumavis | 2017-02-03 | 1 | -116/+98 |
* | messageManager - move view state to obs-store | kumavis | 2017-02-03 | 1 | -32/+20 |
* | emit a update badge | Frankie | 2017-02-02 | 1 | -1/+1 |
* | put updateBadge back in | Frankie | 2017-02-02 | 1 | -0/+1 |
* | swap out set state for updateState | Frankie | 2017-02-02 | 1 | -4/+1 |
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 2 | -5/+38 |
|\ |
|
| * | continue rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 1 | -5/+5 |
| * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 1 | -2/+5 |
| * | preferences - introduce preferences controller | kumavis | 2017-01-31 | 1 | -0/+30 |
* | | code clan up and tests | Frankie | 2017-02-02 | 1 | -22/+20 |
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-29 | 1 | -9/+1 |
|\| |
|
| * | tests - remove persistence and start with initial state | kumavis | 2017-01-28 | 1 | -9/+1 |
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 1 | -10/+67 |
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-28 | 1 | -4/+5 |
|\| |
|
| * | background - stream disconnection fix | kumavis | 2017-01-27 | 1 | -4/+5 |
* | | Rewrite message controller to fit controller pattern | Frankie | 2017-01-28 | 1 | -48/+45 |
|/ |
|
* | background - organize metamask instantiation | kumavis | 2017-01-27 | 1 | -1/+1 |
* | obs-store - use published module | kumavis | 2017-01-25 | 7 | -274/+52 |
* | Merge branch 'dev' into obs-store2 | kumavis | 2017-01-22 | 3 | -2/+62 |
|\ |
|
| * | Merge branch 'dev' into conversion-api-err | Dan Finlay | 2017-01-18 | 3 | -3/+63 |
| |\ |
|
| | * | eth-store - emit update on new account add | kumavis | 2017-01-15 | 1 | -1/+3 |
| | * | Satisfy review needs: | Frankie | 2017-01-14 | 1 | -2/+12 |
| | * | background - handle tx finalization in controllers instead of provider-engine | kumavis | 2017-01-13 | 1 | -0/+48 |
| * | | currency conversion - less noisy error | kumavis | 2017-01-12 | 1 | -1/+1 |
* | | | migrations - wip - 005 multivault migration | kumavis | 2017-01-12 | 2 | -23/+14 |
* | | | migrations - introduce promise-based migrator | kumavis | 2017-01-12 | 1 | -0/+31 |
* | | | background - move pojo migrator to outside of metamask controller | kumavis | 2017-01-12 | 8 | -53/+99 |
* | | | background - introduce ObservableStore | kumavis | 2017-01-12 | 7 | -109/+163 |
| |/
|/| |
|
* | | bugfix - portstream - dont wrap cb in try catch | kumavis | 2017-01-12 | 1 | -2/+2 |
|/ |
|
* | Remove erroneous OOG estimation logic. | Dan Finlay | 2017-01-11 | 1 | -15/+2 |
* | deps - replace promise-request with fetch | kumavis | 2017-01-11 | 1 | -4/+3 |
* | Fixed bugs with sanity-checking | Dan Finlay | 2017-01-05 | 1 | -12/+10 |
* | Caught typo | Dan Finlay | 2017-01-05 | 1 | -2/+3 |
* | Add descriptive comment | Dan Finlay | 2017-01-05 | 1 | -0/+9 |
* | Linted | Dan Finlay | 2017-01-05 | 1 | -22/+17 |
* | Removed reliance on eth-store internal custom eth-query | Dan Finlay | 2017-01-05 | 1 | -6/+15 |
* | Move eth-store@1.1.0 into local repo. | Dan Finlay | 2017-01-05 | 1 | -0/+132 |
* | inpage-provider - add isMetaMask | kumavis | 2017-01-03 | 1 | -0/+2 |
* | Merge branch 'dev' into TxManager | Frankie | 2016-12-24 | 4 | -5/+11 |
|\ |
|
| * | Remove log | Dan Finlay | 2016-12-23 | 1 | -1/+0 |
| * | Merge pull request #948 from MetaMask/RecoverLostAccounts | Dan Finlay | 2016-12-23 | 3 | -3/+9 |
| |\ |
|
| | * | Restructured migration | Dan Finlay | 2016-12-22 | 2 | -2/+8 |
| | * | Return undefined when vault is uninitialized | Dan Finlay | 2016-12-22 | 1 | -1/+1 |
| * | | Fix account injection bug | Dan Finlay | 2016-12-23 | 1 | -2/+3 |
| |/ |
|
* | | Merge branch 'dev' into TxManager | Frankie | 2016-12-22 | 3 | -166/+44 |
|\| |
|
| * | Merge pull request #916 from MetaMask/i894-DetectBadAccounts | Dan Finlay | 2016-12-21 | 2 | -10/+44 |
| |\ |
|
| | * | Made changes according to feedback. | Dan Finlay | 2016-12-20 | 2 | -11/+10 |
| | * | Got bad account detection working and added to state | Dan Finlay | 2016-12-10 | 1 | -21/+1 |
| | * | Mostly added bad account detection | Dan Finlay | 2016-12-09 | 2 | -6/+61 |
| * | | Remove encryptor in favor of external browser-passworder | Dan Finlay | 2016-12-20 | 1 | -156/+0 |
| * | | Lint. | Kevin Serrano | 2016-12-20 | 1 | -2/+2 |
| |/ |
|
* | | First pass at revision requests | Frances Pangilinan | 2016-12-22 | 3 | -289/+6 |
* | | Create a TxManager | Frances Pangilinan | 2016-12-15 | 3 | -52/+118 |
|/ |
|
* | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 1 | -2/+3 |
* | Add useful nodeify error message | Dan Finlay | 2016-11-30 | 1 | -2/+9 |
* | Fix nodeify | Dan Finlay | 2016-11-29 | 1 | -55/+13 |
* | Denodeify most of KeyringController | Dan Finlay | 2016-11-29 | 1 | -0/+59 |
* | Merge branch 'master' into dev | Dan Finlay | 2016-11-24 | 2 | -22/+55 |
|\ |
|
| * | rpc - add sync uninstallFilter support | kumavis | 2016-11-24 | 1 | -0/+7 |
| * | idStore - fix estimateGas calculation | kumavis | 2016-11-23 | 1 | -22/+48 |
* | | Fix new encryptor migration logic | Dan Finlay | 2016-11-23 | 1 | -1/+0 |
* | | Simplify Encryptor API Surface | Dan Finlay | 2016-11-23 | 1 | -8/+18 |
* | | Merge pull request #857 from MetaMask/i841-RenameMethod | kumavis | 2016-11-23 | 1 | -1/+1 |
|\ \ |
|
| * | | Rename idStoreMigrator method for clarity | Dan Finlay | 2016-11-22 | 1 | -1/+1 |
* | | | Merge pull request #869 from MetaMask/dev-cleanup | kumavis | 2016-11-23 | 2 | -9/+9 |
|\ \ \ |
|
| * | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 1 | -5/+5 |
| * | | | Remove entropy from encryption and project. | Kevin Serrano | 2016-11-22 | 1 | -4/+4 |
| |/ / |
|
* / / | Phase out ethereumjs-util from encryptor module. | Kevin Serrano | 2016-11-23 | 1 | -6/+4 |
|/ / |
|
* | | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 11 | -50/+308 |
|\ \
| |/
|/| |
|
| * | Maintain linting. | Kevin Serrano | 2016-11-19 | 2 | -3/+3 |
| * | Update migration code for new hd wallet param name | Dan Finlay | 2016-11-19 | 1 | -2/+2 |
| * | Resolve merge conflict. | Kevin Serrano | 2016-11-19 | 11 | -47/+305 |
| |\ |
|
| | * | random-id - use Number.MAX_SAFE_INTEGER as max | kumavis | 2016-11-18 | 1 | -1/+1 |
| | * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Dan Finlay | 2016-11-18 | 9 | -37/+52 |
| | |\ |
|
| | | * | Fix semantics in comments | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | * | Lints. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | * | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 1 | -4/+4 |
| | | |\ |
|
| | | * | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 2 | -5/+5 |
| | | * | | Package normalize inside sig util file. | Kevin Serrano | 2016-11-12 | 1 | -0/+5 |
| | | * | | Linting to the max. | Kevin Serrano | 2016-11-12 | 8 | -30/+24 |
| | | * | | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 1 | -2/+16 |
| | | |\ \ |
|
| | | * \ \ | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 1 | -1/+3 |
| | | |\ \ \ |
|
| | * | | | | | Replace old random-id code with incrementing id generator | Dan Finlay | 2016-11-18 | 2 | -10/+10 |
| | |/ / / / |
|
| | * | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-11-08 | 1 | -5/+5 |
| | |\ \ \ \ |
|
| | * | | | | | Fix password validation and persistence issue | Dan Finlay | 2016-11-04 | 1 | -0/+3 |
| | * | | | | | Fix account nicknaming bug | Dan Finlay | 2016-11-04 | 1 | -2/+4 |
| | * | | | | | Don't faucet during tests | Dan Finlay | 2016-11-04 | 1 | -1/+2 |
| | * | | | | | Don't faucet in development | Dan Finlay | 2016-11-04 | 1 | -1/+3 |
| | * | | | | | Fix handling of migrating old vault style | Dan Finlay | 2016-11-03 | 1 | -3/+12 |
| | * | | | | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 2 | -6/+14 |
| | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-10-31 | 2 | -1/+51 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Now migrating old vaults to new DEN format | Dan Finlay | 2016-10-29 | 2 | -1/+51 |
| | | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Dan Finlay | 2016-10-26 | 2 | -16/+0 |
| | | |\ \ \ \ \ |
|
| | | * \ \ \ \ \ | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-26 | 1 | -9/+14 |
| | | |\ \ \ \ \ \ |
|
| | * | \ \ \ \ \ \ | Merge branch 'master' into i328-MultiVault | Kevin Serrano | 2016-10-29 | 1 | -11/+16 |
| | |\ \ \ \ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 2 | -16/+0 |
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Create basic keyring-controller unit test file | Dan Finlay | 2016-10-22 | 1 | -0/+9 |
| | * | | | | | | | Added SimpleKeyring tests | Dan Finlay | 2016-10-22 | 1 | -0/+23 |
| | * | | | | | | | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 1 | -1/+0 |
| | * | | | | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ |
|
| | * | | | | | | | | Fix tests | Dan Finlay | 2016-10-21 | 1 | -6/+8 |
| | * | | | | | | | | Linted & added salting to vault | Dan Finlay | 2016-10-21 | 2 | -1/+17 |
| | * | | | | | | | | Git merge resolution. | Kevin Serrano | 2016-10-20 | 3 | -1/+32 |
| | |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Intermediary commit. | Kevin Serrano | 2016-10-20 | 1 | -0/+11 |
| | * | | | | | | | | | Merge in crypto. | Kevin Serrano | 2016-10-20 | 1 | -0/+119 |
| | * | | | | | | | | | Initial work on UI side | Kevin Serrano | 2016-10-16 | 1 | -0/+21 |
* | | | | | | | | | | | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 1 | -0/+4 |
|/ / / / / / / / / / |
|
* | | | | | | | | / | Increment tx ids to avoid collisions | Dan Finlay | 2016-11-18 | 3 | -11/+11 |
| |_|_|_|_|_|_|_|/
|/| | | | | | | | |
|
* | | | | | | | | | First attempt at fixing errors in confirmation screen. | Kevin Serrano | 2016-11-15 | 1 | -3/+3 |
| |_|_|_|_|_|_|/
|/| | | | | | | |
|
* | | | | | | | | detect tx error - show warning and fix gasLimit | kumavis | 2016-11-11 | 1 | -2/+16 |
| |_|_|_|_|_|/
|/| | | | | | |
|
* | | | | | | | remove gas field, due to alias redundancy. | Kevin Serrano | 2016-11-10 | 1 | -1/+0 |