Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | Fix bug for increasing gas by 20 percent. | Kevin Serrano | 2016-11-10 | 1 | -0/+2 |
* | | | | | | | Adjust gas buffer to be 20% over estimate | Dan Finlay | 2016-11-09 | 1 | -1/+2 |
* | | | | | | | Increase gas buffer | Dan Finlay | 2016-11-09 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Fix gas price buffering | Dan Finlay | 2016-11-08 | 1 | -5/+5 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'master' into i762-RenameWalletToAccount | Dan Finlay | 2016-10-27 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix delegate call function reference 2 | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
| * | | | | | Fix delegate call analysis | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* / | | | | Rename wallet to account | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'master' into i743-FixDelegateCallFlag | kumavis | 2016-10-25 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add note about callback param to sync method warning | Dan Finlay | 2016-10-20 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | Reproduced issue 743 in test case | Dan Finlay | 2016-10-18 | 1 | -9/+14 |
|/ / | |||||
* | | Restore hex prefix to gas price | Dan Finlay | 2016-10-18 | 1 | -1/+1 |
* | | Increase gas estimate by 100000 wei | Dan Finlay | 2016-10-18 | 1 | -1/+9 |
* | | Specify base 10 in bignumber | Frankie | 2016-10-14 | 1 | -1/+1 |
* | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-14 | 4 | -22/+28 |
|\| | |||||
| * | Merge branch 'master' into i695-dapp-reload | kumavis | 2016-10-13 | 2 | -0/+13 |
| |\ | |||||
| * | | dapp reload - fixed disconnect detection via polling | kumavis | 2016-10-13 | 4 | -22/+28 |
* | | | Fix gasPrice range | Frankie | 2016-10-14 | 3 | -4/+20 |
* | | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-12 | 2 | -0/+13 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix bug where new vaults had no nicknames | Dan Finlay | 2016-10-12 | 1 | -0/+2 |
| * | | Renamed variables to make more sense. | Kevin Serrano | 2016-10-07 | 1 | -2/+2 |
| * | | Add new functions for storing TOS hashes in config manager. | Kevin Serrano | 2016-10-06 | 1 | -0/+11 |
| |/ | |||||
* | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-11 | 3 | -7/+7 |
|\| | |||||
| * | Add tolerance for sending from mixed-case addresses. | Dan Finlay | 2016-10-06 | 1 | -2/+2 |
| * | Correct async link | Dan Finlay | 2016-10-06 | 1 | -4/+4 |
| * | Make popup a little taller | Dan Finlay | 2016-10-05 | 1 | -1/+1 |
* | | Add custom gas field to send page | Frankie | 2016-10-11 | 1 | -0/+7 |
|/ | |||||
* | Merge pull request #655 from MetaMask/FixPortStreamEnd | kumavis | 2016-09-14 | 2 | -5/+10 |
|\ | |||||
| * | Fix port stream end bug | Dan Finlay | 2016-09-14 | 1 | -2/+1 |
|/ | |||||
* | Fix cache clearing reference for Opera | Dan Finlay | 2016-09-13 | 1 | -1/+1 |
* | Make cache clearning error tolerant | Dan Finlay | 2016-09-13 | 1 | -1/+6 |
* | Fix clearing of account cache on vault restore | Dan Finlay | 2016-09-13 | 1 | -3/+7 |
* | Linted | Dan Finlay | 2016-09-13 | 1 | -2/+2 |
* | Load accounts into ethStore on unlock | Dan Finlay | 2016-09-13 | 1 | -0/+1 |
* | Add accounts back to metamask state | Dan Finlay | 2016-09-13 | 1 | -1/+5 |
* | Fix keystore reference | Dan Finlay | 2016-09-13 | 1 | -0/+1 |
* | Fix some references | Dan Finlay | 2016-09-13 | 1 | -2/+2 |
* | Fix account unlocking | Dan Finlay | 2016-09-13 | 2 | -10/+21 |
* | Select first address when restoring vault | Dan Finlay | 2016-09-12 | 1 | -2/+10 |
* | Fix ethStore pushed addresses | Dan Finlay | 2016-09-12 | 1 | -1/+1 |
* | Fixed caching bug | Dan Finlay | 2016-09-11 | 1 | -6/+1 |
* | Correctly clear ethStore cache on new vault restore | Dan Finlay | 2016-09-11 | 1 | -7/+16 |
* | Captured #640 in failing test | Dan Finlay | 2016-09-11 | 1 | -0/+5 |
* | Add new eth-lightwallet salting to vault. | Dan Finlay | 2016-09-10 | 1 | -57/+43 |
* | Only init one wallet on restore | Dan Finlay | 2016-09-09 | 1 | -1/+1 |
* | linting | Vincent Serpoul | 2016-09-06 | 1 | -1/+1 |
* | Error message more helpful | Vincent Serpoul | 2016-09-06 | 1 | -2/+3 |
* | notif - use standard err-first callback style | kumavis | 2016-09-03 | 1 | -18/+24 |
* | Merge branch 'master' into i566-NoPopupWhenOpen | Dan Finlay | 2016-09-02 | 1 | -4/+18 |
|\ | |||||
| * | inpage - remap ids on response | kumavis | 2016-09-01 | 1 | -4/+18 |
* | | Linted | Dan Finlay | 2016-09-02 | 1 | -1/+1 |
* | | Do not open popup for internally produced txs | Dan Finlay | 2016-09-02 | 1 | -11/+19 |
|/ | |||||
* | Make popup a type Edge supports | Dan Finlay | 2016-08-30 | 1 | -1/+2 |
* | Add extra edge compatibility | Dan Finlay | 2016-08-30 | 1 | -2/+13 |
* | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 3 | -139/+42 |
|\ | |||||
| * | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-25 | 1 | -2/+2 |
| |\ | |||||
| * | | Close notification on opening main UI | Dan Finlay | 2016-08-24 | 1 | -2/+9 |
| * | | Skip popup dismissal in tests | Dan Finlay | 2016-08-24 | 1 | -0/+6 |
| * | | Close popup even if last tx is dismissed from main UI | Dan Finlay | 2016-08-24 | 1 | -8/+14 |
| * | | Emit updates to all listeners on pending tx updates | Dan Finlay | 2016-08-24 | 1 | -15/+1 |
| * | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 2 | -2/+34 |
| |\ \ | |||||
| * | | | Limit to one popup, re-focus on additional notifications. | Dan Finlay | 2016-08-23 | 1 | -6/+17 |
| * | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 2 | -0/+36 |
| |\ \ \ | |||||
| * | | | | Linted | Dan Finlay | 2016-08-17 | 1 | -15/+5 |
| * | | | | MVP Popup Notifications Working | Dan Finlay | 2016-08-17 | 2 | -2/+3 |
| * | | | | Unify notification and popup ui files | Dan Finlay | 2016-08-17 | 3 | -1/+15 |
| * | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-17 | 2 | -0/+51 |
| |\ \ \ \ | |||||
| * | | | | | Set up MVP for popup-based notifications. | Dan Finlay | 2016-08-17 | 1 | -127/+9 |
* | | | | | | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 2 | -4/+36 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Implement usage of nock. | Kevin Serrano | 2016-08-25 | 1 | -22/+12 |
| * | | | | | Added mock option to function. | Kevin Serrano | 2016-08-25 | 1 | -13/+23 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'master' into i390-TransactionLimit | kumavis | 2016-08-23 | 1 | -2/+28 |
| |\ \ \ \ | |||||
| | * | | | | inpage provider - reassign incomming ids | kumavis | 2016-08-23 | 1 | -2/+28 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'master' into i390-TransactionLimit | Dan Finlay | 2016-08-23 | 2 | -0/+36 |
| |\| | | | |||||
| * | | | | Enforce tx history limit | Dan Finlay | 2016-08-19 | 1 | -0/+6 |
| | |_|/ | |/| | | |||||
* | | | | Add a back button on lock screen to go back to init menu | Frankie | 2016-08-26 | 1 | -0/+5 |
| |/ / |/| | | |||||
* | | | Create a ShapeShift tx in tx History | Frankie | 2016-08-19 | 1 | -4/+6 |
* | | | Merge branch 'master' into shapeshiftTx | Frankie | 2016-08-19 | 2 | -0/+51 |
|\| | | |||||
| * | | Added compliance for tests and properly accounts for N/A conversions. | Kevin Serrano | 2016-08-17 | 1 | -3/+3 |
| * | | Add fallback to API failure. | Kevin Serrano | 2016-08-17 | 1 | -0/+2 |
| * | | Merge master. | Kevin Serrano | 2016-08-16 | 6 | -132/+18 |
| |\| | |||||
| * | | Get fiat numbers rendering on tooltip. Need to find way to create line breaks. | Kevin Serrano | 2016-08-06 | 1 | -6/+0 |
| * | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-08-05 | 2 | -6/+23 |
| |\ \ | |||||
| * \ \ | Fix merge conflicts. Fix typos. Ensure currency immediately updated on load. | Kevin Serrano | 2016-07-23 | 2 | -0/+18 |
| |\ \ \ | |||||
| * | | | | Linting! | Kevin Serrano | 2016-07-23 | 1 | -1/+1 |
| * | | | | Change function names. Add interval polling for api. Refactor functions. | Kevin Serrano | 2016-07-22 | 1 | -7/+18 |
| * | | | | Add date access throughout the data flow. | Kevin Serrano | 2016-07-22 | 2 | -4/+5 |
| * | | | | Provide date access. | Kevin Serrano | 2016-07-22 | 1 | -1/+8 |
| * | | | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-07-22 | 4 | -16/+77 |
| |\ \ \ \ | |||||
| * | | | | | Add data field to pass up parameters up to reducer. | Kevin Serrano | 2016-07-22 | 1 | -1/+3 |
| * | | | | | Progress on config manager. Plus tests. | Kevin Serrano | 2016-07-21 | 1 | -0/+27 |
* | | | | | | WIP: ShapeShift tx | Frankie | 2016-08-19 | 2 | -0/+34 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Remove ethereum classic provider | Dan Finlay | 2016-08-15 | 1 | -5/+1 |
* | | | | | deps - extracted ensnare to module | kumavis | 2016-08-13 | 2 | -25/+1 |
* | | | | | Add global var for background. | Kevin Serrano | 2016-08-12 | 1 | -3/+6 |
* | | | | | inpage-prov - sync error - fix link | kumavis | 2016-08-12 | 1 | -1/+1 |
* | | | | | deps - local-message-stream extracted as module post-message-stream | kumavis | 2016-08-12 | 1 | -56/+0 |
* | | | | | clean -formatting | kumavis | 2016-08-12 | 1 | -2/+2 |
* | | | | | inpage-provider - remove createSyncProvider, just fail | kumavis | 2016-08-12 | 1 | -40/+3 |
* | | | | | Fix ether warning checkbox. | Kevin Serrano | 2016-08-11 | 1 | -2/+6 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'master' into AddEthClassic | Dan Finlay | 2016-07-29 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix broken reference to host store.didUpdate | Dan Finlay | 2016-07-29 | 1 | -1/+1 |
* | | | | | Add eth classic to provider menu | Dan Finlay | 2016-07-29 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Add platform specific builds and zip tasks (#486) | Dan Finlay | 2016-07-27 | 1 | -1/+1 |
* | | | | Fix integration tests | Dan Finlay | 2016-07-26 | 1 | -4/+19 |
* | | | | Fix extension tests | Dan Finlay | 2016-07-26 | 1 | -1/+4 |
* | | | | Clean up extension polyfill abstraction | Dan Finlay | 2016-07-26 | 1 | -6/+1 |
| |_|/ |/| | | |||||
* | | | Buy button (#474) | Frankie | 2016-07-22 | 2 | -1/+12 |
| |/ |/| | |||||
* | | Implement some cross-browser practices (#473) | Dan Finlay | 2016-07-22 | 3 | -15/+68 |
* | | Make injected web3 fail hard on sync methods (#471) | Dan Finlay | 2016-07-21 | 1 | -1/+9 |
|/ | |||||
* | new tx - calculate estimatedGas and show thing in tx-details (#441) | kumavis | 2016-07-14 | 1 | -17/+37 |
* | Add one wallet to new accounts instead of three. | Kevin Serrano | 2016-07-13 | 1 | -1/+1 |
* | Linted | Dan Finlay | 2016-07-12 | 1 | -12/+9 |
* | Add notification global for development | Dan Finlay | 2016-07-12 | 1 | -1/+3 |
* | Remove useless and buggy clearWallet function | Dan Finlay | 2016-07-01 | 2 | -5/+0 |
* | Emphasizing how weird this bug is by removing all behavior from the method. | Dan Finlay | 2016-07-01 | 1 | -5/+1 |
* | Replicated really strange bug with test | Dan Finlay | 2016-07-01 | 1 | -1/+1 |
* | Unify wording for transaction options (#369) | Kevin Serrano | 2016-06-30 | 1 | -2/+2 |