aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-081-8/+14
|\
| * Fix normalizeMsgData function to always return hex prefixedDan Finlay2017-03-071-1/+1
| * Render personal_sign messages as utf-8 textDan Finlay2017-03-071-8/+14
* | More conflict resolution.Kevin Serrano2017-03-023-237/+0
|\ \
| * | add controllers to root scripts folderDan Finlay2017-02-283-238/+0
| * | Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-287-34/+127
| |\ \
* | \ \ Fix merge conflicts.Kevin Serrano2017-03-028-55/+129
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | LintedDan Finlay2017-03-011-1/+0
| * | Remove gasMultiplier txMeta paramDan Finlay2017-03-014-21/+3
| * | Fixed bug that made send screen sometimes transition to account detailDan Finlay2017-03-011-0/+1
| |/
| * Got personal_sign workingDan Finlay2017-02-241-2/+2
| * Add alternate UI for pending personal_sign messagesDan Finlay2017-02-242-1/+3
| * Fix referenceDan Finlay2017-02-221-1/+1
| * Move sigUtil and keyrings to external modulesDan Finlay2017-02-226-32/+122
* | Tested against code to play nice with unit tests.Kevin Serrano2017-02-241-2/+11
* | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-231-14/+15
* | Fix namingKevin Serrano2017-02-221-2/+2
* | Basic infrasture for RPC list added.Kevin Serrano2017-02-221-3/+23
|/
* Merge branch 'dev' into disclaimer-notifyKevin Serrano2017-02-101-0/+5
|\
| * Allowed net_version to be called synchronouslyKevin Serrano2017-02-091-0/+5
* | Delete all code related to disclaimers.Kevin Serrano2017-02-102-24/+0
|/
* Fix typoDan Finlay2017-02-051-1/+1
* Remove shapeshift tx list from idStoreDan Finlay2017-02-051-2/+1
* Stop removing old shapeshift txsDan Finlay2017-02-051-16/+0
* Do not remove completed shapeshift depositsDan Finlay2017-02-041-1/+2
* Fix bug when clearing old shapeshift txsDan Finlay2017-02-041-1/+3
* Automatically remove shapeshift txs over 11 minutes old with no paymentDan Finlay2017-02-041-0/+22
* Got ShapeShiftController back to workingDan Finlay2017-02-041-12/+7
* Mostly got shapeshift tx management into its own controllerDan Finlay2017-02-042-34/+100
* eth-store - update store state after manipulatingkumavis2017-02-041-0/+2
* id mgmt - update to latest eth_sign speckumavis2017-02-041-8/+27
* migrations - fix migration #9 and add safety checks to migratorkumavis2017-02-041-1/+12
* eths-store - eagerly set current blockkumavis2017-02-041-0/+2
* migration #9 - break out CurrencyController substatekumavis2017-02-033-50/+70
* eth-store - cbs default to noopkumavis2017-02-031-5/+5
* eth-store - convert to obs-store subclasskumavis2017-02-031-116/+98
* messageManager - move view state to obs-storekumavis2017-02-031-32/+20
* emit a update badgeFrankie2017-02-021-1/+1
* put updateBadge back inFrankie2017-02-021-0/+1
* swap out set state for updateStateFrankie2017-02-021-4/+1
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-022-5/+38
|\
| * continue rename selectedAccount to selectedAddresskumavis2017-01-311-5/+5
| * rename selectedAccount to selectedAddresskumavis2017-01-311-2/+5
| * preferences - introduce preferences controllerkumavis2017-01-311-0/+30
* | code clan up and testsFrankie2017-02-021-22/+20
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-291-9/+1
|\|
| * tests - remove persistence and start with initial statekumavis2017-01-281-9/+1
* | Clean up message manger includes:Frankie2017-01-291-10/+67
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-281-4/+5
|\|
| * background - stream disconnection fixkumavis2017-01-271-4/+5
* | Rewrite message controller to fit controller patternFrankie2017-01-281-48/+45
|/
* background - organize metamask instantiationkumavis2017-01-271-1/+1
* obs-store - use published modulekumavis2017-01-257-274/+52
* Merge branch 'dev' into obs-store2kumavis2017-01-223-2/+62
|\
| * Merge branch 'dev' into conversion-api-errDan Finlay2017-01-183-3/+63
| |\
| | * eth-store - emit update on new account addkumavis2017-01-151-1/+3
| | * Satisfy review needs:Frankie2017-01-141-2/+12
| | * background - handle tx finalization in controllers instead of provider-enginekumavis2017-01-131-0/+48
| * | currency conversion - less noisy errorkumavis2017-01-121-1/+1
* | | migrations - wip - 005 multivault migrationkumavis2017-01-122-23/+14
* | | migrations - introduce promise-based migratorkumavis2017-01-121-0/+31
* | | background - move pojo migrator to outside of metamask controllerkumavis2017-01-128-53/+99
* | | background - introduce ObservableStorekumavis2017-01-127-109/+163
| |/ |/|
* | bugfix - portstream - dont wrap cb in try catchkumavis2017-01-121-2/+2
|/
* Remove erroneous OOG estimation logic.Dan Finlay2017-01-111-15/+2
* deps - replace promise-request with fetchkumavis2017-01-111-4/+3
* Fixed bugs with sanity-checkingDan Finlay2017-01-051-12/+10
* Caught typoDan Finlay2017-01-051-2/+3
* Add descriptive commentDan Finlay2017-01-051-0/+9
* LintedDan Finlay2017-01-051-22/+17
* Removed reliance on eth-store internal custom eth-queryDan Finlay2017-01-051-6/+15
* Move eth-store@1.1.0 into local repo.Dan Finlay2017-01-051-0/+132
* inpage-provider - add isMetaMaskkumavis2017-01-031-0/+2
* Merge branch 'dev' into TxManagerFrankie2016-12-244-5/+11
|\
| * Remove logDan Finlay2016-12-231-1/+0
| * Merge pull request #948 from MetaMask/RecoverLostAccountsDan Finlay2016-12-233-3/+9
| |\
| | * Restructured migrationDan Finlay2016-12-222-2/+8
| | * Return undefined when vault is uninitializedDan Finlay2016-12-221-1/+1
| * | Fix account injection bugDan Finlay2016-12-231-2/+3
| |/
* | Merge branch 'dev' into TxManagerFrankie2016-12-223-166/+44
|\|
| * Merge pull request #916 from MetaMask/i894-DetectBadAccountsDan Finlay2016-12-212-10/+44
| |\
| | * Made changes according to feedback.Dan Finlay2016-12-202-11/+10
| | * Got bad account detection working and added to stateDan Finlay2016-12-101-21/+1
| | * Mostly added bad account detectionDan Finlay2016-12-092-6/+61
| * | Remove encryptor in favor of external browser-passworderDan Finlay2016-12-201-156/+0
| * | Lint.Kevin Serrano2016-12-201-2/+2
| |/
* | First pass at revision requestsFrances Pangilinan2016-12-223-289/+6
* | Create a TxManagerFrances Pangilinan2016-12-153-52/+118
|/
* Fix vault encrypting & unlocking bugDan Finlay2016-12-011-2/+3
* Add useful nodeify error messageDan Finlay2016-11-301-2/+9
* Fix nodeifyDan Finlay2016-11-291-55/+13
* Denodeify most of KeyringControllerDan Finlay2016-11-291-0/+59
* Merge branch 'master' into devDan Finlay2016-11-242-22/+55
|\
| * rpc - add sync uninstallFilter supportkumavis2016-11-241-0/+7
| * idStore - fix estimateGas calculationkumavis2016-11-231-22/+48
* | Fix new encryptor migration logicDan Finlay2016-11-231-1/+0
* | Simplify Encryptor API SurfaceDan Finlay2016-11-231-8/+18
* | Merge pull request #857 from MetaMask/i841-RenameMethodkumavis2016-11-231-1/+1
|\ \
| * | Rename idStoreMigrator method for clarityDan Finlay2016-11-221-1/+1
* | | Merge pull request #869 from MetaMask/dev-cleanupkumavis2016-11-232-9/+9
|\ \ \
| * | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-221-5/+5
| * | | Remove entropy from encryption and project.Kevin Serrano2016-11-221-4/+4
| |/ /
* / / Phase out ethereumjs-util from encryptor module.Kevin Serrano2016-11-231-6/+4
|/ /
* | Merge branch 'dev' into i831-AddRopsten-DevDan Finlay2016-11-2211-50/+308
|\ \ | |/ |/|
| * Maintain linting.Kevin Serrano2016-11-192-3/+3
| * Update migration code for new hd wallet param nameDan Finlay2016-11-191-2/+2
| * Resolve merge conflict.Kevin Serrano2016-11-1911-47/+305
| |\
| | * random-id - use Number.MAX_SAFE_INTEGER as maxkumavis2016-11-181-1/+1
| | * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Dan Finlay2016-11-189-37/+52
| | |\
| | | * Fix semantics in commentsKevin Serrano2016-11-161-1/+1
| | | * Lints.Kevin Serrano2016-11-161-1/+1
| | | * Resolve merge conflicts.Kevin Serrano2016-11-161-4/+4
| | | |\
| | | * | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-152-5/+5
| | | * | Package normalize inside sig util file.Kevin Serrano2016-11-121-0/+5
| | | * | Linting to the max.Kevin Serrano2016-11-128-30/+24
| | | * | Merge branch 'master' into i328-MultiVaultkumavis2016-11-111-2/+16
| | | |\ \
| | | * \ \ Merge branch 'master' into i328-MultiVaultFrankie2016-11-111-1/+3
| | | |\ \ \
| | * | | | | Replace old random-id code with incrementing id generatorDan Finlay2016-11-182-10/+10
| | |/ / / /
| | * | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-11-081-5/+5
| | |\ \ \ \
| | * | | | | Fix password validation and persistence issueDan Finlay2016-11-041-0/+3
| | * | | | | Fix account nicknaming bugDan Finlay2016-11-041-2/+4
| | * | | | | Don't faucet during testsDan Finlay2016-11-041-1/+2
| | * | | | | Don't faucet in developmentDan Finlay2016-11-041-1/+3
| | * | | | | Fix handling of migrating old vault styleDan Finlay2016-11-031-3/+12
| | * | | | | Implement seed word confirmation page.Kevin Serrano2016-11-012-6/+14
| | * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-312-1/+51
| | |\ \ \ \ \
| | | * | | | | Now migrating old vaults to new DEN formatDan Finlay2016-10-292-1/+51
| | | * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Dan Finlay2016-10-262-16/+0
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-261-9/+14
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-291-11/+16
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Phase out extra warning screen.Kevin Serrano2016-10-262-16/+0
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Create basic keyring-controller unit test fileDan Finlay2016-10-221-0/+9
| | * | | | | | | Added SimpleKeyring testsDan Finlay2016-10-221-0/+23
| | * | | | | | | Began adding first basic keyringDan Finlay2016-10-211-1/+0
| | * | | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-211-1/+1
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix testsDan Finlay2016-10-211-6/+8
| | * | | | | | | | Linted & added salting to vaultDan Finlay2016-10-212-1/+17
| | * | | | | | | | Git merge resolution.Kevin Serrano2016-10-203-1/+32
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Intermediary commit.Kevin Serrano2016-10-201-0/+11
| | * | | | | | | | | Merge in crypto.Kevin Serrano2016-10-201-0/+119
| | * | | | | | | | | Initial work on UI sideKevin Serrano2016-10-161-0/+21
* | | | | | | | | | | Begin adding Ropsten supportDan Finlay2016-11-221-0/+4
|/ / / / / / / / / /
* | | | | | | | | / Increment tx ids to avoid collisionsDan Finlay2016-11-183-11/+11
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | First attempt at fixing errors in confirmation screen.Kevin Serrano2016-11-151-3/+3
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | detect tx error - show warning and fix gasLimitkumavis2016-11-111-2/+16
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | remove gas field, due to alias redundancy.Kevin Serrano2016-11-101-1/+0
* | | | | | | Fix bug for increasing gas by 20 percent.Kevin Serrano2016-11-101-0/+2
* | | | | | | Adjust gas buffer to be 20% over estimateDan Finlay2016-11-091-1/+2
* | | | | | | Increase gas bufferDan Finlay2016-11-091-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Fix gas price bufferingDan Finlay2016-11-081-5/+5
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-271-2/+2
|\ \ \ \ \
| * | | | | Fix delegate call function reference 2Dan Finlay2016-10-261-1/+1
| * | | | | Fix delegate call analysisDan Finlay2016-10-261-1/+1
| | |_|_|/ | |/| | |
* / | | | Rename wallet to accountDan Finlay2016-10-261-1/+1
|/ / / /
* | | | Merge branch 'master' into i743-FixDelegateCallFlagkumavis2016-10-251-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Add note about callback param to sync method warningDan Finlay2016-10-201-1/+1
| | |/ | |/|
* / | Reproduced issue 743 in test caseDan Finlay2016-10-181-9/+14
|/ /
* | Restore hex prefix to gas priceDan Finlay2016-10-181-1/+1
* | Increase gas estimate by 100000 weiDan Finlay2016-10-181-1/+9
* | Specify base 10 in bignumberFrankie2016-10-141-1/+1
* | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-144-22/+28
|\|
| * Merge branch 'master' into i695-dapp-reloadkumavis2016-10-132-0/+13
| |\
| * | dapp reload - fixed disconnect detection via pollingkumavis2016-10-134-22/+28
* | | Fix gasPrice rangeFrankie2016-10-143-4/+20
* | | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-122-0/+13
|\ \ \ | | |/ | |/|
| * | Fix bug where new vaults had no nicknamesDan Finlay2016-10-121-0/+2
| * | Renamed variables to make more sense.Kevin Serrano2016-10-071-2/+2
| * | Add new functions for storing TOS hashes in config manager.Kevin Serrano2016-10-061-0/+11
| |/
* | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-113-7/+7
|\|
| * Add tolerance for sending from mixed-case addresses.Dan Finlay2016-10-061-2/+2
| * Correct async linkDan Finlay2016-10-061-4/+4
| * Make popup a little tallerDan Finlay2016-10-051-1/+1
* | Add custom gas field to send pageFrankie2016-10-111-0/+7
|/
* Merge pull request #655 from MetaMask/FixPortStreamEndkumavis2016-09-142-5/+10
|\
| * Fix port stream end bugDan Finlay2016-09-141-2/+1
|/
* Fix cache clearing reference for OperaDan Finlay2016-09-131-1/+1
* Make cache clearning error tolerantDan Finlay2016-09-131-1/+6
* Fix clearing of account cache on vault restoreDan Finlay2016-09-131-3/+7
* LintedDan Finlay2016-09-131-2/+2
* Load accounts into ethStore on unlockDan Finlay2016-09-131-0/+1
* Add accounts back to metamask stateDan Finlay2016-09-131-1/+5
* Fix keystore referenceDan Finlay2016-09-131-0/+1
* Fix some referencesDan Finlay2016-09-131-2/+2
* Fix account unlockingDan Finlay2016-09-132-10/+21
* Select first address when restoring vaultDan Finlay2016-09-121-2/+10
* Fix ethStore pushed addressesDan Finlay2016-09-121-1/+1
* Fixed caching bugDan Finlay2016-09-111-6/+1
* Correctly clear ethStore cache on new vault restoreDan Finlay2016-09-111-7/+16
* Captured #640 in failing testDan Finlay2016-09-111-0/+5
* Add new eth-lightwallet salting to vault.Dan Finlay2016-09-101-57/+43
* Only init one wallet on restoreDan Finlay2016-09-091-1/+1
* lintingVincent Serpoul2016-09-061-1/+1
* Error message more helpfulVincent Serpoul2016-09-061-2/+3
* notif - use standard err-first callback stylekumavis2016-09-031-18/+24
* Merge branch 'master' into i566-NoPopupWhenOpenDan Finlay2016-09-021-4/+18
|\
| * inpage - remap ids on responsekumavis2016-09-011-4/+18
* | LintedDan Finlay2016-09-021-1/+1
* | Do not open popup for internally produced txsDan Finlay2016-09-021-11/+19
|/
* Make popup a type Edge supportsDan Finlay2016-08-301-1/+2
* Add extra edge compatibilityDan Finlay2016-08-301-2/+13
* Merge branch 'master' into i#563forgotPasswordFrankie2016-08-263-139/+42
|\
| * Merge branch 'master' into PopupNotificationsDan Finlay2016-08-251-2/+2
| |\
| * | Close notification on opening main UIDan Finlay2016-08-241-2/+9
| * | Skip popup dismissal in testsDan Finlay2016-08-241-0/+6
| * | Close popup even if last tx is dismissed from main UIDan Finlay2016-08-241-8/+14
| * | Emit updates to all listeners on pending tx updatesDan Finlay2016-08-241-15/+1
| * | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-232-2/+34
| |\ \
| * | | Limit to one popup, re-focus on additional notifications.Dan Finlay2016-08-231-6/+17
| * | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-232-0/+36
| |\ \ \
| * | | | LintedDan Finlay2016-08-171-15/+5
| * | | | MVP Popup Notifications WorkingDan Finlay2016-08-172-2/+3
| * | | | Unify notification and popup ui filesDan Finlay2016-08-173-1/+15
| * | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-172-0/+51
| |\ \ \ \
| * | | | | Set up MVP for popup-based notifications.Dan Finlay2016-08-171-127/+9
* | | | | | Merge branch 'master' into i#563forgotPasswordFrankie2016-08-262-4/+36
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Implement usage of nock.Kevin Serrano2016-08-251-22/+12
| * | | | | Added mock option to function.Kevin Serrano2016-08-251-13/+23
| | |_|_|/ | |/| | |
| * | | | Merge branch 'master' into i390-TransactionLimitkumavis2016-08-231-2/+28
| |\ \ \ \
| | * | | | inpage provider - reassign incomming idskumavis2016-08-231-2/+28
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-232-0/+36
| |\| | |
| * | | | Enforce tx history limitDan Finlay2016-08-191-0/+6
| | |_|/ | |/| |
* | | | Add a back button on lock screen to go back to init menuFrankie2016-08-261-0/+5
| |/ / |/| |
* | | Create a ShapeShift tx in tx HistoryFrankie2016-08-191-4/+6
* | | Merge branch 'master' into shapeshiftTxFrankie2016-08-192-0/+51
|\| |
| * | Added compliance for tests and properly accounts for N/A conversions.Kevin Serrano2016-08-171-3/+3
| * | Add fallback to API failure.Kevin Serrano2016-08-171-0/+2
| * | Merge master.Kevin Serrano2016-08-166-132/+18
| |\|
| * | Get fiat numbers rendering on tooltip. Need to find way to create line breaks.Kevin Serrano2016-08-061-6/+0
| * | Merge branch 'master' into usd-conversionKevin Serrano2016-08-052-6/+23
| |\ \
| * \ \ Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.Kevin Serrano2016-07-232-0/+18
| |\ \ \
| * | | | Linting!Kevin Serrano2016-07-231-1/+1
| * | | | Change function names. Add interval polling for api. Refactor functions.Kevin Serrano2016-07-221-7/+18
| * | | | Add date access throughout the data flow.Kevin Serrano2016-07-222-4/+5
| * | | | Provide date access.Kevin Serrano2016-07-221-1/+8
| * | | | Merge branch 'master' into usd-conversionKevin Serrano2016-07-224-16/+77
| |\ \ \ \
| * | | | | Add data field to pass up parameters up to reducer.Kevin Serrano2016-07-221-1/+3
| * | | | | Progress on config manager. Plus tests.Kevin Serrano2016-07-211-0/+27
* | | | | | WIP: ShapeShift txFrankie2016-08-192-0/+34
| |_|_|_|/ |/| | | |
* | | | | Remove ethereum classic providerDan Finlay2016-08-151-5/+1
* | | | | deps - extracted ensnare to modulekumavis2016-08-132-25/+1
* | | | | Add global var for background.Kevin Serrano2016-08-121-3/+6
* | | | | inpage-prov - sync error - fix linkkumavis2016-08-121-1/+1
* | | | | deps - local-message-stream extracted as module post-message-streamkumavis2016-08-121-56/+0
* | | | | clean -formattingkumavis2016-08-121-2/+2
* | | | | inpage-provider - remove createSyncProvider, just failkumavis2016-08-121-40/+3
* | | | | Fix ether warning checkbox.Kevin Serrano2016-08-111-2/+6
| |_|_|/ |/| | |
* | | | Merge branch 'master' into AddEthClassicDan Finlay2016-07-291-1/+1
|\ \ \ \
| * | | | Fix broken reference to host store.didUpdateDan Finlay2016-07-291-1/+1
* | | | | Add eth classic to provider menuDan Finlay2016-07-291-0/+4
|/ / / /
* | | | Add platform specific builds and zip tasks (#486)Dan Finlay2016-07-271-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 22:37:03 +0800