aboutsummaryrefslogtreecommitdiffstats
path: root/yarn.lock
Commit message (Expand)AuthorAgeFilesLines
* Fix transaction confirmationsAlexander Tseung2018-04-041-1/+48
* Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-031-84/+1110
|\
| * UpdateSendErrors only called when balance defined, recalled if balance updates.Dan2018-04-031-327/+232
* | Fix conf-tx renderAlexander Tseung2018-03-311-5/+42
* | Fix i18n merge conflictsAlexander Tseung2018-03-301-51/+162
|\|
| * Merge branch 'master' into i18n-translator-reduxDan2018-03-271-2/+42
| |\
| * | i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-221-2/+227
* | | Fix merge conflictsAlexander Tseung2018-03-271-598/+1078
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into i3326-addtokenscreendesignupdateDan2018-03-271-2/+42
| |/
| * Update Deposit Eth icon (#3569)Alexander Tseung2018-03-161-446/+222
| * Explicitly define state in import account from json component (#3491)Alexander Tseung2018-03-091-94/+641
| * Fix flashing to Log in screen after logging in or restoring from seed phrase ...Alexander Tseung2018-03-081-50/+24
| * Fix inpage provider name regressionDan Finlay2018-03-031-3/+3
| * Fix network menu for custom URLs (#3366)Alexander Tseung2018-03-021-32/+159
* | Fix merge conflicts from uat-nextAlexander Tseung2018-02-011-7/+89
|\|
| * [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)Dan J Miller2018-02-011-6/+59
| * update yarn.lockChi Kei Chan2018-01-201-24/+99
* | Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-011-417/+517
* | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-301-1291/+2205
|\|
| * [NewUI-flat] Fix gulp build (#2975)Dan J Miller2018-01-161-4/+67
| * [NewUI] Place all users of extension into old UI (disable auto adding). (#2946)Dan J Miller2018-01-161-0/+42
| * [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-131-17/+6
| * Fix sign typed dataAlexander Tseung2017-12-301-1295/+2085
* | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-3/+86
|/
* Fix isMascara and update yarn.lockChi Kei Chan2017-12-131-288/+462
* Version BumpChi Kei Chan2017-11-161-0/+4
* Adds revert feature to customize gas modal.Dan2017-10-261-7/+1
* Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-251-97/+221
|\
| * Add Import With Seed PhraseChi Kei Chan2017-10-211-11/+9
| * Add mobile responsivenessChi Kei Chan2017-10-211-175/+119
| * Add Integration TestsChi Kei Chan2017-10-211-1/+5
| * Fix linterChi Kei Chan2017-10-211-119/+225
| * Add ShapeShift UIChi Kei Chan2017-10-211-7/+17
| * Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-211-0/+9503
* Update token menu cssChi Kei Chan2017-10-241-8/+6
* Fix selectorsChi Kei Chan2017-10-201-18/+74
* Confirm eth v2Chi Kei Chan2017-10-111-120/+65
* Query for gas estimatesChi Kei Chan2017-09-291-1/+8
* Update yarn.lockChi Kei Chan2017-09-291-116/+249
* Return null if transaction.key is shapeshiftChi Kei Chan2017-09-271-52/+12
* Add Add Token UI; Add Fuzzy search for tokensChi Kei Chan2017-09-201-13/+57
* Fix Merge Problems; update yarn lockChi Kei Chan2017-09-191-48/+551
* Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rateChi Kei Chan2017-09-141-28/+219
* Added signTokenTx; Adding token confirmation screenChi Kei Chan2017-09-121-1/+1
* Add buttons; handle back; add yarn.lockChi Kei Chan2017-09-121-0/+9756