1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 08:09:15 +01:00
Commit Graph

3923 Commits

Author SHA1 Message Date
Thomas Huang
67e4855b9d Updated commonjs require path for redux-logger and redux-thunk modules 2017-08-08 14:15:45 -07:00
frankiebee
3a2190ec3c fix the bind on pending tx watchers 2017-08-07 16:58:38 -04:00
frankiebee
28fbdca830 remove .only 2017-08-07 16:41:54 -04:00
frankiebee
f3b42f1e33 Merge branch 'master' into transactionControllerRefractor 2017-08-07 16:24:58 -04:00
frankiebee
e7f838e626 fix test 2017-08-07 14:56:17 -04:00
frankiebee
59124eb6fd remove logging of the message and log the error 2017-08-07 14:45:43 -04:00
frankiebee
a54c26382e remove unnecessary if statment for error message 2017-08-07 14:40:07 -04:00
frankiebee
fb9866b4e1 fix spelling 2017-08-07 14:37:20 -04:00
kumavis
b8ab1170f8 Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:24 -07:00
kumavis
78aa957e5a Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:08 -07:00
kumavis
57abc58d62 Merge pull request #1835 from MetaMask/NewUI
Begin UI Refactor with Responsiveness & New Menus
2017-08-07 10:51:18 -07:00
sdtsui
50fc9c9658 Improve readability of changelog 2017-08-06 10:02:37 -07:00
kumavis
a456baea8b Merge branch 'master' into NewUI 2017-08-05 00:29:10 -07:00
kumavis
3f5b82f7ef Merge pull request #1867 from sdtsui/NewUI
Fix integration tests for NewUI
2017-08-05 00:27:29 -07:00
sdtsui
f37f405d52 Fix integration test failures: ensure qr code is accessible 2017-08-04 23:34:54 -07:00
sdtsui
b5251d22a6 Fix integration test failures: unnecessary sandwich-expando event stopPropagation 2017-08-04 23:34:26 -07:00
Frankie
2ba5737728 Merge pull request #1866 from MetaMask/v3.9.5
V3.9.5
2017-08-04 17:26:19 -04:00
kumavis
c82908e843 v3.9.5 2017-08-04 14:16:19 -07:00
kumavis
c62dad7248 blacklist - bump phishing detector 2017-08-04 14:11:40 -07:00
Frankie
befb5de325 Merge pull request #1865 from MetaMask/blacklist-moar
blacklist - update phishing on boot and speed up polling to 4 min
2017-08-04 17:04:57 -04:00
kumavis
1be8053cca blacklist - update phishing on boot and speed up polling to 4 min 2017-08-04 13:51:48 -07:00
kumavis
d811999090 Merge pull request #1864 from sdtsui/lint-droppo
Lint menu-droppo
2017-08-04 13:40:30 -07:00
sdtsui
186bcec4fb Lint menu-droppo 2017-08-04 13:31:18 -07:00
kumavis
5f8a2ea1e6 Merge pull request #1862 from sdtsui/add-rct
Re-enable css transitions, only for dropdowns in app header
2017-08-04 13:22:25 -07:00
kumavis
d7168d7c50 Merge pull request #1863 from sdtsui/newui-early-break
Add early breakpoint from @frankiebee 's + @kumavis 's CR of #1835
2017-08-04 13:21:47 -07:00
sdtsui
8cc3ae5988 Cleanup breakpoint css + comment on hackiness 2017-08-04 13:19:06 -07:00
sdtsui
0cd72db2d2 Adds early breakpoint from @frankiebee 's + @kumavis 's CR 2017-08-04 12:57:16 -07:00
frankiebee
08f49ab35f rename PendingTransactionUtils -> PendingTransactionWatchers 2017-08-04 14:50:34 -04:00
sdtsui
4d967ebea9 Bring menu-droppo component into project, remove as a dependency 2017-08-04 11:47:36 -07:00
frankiebee
89a4fef1e4 Merge branch 'master' into transactionControllerRefractor 2017-08-04 14:45:22 -04:00
frankiebee
fa3df576bc fixed: showing tx-s as errors vs. warning 2017-08-04 14:43:08 -04:00
frankiebee
cddff73703 bring your own BN 2017-08-04 14:42:13 -04:00
frankiebee
087cd9fb1a break out tx status pendding watchers 2017-08-04 14:41:35 -04:00
frankiebee
54739cb798 test for pending tx watcher 2017-08-04 14:40:22 -04:00
frankiebee
4ac0b97202 test for SufficientBalance 2017-08-04 14:36:27 -04:00
sdtsui
781ac00eac Re-enable css transitions for dropdowns in header, needs menu-droppo library update 2017-08-04 11:31:07 -07:00
frankiebee
caee2a9e35 move util functions to util.js 2017-08-04 13:55:00 -04:00
frankiebee
3dcc199845 rename the test description Transaction Manger -> Message Manger 2017-08-04 13:27:08 -04:00
kumavis
650956934c Merge branch 'NewUI' of github.com:MetaMask/metamask-extension into NewUI 2017-08-03 22:24:41 -07:00
kumavis
0a5a46b8f4 test - integration - better error handling 2017-08-03 22:24:22 -07:00
kumavis
75b397b158 Merge branch 'master' into NewUI 2017-08-03 22:21:13 -07:00
Frankie
a3cd2a091c Merge pull request #1859 from MetaMask/v3.9.4
v3.9.4
2017-08-04 01:16:22 -04:00
kumavis
a444326a1e v3.9.4 2017-08-03 22:06:26 -07:00
kumavis
f804567d24 test - integration - syntax - prefer const 2017-08-03 21:50:41 -07:00
kumavis
925edd5f7d test - integration - remove unused code 2017-08-03 21:50:17 -07:00
kumavis
44616483e0 test - integration - throw error on failure 2017-08-03 21:40:32 -07:00
kumavis
29dcadc346 ui - dropdown - use Object.assign syntax to appease coverage parser 2017-08-03 21:32:08 -07:00
kumavis
5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
kumavis
c4cb371ce8 Merge pull request #1857 from MetaMask/hotFixCancleTx
fix cancelTransaction not receiving a callback
2017-08-03 21:01:13 -07:00
kumavis
17c9fd450f Merge pull request #1858 from sdtsui/NewUI
UI Tweaks, Minor Bugfixes, and Dropdown Resizing
2017-08-03 20:59:47 -07:00