1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 20:57:12 +01:00
Commit Graph

7892 Commits

Author SHA1 Message Date
brunobar79
d65d018ad0 restore platform/extension.js 2018-07-26 21:11:58 -04:00
brunobar79
69f4c8c336 fix merge conflicts 2018-07-26 21:04:03 -04:00
brunobar79
d4a15f22c2 added webrtc-adapter for browser compat 2018-07-26 21:00:48 -04:00
brunobar79
ea028e7506 fully working without tweaking ext. permission 2018-07-26 20:56:58 -04:00
brunobar79
6cd4bc9f4e working without permission issues 2018-07-26 20:24:39 -04:00
Esteban MIno
f79a249bcc modify tests according to tokens by network 2018-07-26 20:04:57 -04:00
Kelvin Tan
a97583b039 revert package-lock.json 2018-07-27 07:50:38 +08:00
Esteban MIno
2827e13caa add & delete tokens per network 2018-07-26 19:28:12 -04:00
kumavis
e715d0e691
Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditional
Update Chinese naming on our language list
2018-07-26 15:13:24 -07:00
Esteban MIno
1d3ad7cfbb tokens per network for individual account 2018-07-26 18:04:34 -04:00
kumavis
ffefeb65d4
Merge pull request #4802 from 03-26/develop
Update translation 🇯🇵
2018-07-26 14:59:12 -07:00
Kelvin Tan
7ca402147d add phishing html page, and redirect to bundled page in-window 2018-07-27 00:03:39 +08:00
Thomas
138858647e Merge branch 'develop' into network-remove-provider-engine 2018-07-25 22:38:44 -07:00
Alexander Tseung
cd2b67cdd9 Fix overflow for long total strings in confirm string 2018-07-25 22:12:13 -07:00
Dan J Miller
53b440a287
Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx
Only show retry button on the earliest pending tx
2018-07-25 23:42:49 -02:30
Dan J Miller
acddb85f2e
Merge pull request #4876 from MetaMask/i4835-unitTestConfirmDetailRow
Add tests for Confirm Detail Row
2018-07-25 23:04:44 -02:30
Frankie
b5e3aafe2e
Merge pull request #4871 from MetaMask/3519-new-contract-gas
tx-gas-utils -  catch all errors from gas estimation
2018-07-25 15:33:17 -10:00
Esteban MIno
b580f60d74 earliest tx by submittedTime 2018-07-25 20:58:20 -04:00
Esteban MIno
c8d45cb4a8 only show retry button on earliest pending tx 2018-07-25 20:02:12 -04:00
Sara Reynolds
9934690bd9 lint fix 2018-07-25 16:31:33 -07:00
Sara Reynolds
6eadf5b22b Update prop names 2018-07-25 16:26:30 -07:00
Esteban MIno
adee549c43 preferences test fixes for tokens per account 2018-07-25 17:46:31 -04:00
Dan Finlay
a5d344a582
Merge pull request #4875 from MetaMask/bmd/readme-release
add current release to the README
2018-07-25 14:33:33 -07:00
Thomas Huang
bc98085731
Merge pull request #4880 from MetaMask/migration-27
migrations - fix to include 27
2018-07-25 14:30:44 -07:00
frankiebee
527b62ee8e migrations - fix to include 27 2018-07-25 14:11:07 -07:00
Esteban MIno
2770df80e3 add & delete tokens per account 2018-07-25 16:14:10 -04:00
Sara Reynolds
9ca4b66c82 Add tests for Confirm Detail Row 2018-07-25 11:58:51 -07:00
bobby dresser
45379e867d
remove current version 2018-07-25 11:58:27 -07:00
bobby dresser
8cd36c8725
fix link bracket 2018-07-25 11:48:15 -07:00
bobby dresser
87f42468b7
add current release to the README 2018-07-25 10:30:47 -07:00
William Morriss
5782926c28
Merge pull request #4825 from MetaMask/no-inject-ani-gamer
Do not inject on ani.gamer.com.tw
2018-07-24 19:48:10 -07:00
William Morriss
d57bca9418
Merge pull request #4820 from MetaMask/codeowners
Added codeowners file
2018-07-24 19:47:53 -07:00
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