m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 11:01:41 +01:00
Code
7,669 Commits 2 Branches 0 Tags 265 MiB
78a1cd3314
Commit Graph

7669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
brunobar79
4759915856 fix spinner and qr icon 2018-07-24 22:34:15 -04:00
brunobar79
eeb902dbf0 decent UI 2018-07-24 21:13:17 -04:00
brunobar79
74fd6d1d12 working without injection 2018-07-24 20:32:20 -04:00
Dan J Miller
1f9c52fbf0
Merge pull request #4845 from MetaMask/button-group 
Add ButtonGroup component
 2018-07-24 21:47:44 -02:30
pinkiebell
3667f3cb85 network.js: convert rpc protocol to lower case (#4855) 
Fixes #4253
 2018-07-24 19:33:36 -02:30
Jenny Pollack
00bae74475 tx-gas-utils - catch all errors from gas estimation 2018-07-24 14:16:37 -07:00
Kevin Serrano
1d241bef76
Merge branch 'develop' into no-inject-ani-gamer 2018-07-24 12:27:18 -07:00
Alexander Tseung
fed9ae0dee
Merge pull request #4865 from MetaMask/i4829-close-notifications-from-ui 
Close notifications from UI actions
 2018-07-24 11:49:50 -07:00
Antoine Nauleau
653e42cf79 Update Babel to Current Standard "babel-preset-env" (#4812) 
* Update .babelrc and package.json to babel-preset-env standard

* Install babel-preset-env babel-stage-0

* Regenerate package-lock.json by running npm install --package-lock-only && npm audit fix

* Resolve PR #4812 merge conflicts

* Merge #4847 Solves previous cache issues with cirlce-ci
 2018-07-24 15:21:32 -02:30
Dan Miller
a61227f224 Remove unneeded code from i4829-close-notifications-from-ui branch. 2018-07-24 15:01:03 -02:30
Dan Miller
64a82fd3da Uncomment closePopupIfOpen code. 2018-07-24 11:45:36 -02:30
Dan Miller
cb8ea12db6 Updates e2e beta tests to ensure that popup window closes after confirming a simple send. 2018-07-24 11:24:36 -02:30
Alexander Tseung
152246f3b0 Add close window support to signature requests. Move logic to actions 2018-07-23 20:25:04 -07:00
brunobar79
d5929e5c42 added qr code scanner icon in send transaction 2018-07-23 22:10:57 -04:00
brunobar79
f7ad978474 camera working back and forth 2018-07-23 21:27:51 -04:00
Dan Miller
2359062b62 UI confirm screen closes confirmation window on submit or cancel of a tx 2018-07-23 22:20:06 -02:30
brunobar79
0209148609 fixes 2018-07-23 19:45:13 -04:00
brunobar79
0940ecd57b added camera snippet injection to inpage.js 2018-07-23 17:12:20 -04:00
brunobar79
2e50348241 added instascan pkg 2018-07-23 17:11:51 -04:00
Dan Miller
a146e5ebbc Adds tests for button group component. 2018-07-23 16:49:28 -02:30
Dan Finlay
b208d33b3b
Merge pull request #4851 from MetaMask/fix-trezor-alert 
Fix trezor "Hardware wallet connected" alert
 2018-07-23 11:58:29 -07:00
Dan Finlay
239f5110e9
Merge pull request #4848 from MetaMask/fix-alert-flash 
Fix Banner flash on load
 2018-07-23 11:32:56 -07:00
Dan Finlay
2e6ce16107
Merge pull request #4842 from wjmelements/vimignore 
Ignore VIM files
 2018-07-23 11:29:32 -07:00
Kevin Serrano
519ca1c74b
Update Chinese naming 
I sincerely hope this is a non-controversial change.
 2018-07-23 09:38:02 -07:00
Alexander Tseung
cdda52d799 Add ButtonGroup component 2018-07-23 09:23:43 -07:00
Dan J Miller
78a1bcfdec
Merge pull request #4852 from keyiiiii/fix-token-amount 
Fix token amount
 2018-07-23 12:32:52 -02:30
板橋 清信
3554292c02 fix type 2018-07-23 17:23:34 +09:00
板橋 清信
79976b7026 fix token amount 2018-07-23 16:28:45 +09:00
brunobar79
bcbe7fef2e show alert ONLY when device is connected 2018-07-23 01:18:39 -04:00
Bruno Barbieri
7cca146058
Merge pull request #4847 from MetaMask/node-version-check 
Enforce usage of node 8.11.3 and npm 6.1.0
 2018-07-21 19:42:30 -04:00
brunobar79
5ebefc0e50 run linter 2018-07-21 16:03:31 -04:00
brunobar79
e2fa3ba415 refactor Alert component to work properly 2018-07-21 16:02:23 -04:00
brunobar79
f63a92aa18 test npm i --no-save 2018-07-21 13:47:10 -04:00
brunobar79
54c93df3b8 test npm ci 2018-07-21 13:36:12 -04:00
brunobar79
bec1eeaf68 update package-lock.json 2018-07-21 13:12:50 -04:00
brunobar79
b1cfe52f07 bump cache version 2018-07-21 12:59:22 -04:00
brunobar79
f309b1012c update package-lock.json 2018-07-21 12:48:40 -04:00
brunobar79
cde91fac16 added node version requirements 2018-07-21 12:43:35 -04:00
Akihiro
3e6d13d309 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-21 11:29:48 +09:00
Dan Finlay
c5520de115
Merge pull request #4844 from MetaMask/detectTokenFeature 
Detect token feature
 2018-07-20 18:50:49 -07:00
Akihiro
8c77e998e0 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-21 10:47:14 +09:00
Esteban MIno
9be22775c3 fix merge 2018-07-20 20:15:33 -04:00
Esteban Miño
110efa9ec1
Merge branch 'develop' into detectTokenFeature 2018-07-20 20:09:37 -04:00
Esteban MIno
9c95554933 fix detection on submit password 2018-07-20 19:58:03 -04:00
William Morriss
289c189bab ignore vim files 2018-07-20 16:00:41 -07:00
Dan Finlay
e094d4ad1f
Merge pull request #4840 from scsaba/transaction-notifications 
Transaction notifications
 2018-07-20 15:50:45 -07:00
Alexander Tseung
5db00c766a
Merge pull request #4841 from MetaMask/i4836-new-contract 
Add fallback options for displaying recipient name in the Confirm screen
 2018-07-20 15:43:42 -07:00
Alexander Tseung
469a79f97f Add fallback options for displaying recipient name in the Confirm screen 2018-07-20 14:23:53 -07:00
Csaba S
c11dea9afc
Merge branch 'develop' into transaction-notifications 2018-07-20 20:09:57 +02:00
Csaba Solya
682d59cfe0 adding changelog entry 2018-07-20 19:58:51 +02:00