1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

3692 Commits

Author SHA1 Message Date
kumavis
5e6962342d tx controller - fix getBalance fn 2017-08-08 21:08:30 -07:00
kumavis
5418813ed1 util - sufficientBalance - validate input 2017-08-08 21:05:59 -07:00
Frankie
d40bd9a726 Merge pull request #1880 from MetaMask/pendingFix
fix getPendingTransactions function for pendingTxTracker
2017-08-08 22:00:17 -04:00
frankiebee
9c9165e930 filter by network for pending txs 2017-08-08 21:54:26 -04:00
frankiebee
5bb84f6e21 fix getPendingTransactions function for pendingTxTracker 2017-08-08 21:49:48 -04:00
Thomas Huang
02a6cd255b Merge pull request #1879 from MetaMask/build-err-fix
Build sys - prevent err from being swallowed
2017-08-08 18:44:53 -07:00
kumavis
59e83d2b80 build - factor watcify into bundler generation 2017-08-08 17:53:34 -07:00
kumavis
4a4736195f build - fix error swallowing on dev 2017-08-08 17:46:31 -07:00
kumavis
6767430aa2 deps - bump watchify 2017-08-08 17:46:09 -07:00
Thomas Huang
0e6bc6647e Merge pull request #1854 from MetaMask/greenkeeper/initial
Greenkeeper/initial
2017-08-08 16:32:55 -07:00
kumavis
922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
kumavis
7db1f30590 Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout
Improve layout for legacy buy screen
2017-08-08 15:56:02 -07:00
kumavis
cd1437fdd3 Merge pull request #1861 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 2
2017-08-08 15:54:08 -07:00
frankiebee
88b84e3895 add json-rpc-engine && eth-json-rpc-middleware to devDependencies 2017-08-08 18:34:59 -04:00
frankiebee
a13643bdb5 fix class names 2017-08-08 18:30:49 -04:00
frankiebee
e761fb0ef7 use provider stub 2017-08-08 18:30:22 -04:00
frankiebee
be4011c310 create a provider stub 2017-08-08 18:30:03 -04:00
sdtsui
9d3b5348aa Fix layout issues flagged by @tmashuang 2017-08-08 15:17:52 -07:00
sdtsui
b6a7281737 Make buy ui more central to the screen 2017-08-08 15:17:24 -07:00
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